Refactor: (Major) Add WifiDirectManager

Shift the code related to the Wifi-P2p API to WifiDirectManager from LocalFileTransferActivity

app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/DeviceListFragment.java

@@ -147,7 +147,7 @@ public class DeviceListFragment extends ListFragment
     alertDialogShower.show(new KiwixDialog.FileTransferConfirmation(selectedPeerDevice),
         new Function0<Unit>() {
           @Override public Unit invoke() {
-            ((DeviceActionListener) localFileTransferActivity).connect(selectedPeerDevice);
+            ((DeviceActionListener) localFileTransferActivity.wifiDirectManager).connect(selectedPeerDevice);
             showToast(localFileTransferActivity, R.string.performing_handshake, Toast.LENGTH_LONG);
             return Unit.INSTANCE;
           }
@@ -245,7 +245,7 @@ public class DeviceListFragment extends ListFragment
     if (clientAddress == null) {
       // null is returned only in case of a failed handshake
       showToast(localFileTransferActivity, R.string.device_not_cooperating, Toast.LENGTH_LONG);
-      localFileTransferActivity.closeLocalFileTransferActivity();
+      localFileTransferActivity.wifiDirectManager.closeLocalFileTransferActivity();
       return;
     }
 

app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/LocalFileTransferActivity.java

@@ -53,8 +53,8 @@ import javax.inject.Inject;
  * The module uses this activity along with {@link DeviceListFragment} to manage connection
  * and file transfer between the devices.
  */
-public class LocalFileTransferActivity extends AppCompatActivity
+public class LocalFileTransferActivity extends AppCompatActivity {
-    implements WifiP2pManager.ChannelListener, DeviceListFragment.DeviceActionListener {
+    //implements WifiP2pManager.ChannelListener, DeviceListFragment.DeviceActionListener {
 
   public static final String TAG = "LocalFileTransferActvty";
       // Not a typo, 'Log' tags have a length upper limit of 25 characters
@@ -70,10 +70,10 @@ public class LocalFileTransferActivity extends AppCompatActivity
 
   private ArrayList<Uri> fileUriArrayList;
       // For sender device, stores Uris of files to be transferred
-  private Boolean fileSendingDevice = false;// Whether the device is the file sender or not
+  public Boolean fileSendingDevice = false;// Whether the device is the file sender or not
 
   /* Variables related to the WiFi P2P API */
-  private boolean wifiP2pEnabled = false; // Whether WiFi has been enabled or not
+  /*private boolean wifiP2pEnabled = false; // Whether WiFi has been enabled or not
   private boolean retryChannel = false;   // Whether channel has retried connecting previously
 
   private WifiP2pManager manager;         // Overall manager of Wifi p2p connections for the module
@@ -82,7 +82,9 @@ public class LocalFileTransferActivity extends AppCompatActivity
 
   private final IntentFilter intentFilter = new IntentFilter();
       // For specifying broadcasts (of the P2P API) that the module needs to respond to
-  private BroadcastReceiver receiver = null; // For receiving the broadcasts given by above filter
+  private BroadcastReceiver receiver = null; // For receiving the broadcasts given by above filter*/
+
+  public WifiDirectManager wifiDirectManager;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
@@ -112,13 +114,13 @@ public class LocalFileTransferActivity extends AppCompatActivity
     actionBar.setNavigationOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
-        closeLocalFileTransferActivity();
+        wifiDirectManager.closeLocalFileTransferActivity();
       }
     });
 
 
     /* Initialisations for using the WiFi P2P API */
-
+/*
     // Intents that the broadcast receiver will be responding to
     intentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
     intentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
@@ -126,7 +128,10 @@ public class LocalFileTransferActivity extends AppCompatActivity
     intentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
 
     manager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
-    channel = manager.initialize(this, getMainLooper(), null);
+    channel = manager.initialize(this, getMainLooper(), null);*/
+
+    this.wifiDirectManager = new WifiDirectManager(this);
+    wifiDirectManager.initialiseWifiDirectManager();
   }
 
   @Override
