Browse Source

Added some null pointer checking

Alexander Brakowski 9 years ago
parent
commit
dcfaa89689

+ 8 - 1
src/de/tudarmstadt/informatik/hostage/sync/android/SyncUtils.java

@@ -239,7 +239,7 @@ public class SyncUtils {
         return builder.toString();
     }
 
-    public static SyncData getSyncDataFromTracing(Context context, Synchronizer synchronizer){
+    public static SyncData getSyncDataFromTracing(Context context, Synchronizer synchronizer, long fromTime){
         SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(context);
         String serverAddress = pref.getString("pref_upload_server", "https://ssi.cased.de");
 
@@ -261,6 +261,13 @@ public class SyncUtils {
 
             JSONObject condition = new JSONObject();
 
+            /**if(fromTime > 0){
+                Calendar calendar = GregorianCalendar.getInstance();
+                calendar.setTimeInMillis(fromTime);
+
+                condition.put("date", fromCalendar(calendar));
+            }**/
+
             /**
             TODO(alex): UNCOMMENT THIS AGAIN, WHEN WE ARE SURE ABOUT USING LOCATIONS THIS WAY.
             =======================================================================

+ 3 - 3
src/de/tudarmstadt/informatik/hostage/sync/tracing/TracingSyncService.java

@@ -169,13 +169,13 @@ public class TracingSyncService extends IntentService {
 
         // First download from tracing
         if(receiver != null) receiver.send(RECORD_DOWNLOAD, null);
-        SyncData syncDataFromTracing = SyncUtils.getSyncDataFromTracing(this, synchronizer);
+        SyncData syncDataFromTracing = SyncUtils.getSyncDataFromTracing(this, synchronizer, lastSyncTime);
 
         if(syncDataFromTracing == null && error){
-            receiver.send(SYNC_ERROR, null);
+           if(receiver != null) receiver.send(SYNC_ERROR, null);
             return;
         } else if(syncDataFromTracing == null){
-            receiver.send(SYNC_DOWNLOAD_ERROR, null);
+            if(receiver != null) receiver.send(SYNC_DOWNLOAD_ERROR, null);
             return;
         }