Update version number

app/build.gradle

@@ -9,8 +9,8 @@ android {
         buildConfigField "boolean", "HIDDEN_APP", "false"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 46
-        versionName '5.9'
+        versionCode 47
+        versionName '5.10'
     }
 
     lintOptions {

app/src/main/java/org/traccar/client/MainFragment.java

@@ -150,13 +150,6 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         }
     }
 
-    private boolean hasPermission(String permission) {
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
-            return true;
-        }
-        return ContextCompat.checkSelfPermission(getActivity(), permission) == PackageManager.PERMISSION_GRANTED;
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -223,10 +216,10 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
     private void startTrackingService(boolean checkPermission, boolean permission) {
         if (checkPermission) {
             Set<String> missingPermissions = new HashSet<>();
-            if (!hasPermission(Manifest.permission.ACCESS_FINE_LOCATION)) {
+            if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 missingPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
             }
-            if (!hasPermission(Manifest.permission.ACCESS_COARSE_LOCATION)) {
+            if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                 missingPermissions.add(Manifest.permission.ACCESS_COARSE_LOCATION);
             }
             if (missingPermissions.isEmpty()) {

app/src/main/java/org/traccar/client/TrackingService.java

@@ -21,6 +21,7 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
@@ -77,8 +78,11 @@ public class TrackingService extends Service {
         Log.i(TAG, "service create");
         StatusActivity.addMessage(getString(R.string.status_service_create));
 
-        trackingController = new TrackingController(this);
-        trackingController.start();
+        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED
+                && ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+            trackingController = new TrackingController(this);
+            trackingController.start();
+        }
 
         startForeground(NOTIFICATION_ID, createNotification(this));
         ContextCompat.startForegroundService(this, new Intent(this, HideNotificationService.class));