Replace VPNServiceRepository with ServiceAccessor pattern (#114)

VPNServiceRepository created its own service binding which caused conflicts
when unbinding - it would disconnect other components relying on the service.

Now NetworksFragmentViewModel uses ServiceAccessor from MainActivity, which
maintains a single shared service binding across all components.

Author: pappz

app/src/main/java/io/netbird/client/MainActivity.java

@@ -2,11 +2,9 @@
 
 import android.animation.StateListAnimator;
 import android.app.Activity;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
@@ -32,7 +30,6 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.GravityCompat;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
 import androidx.navigation.ui.AppBarConfiguration;
@@ -41,7 +38,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import io.netbird.client.databinding.ActivityMainBinding;
-import io.netbird.client.tool.NetworkChangeNotifier;
+import io.netbird.client.tool.RouteChangeListener;
 import io.netbird.client.tool.ServiceStateListener;
 import io.netbird.client.tool.VPNService;
 import io.netbird.client.ui.PreferenceUI;
@@ -369,6 +366,46 @@ public NetworkArray getNetworks() {
         return mBinder.networks();
     }
 
+    @Override
+    public void selectRoute(String route) throws Exception {
+        if (mBinder == null) {
+            Log.w(LOGTAG, "VPN binder is null");
+            return;
+        }
+
+        mBinder.selectRoute(route);
+    }
+
+    @Override
+    public void deselectRoute(String route) throws Exception {
+        if (mBinder == null) {
+            Log.w(LOGTAG, "VPN binder is null");
+            return;
+        }
+
+        mBinder.deselectRoute(route);
+    }
+
+    @Override
+    public void addRouteChangeListener(RouteChangeListener listener) {
+        if (mBinder == null) {
+            Log.w(LOGTAG, "VPN binder is null");
+            return;
+        }
+
+        mBinder.addRouteChangeListener(listener);
+    }
+
+    @Override
+    public void removeRouteChangeListener(RouteChangeListener listener) {
+        if (mBinder == null) {
+            Log.w(LOGTAG, "VPN binder is null");
+            return;
+        }
+
+        mBinder.removeRouteChangeListener(listener);
+    }
+
 
     @Override
     public void registerServiceStateListener(StateListener listener) {

app/src/main/java/io/netbird/client/MyApplication.java

@@ -1,14 +1,9 @@
 package io.netbird.client;
 
 import android.app.Application;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
-import io.netbird.client.repository.VPNServiceRepository;
-import io.netbird.client.tool.NetworkChangeNotifier;
 
 public class MyApplication extends Application {
 
@@ -20,8 +15,4 @@ public void onCreate() {
         int themeMode = prefs.getInt("theme_mode", AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
         AppCompatDelegate.setDefaultNightMode(themeMode);
     }
-
-    public VPNServiceRepository getVPNServiceRepository() {
-        return new VPNServiceRepository(this);
-    }
 }

app/src/main/java/io/netbird/client/ServiceAccessor.java

@@ -1,5 +1,6 @@
 package io.netbird.client;
 
+import io.netbird.client.tool.RouteChangeListener;
 import io.netbird.gomobile.android.NetworkArray;
 import io.netbird.gomobile.android.PeerInfoArray;
 
@@ -10,4 +11,10 @@ public interface ServiceAccessor {
 
     NetworkArray getNetworks();
     void stopEngine();
+
+    void selectRoute(String route) throws Exception;
+    void deselectRoute(String route) throws Exception;
+
+    void addRouteChangeListener(RouteChangeListener listener);
+    void removeRouteChangeListener(RouteChangeListener listener);
 }

app/src/main/java/io/netbird/client/repository/VPNServiceBindListener.java

@@ -24,6 +24,7 @@
 
 import io.netbird.client.PlatformUtils;
 import io.netbird.client.R;
+import io.netbird.client.ServiceAccessor;
 import io.netbird.client.StateListenerRegistry;
 import io.netbird.client.databinding.FragmentNetworksBinding;
 
@@ -35,6 +36,7 @@ public class NetworksFragment extends Fragment {
     private final List<RoutingPeer> peers = new ArrayList<>();
     private NetworksFragmentViewModel model;
     private StateListenerRegistry stateListenerRegistry;
+    private ServiceAccessor serviceAccessor;
 
     @Override
     public void onAttach(@NonNull Context context) {
@@ -45,6 +47,12 @@ public void onAttach(@NonNull Context context) {
         } else {
             throw new RuntimeException(context + " must implement StateListenerRegistry");
         }
+
+        if (context instanceof ServiceAccessor) {
+            serviceAccessor = (ServiceAccessor) context;
+        } else {
+            throw new RuntimeException(context + " must implement ServiceAccessor");
+        }
     }
 
     @Nullable
@@ -58,8 +66,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        model = new ViewModelProvider(this,
-                ViewModelProvider.Factory.from(NetworksFragmentViewModel.initializer))
+        model = new ViewModelProvider(this, NetworksFragmentViewModel.getFactory(serviceAccessor))
                 .get(NetworksFragmentViewModel.class);
         stateListenerRegistry.registerServiceStateListener(model);