Merge branch 'feature_jlan_cifs' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into feature_jlan_cifs

src/de/tudarmstadt/informatik/hostage/sync/android/SyncUtils.java

@@ -270,11 +270,12 @@ public class SyncUtils {
                 condition.put("date", fromCalendar(calendar));
             }**/
 
+            Location location = null;
             /**
-            TODO(alex): UNCOMMENT THIS AGAIN, WHEN WE ARE SURE ABOUT USING LOCATIONS THIS WAY.
+             TODO(alex): UNCOMMENT THIS AGAIN, WHEN WE ARE SURE ABOUT USING LOCATIONS THIS WAY.
             =======================================================================
-
-            Location location = MyLocationManager.getNewestLocation();
+            location = MyLocationManager.getNewestLocation();
+             */
             if(location != null){
                 JSONArray ll = new JSONArray();
                 ll.put(location.getLongitude());
@@ -286,9 +287,11 @@ public class SyncUtils {
                 // We could not get the gps coordinates, try to retrieve the country code from the SIM card
                 TelephonyManager tm = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
                 String countryCodeValue = tm.getNetworkCountryIso();
-
+                /**
+                 TODO(julien): COMMENT THIS OUT, TO GET ALL SYNC DATA FROM TRACING.
+                 */
                 condition.put("country", countryCodeValue);
-            }*/
+            }
 
             JSONObject req = new JSONObject();
             req.put("condition", condition);