@@ -160,7 +165,7 @@ public class LocalFileTransferActivity extends AppCompatActivity
               R.id.fragment_device_list);
       deviceListFragment.onInitiateDiscovery();
       deviceListFragment.performFieldInjection(sharedPreferenceUtil, alertDialogShower);
-      manager.discoverPeers(channel, new WifiP2pManager.ActionListener() {
+      /*manager.discoverPeers(channel, new WifiP2pManager.ActionListener() {
         @Override
         public void onSuccess() {
           showToast(LocalFileTransferActivity.this, R.string.discovery_initiated,
@@ -175,7 +180,9 @@ public class LocalFileTransferActivity extends AppCompatActivity
               LocalFileTransferActivity.this.getString(R.string.discovery_failed),
               Toast.LENGTH_SHORT);
         }
-      });
+      });*/
+
+      wifiDirectManager.discoverPeerDevices();
       return true;
     } else {
       return super.onOptionsItemSelected(item);
@@ -196,14 +203,14 @@ public class LocalFileTransferActivity extends AppCompatActivity
   }
 
   public void setWifiP2pEnabled(boolean wifiP2pEnabled) {
-    this.wifiP2pEnabled = wifiP2pEnabled;
+    this.wifiDirectManager.setWifiP2pEnabled(wifiP2pEnabled);
   }
 
   public boolean isWifiP2pEnabled() {
-    return wifiP2pEnabled;
+    return this.wifiDirectManager.isWifiP2pEnabled();
   }
 
-  private String getErrorMessage(int reason) {
+  public String getErrorMessage(int reason) {
     switch (reason) {
       case WifiP2pManager.ERROR:
         return "Internal error";
@@ -243,7 +250,7 @@ public class LocalFileTransferActivity extends AppCompatActivity
     Toast.makeText(context, text, duration).show();
   }
 
-  /* From WifiP2pManager.ChannelListener interface */
+  /* From WifiP2pManager.ChannelListener interface *//*
   @Override
   public void onChannelDisconnected() {
     // Upon disconnection, retry one more time
@@ -255,10 +262,10 @@ public class LocalFileTransferActivity extends AppCompatActivity
     } else {
       showToast(this, R.string.severe_loss_error, Toast.LENGTH_LONG);
     }
-  }
+  }*/
 
   /* From DeviceListFragment.DeviceActionListener interface */
-  @Override
+  /*@Override
   public void connect(@NonNull final WifiP2pDevice peerDevice) {
     WifiP2pConfig config = new WifiP2pConfig();
     config.deviceAddress = peerDevice.deviceAddress;
@@ -292,9 +299,9 @@ public class LocalFileTransferActivity extends AppCompatActivity
     fileSendingDevice = false;
     disconnect();
     this.finish();
-  }
+  }*/
 
-  public void disconnect() {
+  /*public void disconnect() {
     manager.removeGroup(channel, new WifiP2pManager.ActionListener() {
 
       @Override
@@ -307,7 +314,7 @@ public class LocalFileTransferActivity extends AppCompatActivity
         Log.d(TAG, "Disconnect successful");
       }
     });
-  }
+  }*/
 
   /* Helper methods used in the activity */
   private boolean checkCoarseLocationAccessPermission() { // Required by Android to detect wifi-p2p peers
@@ -373,7 +380,7 @@ public class LocalFileTransferActivity extends AppCompatActivity
           Log.e(TAG, "Location permission not granted");
 
           showToast(this, R.string.permission_refused_location, Toast.LENGTH_LONG);
-          closeLocalFileTransferActivity();
+          wifiDirectManager.closeLocalFileTransferActivity();
           break;
         }
       }
@@ -383,7 +390,7 @@ public class LocalFileTransferActivity extends AppCompatActivity
           Log.e(TAG, "Storage write permission not granted");
 
           showToast(this, R.string.permission_refused_storage, Toast.LENGTH_LONG);
-          closeLocalFileTransferActivity();
+          wifiDirectManager.closeLocalFileTransferActivity();
           break;
         }
       }
@@ -463,14 +470,16 @@ public class LocalFileTransferActivity extends AppCompatActivity
   @Override
   public void onResume() {
     super.onResume();
-    receiver = new WifiDirectBroadcastReceiver(manager, channel, this);
+    /*receiver = new WifiDirectBroadcastReceiver(manager, channel, this);
-    registerReceiver(receiver, intentFilter);
+    registerReceiver(receiver, intentFilter);*/
+    wifiDirectManager.registerWifiDirectBroadcastRecevier();
   }
 
   @Override
   public void onPause() {
     super.onPause();
-    unregisterReceiver(receiver);
+    /*unregisterReceiver(receiver);*/
+    wifiDirectManager.unregisterWifiDirectBroadcastRecevier();
   }
 
   @Override protected void onDestroy() {
@@ -486,6 +495,6 @@ public class LocalFileTransferActivity extends AppCompatActivity
   @Override
   public void onBackPressed() {
     super.onBackPressed();
-    closeLocalFileTransferActivity();
+    wifiDirectManager.closeLocalFileTransferActivity();
   }
 }

app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/ReceiverDeviceAsyncTask.java

@@ -112,6 +112,6 @@ class ReceiverDeviceAsyncTask extends AsyncTask<Void, Integer, Boolean> {
           Toast.LENGTH_LONG);
     }
 
