Fix merge issues

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

@@ -27,6 +27,7 @@ import android.os.BatteryManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.widget.Toast;
 
 public class PositionProvider implements LocationListener {
 
@@ -67,9 +68,13 @@ public class PositionProvider implements LocationListener {
 
     @SuppressLint("MissingPermission")
     public void startUpdates() {
+        try {
             locationManager.requestLocationUpdates(
                     getProvider(preferences.getString(MainFragment.KEY_ACCURACY, "medium")),
                     distance > 0 || angle > 0 ? MINIMUM_INTERVAL : interval, 0, this);
+        } catch (RuntimeException e) {
+            Toast.makeText(context, e.getMessage(), Toast.LENGTH_LONG).show();
+        }
     }
 
     public static String getProvider(String accuracy) {

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

@@ -111,6 +111,7 @@ public class ShortcutActivity extends AppCompatActivity {
         String provider = PositionProvider.getProvider(
                 preferences.getString(MainFragment.KEY_ACCURACY, "medium"));
 
+        try {
             Location location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
             if (location != null) {
                 sendAlarmLocation(location);
@@ -134,6 +135,9 @@ public class ShortcutActivity extends AppCompatActivity {
                     }
                 }, Looper.myLooper());
             }
+        } catch (RuntimeException e) {
+            Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG).show();
+        }
     }
 
     private void sendAlarmLocation(Location location) {