minor update to location intake

guardianproject · Oct 8, 2013 · a83449c · a83449c
1 parent 81a523e
commit a83449c
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/src/org/witness/informacam/models/j3m/IDCIMDescriptor.java b/src/org/witness/informacam/models/j3m/IDCIMDescriptor.java
@@ -77,32 +77,30 @@ public void addEntry(Uri authority, boolean isThumbnail) {
 			String pattern = "^([a-zA-Z0-9]+)([a-zA-Z0-9_]*)\\.(jpg|mp4){1}$";
 
 			entry.id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaColumns._ID));
-			entry.exif = new IExif();
-
-			new Thread(new Runnable() {
-				@Override
-				public void run() {
-					do {
-						entry.exif.location = informaCam.informaService.getCurrentLocation().geoCoordinates;
-						Log.d(LOG, "exif location: " + entry.exif.location[0] + ", " + entry.exif.location[1]);
-					} while(Arrays.equals(entry.exif.location, new float[] {0.0f, 0.0f}) && (informaCam.informaService != null && informaCam.informaService._geo != null));
-				}
-			}).start();
-			cursor.close();
-
 			if(!isThumbnail) {
 				IDCIMEntry clone = new IDCIMEntry(entry);
 
 				if(!shortDescription.contains(clone)) {
 					shortDescription.add(clone);
 				}
 			}
-
-			intakeList.add(entry);
-
+			cursor.close();
+
+			entry.exif = new IExif();
+			synchronized(entry) {
+				new Thread(new Runnable() {
+					@Override
+					public void run() {
+						do {
+							entry.exif.location = informaCam.informaService.getCurrentLocation().geoCoordinates;
+							Log.d(LOG, "exif location: " + entry.exif.location[0] + ", " + entry.exif.location[1]);
+						} while(Arrays.equals(entry.exif.location, new float[] {0.0f, 0.0f}) && (informaCam.informaService != null && informaCam.informaService._geo != null));
+					}
+				}).start();
+
+				intakeList.add(entry);
+			}
 		}
-
-
 	}
 
 	public void startSession() {