Give Samuel heart attack by removing Dagger

2 files changed, 5 insertions, 11 deletions

diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
index 5eeb720e..ea03077c 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
@@ -128,7 +128,7 @@ public class TunnelEditorFragment extends BaseFragment {
                 }
                 if (tunnel == null) {
                     Log.d(TAG, "Attempting to create new tunnel " + binding.getConfig().getName());
-                    final TunnelManager manager = Application.getComponent().getTunnelManager();
+                    final TunnelManager manager = Application.getTunnelManager();
                     manager.create(binding.getConfig().getName(), newConfig)
                             .whenComplete(this::onTunnelCreated);
                 } else if (!tunnel.getName().equals(binding.getConfig().getName())) {
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
index f6e99759..1b1b01fe 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
@@ -34,7 +34,6 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 
 import com.wireguard.android.Application;
-import com.wireguard.android.Application.ApplicationComponent;
 import com.wireguard.android.R;
 import com.wireguard.android.activity.TunnelCreatorActivity;
 import com.wireguard.android.databinding.TunnelListFragmentBinding;
@@ -70,9 +69,7 @@ public class TunnelListFragment extends BaseFragment {
     private final MultiChoiceModeListener actionModeListener = new ActionModeListener();
     private final ListViewCallbacks listViewCallbacks = new ListViewCallbacks();
     private ActionMode actionMode;
-    private AsyncWorker asyncWorker;
     private TunnelListFragmentBinding binding;
-    private TunnelManager tunnelManager;
 
     public boolean collapseActionMenu() {
         if (binding.createMenu.isExpanded()) {
@@ -90,7 +87,7 @@ public class TunnelListFragment extends BaseFragment {
 
         final Collection<CompletableFuture<Tunnel>> futureTunnels = new ArrayList<>();
         final List<Throwable> throwables = new ArrayList<>();
-        asyncWorker.supplyAsync(() -> {
+        Application.getAsyncWorker().supplyAsync(() -> {
             final String[] columns = {OpenableColumns.DISPLAY_NAME};
             String name = null;
             try (Cursor cursor = contentResolver.query(uri, columns,
@@ -137,11 +134,11 @@ public class TunnelListFragment extends BaseFragment {
                             throwables.add(e);
                         }
                         if (config != null)
-                            futureTunnels.add(tunnelManager.create(name, config).toCompletableFuture());
+                            futureTunnels.add(Application.getTunnelManager().create(name, config).toCompletableFuture());
                     }
                 }
             } else {
-                futureTunnels.add(tunnelManager.create(name,
+                futureTunnels.add(Application.getTunnelManager().create(name,
                         Config.from(contentResolver.openInputStream(uri))).toCompletableFuture());
             }
 
@@ -190,9 +187,6 @@ public class TunnelListFragment extends BaseFragment {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        final ApplicationComponent applicationComponent = Application.getComponent();
-        asyncWorker = applicationComponent.getAsyncWorker();
-        tunnelManager = applicationComponent.getTunnelManager();
     }
 
     @Override
@@ -284,7 +278,7 @@ public class TunnelListFragment extends BaseFragment {
     public void onViewStateRestored(final Bundle savedInstanceState) {
         super.onViewStateRestored(savedInstanceState);
         binding.setFragment(this);
-        binding.setTunnels(tunnelManager.getTunnels());
+        binding.setTunnels(Application.getTunnelManager().getTunnels());
     }
 
     private final class ActionModeListener implements MultiChoiceModeListener {