From 03c38a8f234f4e6d259c84f63a0a47ace4a13edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= <miewrz@st.amu.edu.pl>
Date: Mon, 5 Nov 2018 10:04:32 +0100
Subject: [PATCH] Fix permissions

---
 .../findmytutor/activity/BaseActivity.java    | 27 +++++--------------
 .../wmi/findmytutor/activity/MapActivity.java |  2 --
 .../wmi/findmytutor/utils/RestApiHelper.java  |  3 +++
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
index 4a2cea1..09fe892 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@@ -57,8 +57,6 @@ public abstract class BaseActivity
     private ActionBarDrawerToggle actionBarDrawerToggle;
     private SharingFragment sharingFragment;
 
-    boolean boolean_permission;
-
     private Fragment userListFragment;
     private ActiveFragment activeFragment = ActiveFragment.NONE;
 
@@ -111,12 +109,12 @@ public abstract class BaseActivity
         sharingFragment = new SharingFragment();
         userListFragment = new UsersListFragment();
 
-
         isTutor = PrefUtils.getIsTutor(getApplicationContext());
         if (!isTutor) {
             navigationView.findViewById(R.id.nav_profile).setVisibility(View.GONE);
         }
-        checkPermissions();
+
+
     }
 
 
@@ -168,25 +166,14 @@ public abstract class BaseActivity
     }
 
     public void startBackgroundLocalizationTask() {
-        if ((ContextCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) {
+        checkPermissions();
 
-            if ((ActivityCompat.shouldShowRequestPermissionRationale(this, android.Manifest.permission.ACCESS_FINE_LOCATION))) {
+        Intent startIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
 
-            } else {
-                ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION
-
-                        },
-                        REQUEST_PERMISSIONS);
-            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            startForegroundService(startIntent);
         } else {
-
-            Intent startIntent = new Intent(getApplicationContext(), BackgroundLocalizationService.class);
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                startForegroundService(startIntent);
-            } else {
-                startService(startIntent);
-            }
+            startService(startIntent);
         }
     }
 
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
index 336ace5..767f0a3 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
@@ -109,7 +109,6 @@ public class MapActivity extends BaseActivity
         coordinateService = ApiClient.getClient(getApplicationContext())
                 .create(CoordinateService.class);
 
-        //
         mStatusChecker = () -> {
             try {
                 fetchTopCoords();
@@ -466,7 +465,6 @@ public class MapActivity extends BaseActivity
             locationComponent.setCameraMode(CameraMode.TRACKING);
             locationComponent.setRenderMode(RenderMode.COMPASS);
 
-
             // Button 4 centring
             FloatingActionButton myLocFAB = findViewById(R.id.myLocationButton);
             myLocFAB.setOnClickListener(v -> {
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/RestApiHelper.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/RestApiHelper.java
index 0a6bac4..dc37d5c 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/RestApiHelper.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/RestApiHelper.java
@@ -25,6 +25,7 @@ public class RestApiHelper extends Activity  {
         } catch (Exception e) {
             return e.getMessage();
         }
+
     }
 
 
@@ -34,6 +35,8 @@ public class RestApiHelper extends Activity  {
         if (e instanceof HttpException) {
             ResponseBody responseBody = ((HttpException) e).response().errorBody();
             message = RestApiHelper.getErrorMessage(responseBody);
+        } else {
+            message ="Network Error !";
         }
 
         Snackbar snackbar = Snackbar.make(findViewById(R.id.activity_content), message, Snackbar.LENGTH_LONG);