Need permissions for android 6

draugvar · May 16, 2016 · ca17429 · ca17429
1 parent b5bf59d
commit ca17429
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/app/src/main/java/draugvar/smartteamtracking/activity/MainActivity.java b/app/src/main/java/draugvar/smartteamtracking/activity/MainActivity.java
@@ -34,12 +34,14 @@
 import draugvar.smartteamtracking.adapter.PendingGroupItem;
 import draugvar.smartteamtracking.data.Group;
 import draugvar.smartteamtracking.data.Myself;
+import draugvar.smartteamtracking.data.User;
 import draugvar.smartteamtracking.listener.CustomGpsStatusListener;
 import draugvar.smartteamtracking.listener.CustomLocationListener;
 import draugvar.smartteamtracking.rest.AddContains;
 import draugvar.smartteamtracking.rest.GetGroupsOfUsers;
 import draugvar.smartteamtracking.rest.GetPendingGroupsOfUsers;
 import draugvar.smartteamtracking.rest.RemovePending;
+import draugvar.smartteamtracking.rest.UpdateUserGPSCoordinates;
 import draugvar.smartteamtracking.singleton.WorkflowManager;
 import io.realm.Realm;
 
@@ -83,6 +85,7 @@ public void onClick(View view) {
         catch (SecurityException e){
             Log.d("Location","Location not enabled");
         }
+
     }
 
 

diff --git a/app/src/main/java/draugvar/smartteamtracking/listener/CustomGpsStatusListener.java b/app/src/main/java/draugvar/smartteamtracking/listener/CustomGpsStatusListener.java
@@ -4,6 +4,7 @@
 import android.location.GpsStatus;
 import android.util.Log;
 
+import draugvar.smartteamtracking.data.User;
 import draugvar.smartteamtracking.rest.UpdateUserGPSCoordinates;
 import draugvar.smartteamtracking.singleton.WorkflowManager;
 
@@ -31,7 +32,11 @@ public void onGpsStatusChanged(int event) {
                     WorkflowManager.getWorkflowManager().setInside(false);
             } else if (!WorkflowManager.getWorkflowManager().isInside()) {
                 WorkflowManager.getWorkflowManager().setInside(true);
-                new UpdateUserGPSCoordinates(WorkflowManager.getWorkflowManager().getMyselfId(),null,null).execute();
+                User user = new User();
+                user.setUid(WorkflowManager.getWorkflowManager().getMyselfId());
+                user.setLatGPS(null);
+                user.setLonGPS(null);
+                new UpdateUserGPSCoordinates(user).execute();
                 Log.d("Location","Set GPS values to null");
             }
         }

diff --git a/app/src/main/java/draugvar/smartteamtracking/listener/CustomLocationListener.java b/app/src/main/java/draugvar/smartteamtracking/listener/CustomLocationListener.java
@@ -8,6 +8,7 @@
 
 import java.util.concurrent.ExecutionException;
 
+import draugvar.smartteamtracking.data.User;
 import draugvar.smartteamtracking.rest.UpdateUserGPSCoordinates;
 import draugvar.smartteamtracking.singleton.WorkflowManager;
 
@@ -25,8 +26,11 @@ public void onLocationChanged(Location loc) {
         Log.d("Location", "Longitude: " + longitude + " Latitude: " + latitude);
         boolean result = false;
 
-        try {
-            result = new UpdateUserGPSCoordinates(WorkflowManager.getWorkflowManager().getMyselfId(),latitude,longitude).execute().get();
+        try { User user = new User();
+            user.setUid(WorkflowManager.getWorkflowManager().getMyselfId());
+            user.setLatGPS(latitude);
+            user.setLonGPS(longitude);
+            result = new UpdateUserGPSCoordinates(user).execute().get();
         } catch (InterruptedException e) {
             Log.d("Rest","Cannot update user GPS coordinates");
             e.printStackTrace();

diff --git a/app/src/main/java/draugvar/smartteamtracking/rest/UpdateUserGPSCoordinates.java b/app/src/main/java/draugvar/smartteamtracking/rest/UpdateUserGPSCoordinates.java
@@ -7,30 +7,27 @@
 import org.springframework.web.client.RestTemplate;
 
 import draugvar.smartteamtracking.application.SmartApplication;
+import draugvar.smartteamtracking.data.User;
 
 //Path /user/{userId}/. Simply updates coordinates for user.
 
 
 public class UpdateUserGPSCoordinates extends AsyncTask<Void,Void,Boolean> {
 
-    private Long userId;
-    private Double lat;
-    private Double lon;
+    private User user;
 
-    public UpdateUserGPSCoordinates(Long userId, Double lat, Double lon) {
-        this.userId = userId;
-        this.lat = lat;
-        this.lon = lon;
+    public UpdateUserGPSCoordinates(User user) {
+        this.user = user;
     }
 
     @Override
     protected Boolean doInBackground(Void... params) {
-        Log.d("Rest", "Post on /user/{userId}");
-        final String url = SmartApplication.serverPath + "/user/" + userId + "?lat="+lat+"&lon="+lon;
+        Log.d("Rest", "Post on /user");
+        final String url = SmartApplication.serverPath + "/user";
         RestTemplate restTemplate = new RestTemplate();
         restTemplate.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
 
-        Boolean result = restTemplate.postForObject(url, null, Boolean.class);
+        Boolean result = restTemplate.postForObject(url, user, Boolean.class);
         Log.d("Rest", "Returning " + result);
         return result;
     }