Disable multi-process (causes preferences mismatch), close backends i…

…f provider is disabled

.gitignore

@@ -1,5 +1,10 @@
 *.iml
-gen
-bin
-build
+gen/
+bin/
+build/
 user.gradle
+.gradle/
+gradle/
+gradlew
+local.properties
+.idea/

AndroidManifest.xml

@@ -46,7 +46,6 @@
         <service
             android:name="org.microg.nlp.location.LocationServiceV1"
             android:permission="android.permission.ACCESS_COARSE_LOCATION"
-            android:process=":nlp_loc_service"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.google.android.location.NetworkLocationProvider" />
@@ -64,7 +63,6 @@
         <service
             android:name="org.microg.nlp.location.LocationServiceV2"
             android:permission="android.permission.ACCESS_COARSE_LOCATION"
-            android:process=":nlp_loc_service"
             android:exported="true">
             <intent-filter>
                 <!-- KitKat changed the action name but nothing else, hence we handle it the same -->
@@ -82,7 +80,6 @@
 
         <service
             android:name="org.microg.nlp.geocode.GeocodeServiceV1"
-            android:process=":nlp_geo_service"
             android:exported="true">
             <intent-filter>
                 <!-- Jelly Bean changed the action name but nothing else, hence we handle it the same -->

src/org/microg/nlp/location/BackendFuser.java

@@ -30,7 +30,9 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static org.microg.nlp.api.Constants.*;
+import static org.microg.nlp.api.Constants.ACTION_LOCATION_BACKEND;
+import static org.microg.nlp.api.Constants.LOCATION_EXTRA_BACKEND_PROVIDER;
+import static org.microg.nlp.api.Constants.LOCATION_EXTRA_OTHER_BACKENDS;
 
 class BackendFuser {
     private static final String TAG = "NlpLocationBackendFuser";
@@ -150,7 +152,7 @@ public void destroy() {
     public static class LocationComparator implements Comparator<Location> {
 
         public static final LocationComparator INSTANCE = new LocationComparator();
-        public static final long SWITCH_ON_FRESHNESS_CLIFF_MS = 30000; // 30 seconds TODO: make it a setting
+        public static final long SWITCH_ON_FRESHNESS_CLIFF_MS = 30000; // 30 seconds
 
         /**
          * @return whether {@param lhs} is better than {@param rhs}

src/org/microg/nlp/location/LocationProviderV1.java

@@ -40,6 +40,8 @@ public LocationProviderV1(Context context) {
 
     @Override
     public void onDisable() {
+        Log.d(TAG, "onDisable");
+        helper.disable();
     }
 
     @Override
@@ -54,6 +56,7 @@ public void reload() {
 
     @Override
     public void onEnable() {
+        Log.d(TAG, "onEnable");
     }
 
     @Override

src/org/microg/nlp/location/LocationProviderV2.java

@@ -50,6 +50,8 @@ public LocationProviderV2(Context context) {
 
     @Override
     public void onDisable() {
+        Log.d(TAG, "onDisable");
+        helper.disable();
     }
 
     @Override
@@ -69,6 +71,7 @@ public void destroy() {
 
     @Override
     public void onEnable() {
+        Log.d(TAG, "onEnable");
     }
 
     @Override
@@ -85,15 +88,8 @@ public long onGetStatusUpdateTime() {
     public void onSetRequest(ProviderRequestUnbundled requests, WorkSource source) {
         Log.v(TAG, "onSetRequest: " + requests + " by " + source);
 
-        long autoTime = Long.MAX_VALUE;
-        boolean autoUpdate = false;
-        for (LocationRequestUnbundled request : requests.getLocationRequests()) {
-            Log.v(TAG, "onSetRequest: request: " + request);
-            if (autoTime > request.getInterval()) {
-                autoTime = request.getInterval();
-            }
-            autoUpdate = true;
-        }
+        long autoTime = requests.getInterval();
+        boolean autoUpdate = requests.getReportLocation();
 
         if (autoTime < 1500) {
             // Limit to 1.5s