-    ((LocalFileTransferActivity) deviceListFragment.getActivity()).closeLocalFileTransferActivity();
+    ((LocalFileTransferActivity) deviceListFragment.getActivity()).wifiDirectManager.closeLocalFileTransferActivity();
   }
 }

app/src/main/java/org/kiwix/kiwixmobile/zim_manager/local_file_transfer/WifiDirectManager.java

@@ -0,0 +1,162 @@
+package org.kiwix.kiwixmobile.zim_manager.local_file_transfer;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.IntentFilter;
+import android.net.wifi.WpsInfo;
+import android.net.wifi.p2p.WifiP2pConfig;
+import android.net.wifi.p2p.WifiP2pDevice;
+import android.net.wifi.p2p.WifiP2pManager;
+import android.os.Build;
+import android.util.Log;
+import android.widget.Toast;
+import androidx.annotation.NonNull;
+import org.kiwix.kiwixmobile.R;
+
+import static android.os.Looper.getMainLooper;
+import static org.kiwix.kiwixmobile.zim_manager.local_file_transfer.LocalFileTransferActivity.showToast;
+
+public class WifiDirectManager implements WifiP2pManager.ChannelListener, DeviceListFragment.DeviceActionListener {
+
+  private static final String TAG = "WifiDirectManager";
+
+  LocalFileTransferActivity activity;
+
+  /* Variables related to the WiFi P2P API */
+  private boolean wifiP2pEnabled = false; // Whether WiFi has been enabled or not
+  private boolean retryChannel = false;   // Whether channel has retried connecting previously
+
+  private WifiP2pManager manager;         // Overall manager of Wifi p2p connections for the module
+  private WifiP2pManager.Channel channel;
+  // Connects the module to device's underlying Wifi p2p framework
+
+  private final IntentFilter intentFilter = new IntentFilter();
+  // For specifying broadcasts (of the P2P API) that the module needs to respond to
+  private BroadcastReceiver receiver = null; // For receiving the broadcasts given by above filter
+
+  public WifiDirectManager(@NonNull LocalFileTransferActivity activity) {
+    this.activity = activity;
+  }
+
+  /* Initialisations for using the WiFi P2P API */
+  public void initialiseWifiDirectManager() {
+    // Intents that the broadcast receiver will be responding to
+    intentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);
+    intentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);
+    intentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
+    intentFilter.addAction(WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION);
+
+    manager = (WifiP2pManager) activity.getSystemService(Context.WIFI_P2P_SERVICE);
+    channel = manager.initialize(activity, getMainLooper(), null);
+  }
+
+  public void registerWifiDirectBroadcastRecevier() {
+    receiver = new WifiDirectBroadcastReceiver(manager, channel, activity);
+    activity.registerReceiver(receiver, intentFilter);
+  }
+
+  public void unregisterWifiDirectBroadcastRecevier() {
+    activity.unregisterReceiver(receiver);
+  }
+
+  public void discoverPeerDevices() {
+    manager.discoverPeers(channel, new WifiP2pManager.ActionListener() {
+      @Override
+      public void onSuccess() {
+        showToast(activity, R.string.discovery_initiated,
+            Toast.LENGTH_SHORT);
+      }
+
+      @Override
+      public void onFailure(int reason) {
+        String errorMessage = activity.getErrorMessage(reason);
+        Log.d(TAG, activity.getString(R.string.discovery_failed) + ": " + errorMessage);
+        showToast(activity,
+            activity.getString(R.string.discovery_failed),
+            Toast.LENGTH_SHORT);
+      }
+    });
+  }
+
+  public void setWifiP2pEnabled(boolean wifiP2pEnabled) {
+    this.wifiP2pEnabled = wifiP2pEnabled;
+  }
+
+  public boolean isWifiP2pEnabled() {
+    return wifiP2pEnabled;
+  }
+
+  /* From WifiP2pManager.ChannelListener interface */
+  @Override
+  public void onChannelDisconnected() {
+    // Upon disconnection, retry one more time
+    if (manager != null && !retryChannel) {
+      Log.d(TAG, "Channel lost, trying again");
+      activity.resetData();
+      retryChannel = true;
+      manager.initialize(activity, getMainLooper(), this);
+    } else {
+      showToast(activity, R.string.severe_loss_error, Toast.LENGTH_LONG);
+    }
+  }
+
+  /* From DeviceListFragment.DeviceActionListener interface */
+  @Override
+  public void connect(@NonNull final WifiP2pDevice peerDevice) {
+    WifiP2pConfig config = new WifiP2pConfig();
+    config.deviceAddress = peerDevice.deviceAddress;
+    config.wps.setup = WpsInfo.PBC;
+
+    manager.connect(channel, config, new WifiP2pManager.ActionListener() {
+      @Override
+      public void onSuccess() {
+        // UI updated from broadcast receiver
+      }
+
+      @Override
+      public void onFailure(int reason) {
+        String errorMessage = activity.getErrorMessage(reason);
+        Log.d(TAG, activity.getString(R.string.connection_failed) + ": " + errorMessage);
+        showToast(activity, activity.getString(R.string.connection_failed),
+            Toast.LENGTH_LONG);
+      }
+    });
+  }
+
+  @Override
+  public void closeLocalFileTransferActivity() {
+    final DeviceListFragment deviceListFragment =
+        (DeviceListFragment) activity.getSupportFragmentManager().findFragmentById(
+            R.id.fragment_device_list);
+    if (deviceListFragment != null) {
+      deviceListFragment.cancelAsyncTasks();
+    }
+
+    activity.fileSendingDevice = false;
+    if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+      channel.close();
+    }
+    disconnect();
+  }
+
+  public void disconnect() {
+    manager.removeGroup(channel, new WifiP2pManager.ActionListener() {
+
+      @Override
+      public void onFailure(int reasonCode) {
+        Log.d(TAG, "Disconnect failed. Reason: " + reasonCode);
+        closeActivity();
+      }
+
+      @Override
+      public void onSuccess() {
+        Log.d(TAG, "Disconnect successful");
+        closeActivity();
+      }
+    });
+  }
+
+  public void closeActivity() {
+    activity.finish();
+  }
+}