version for the video

Author: thsc42

app/src/main/AndroidManifest.xml

@@ -40,6 +40,7 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <!-- ASAPService needs to work with Bluetooth -->
     <uses-permission android:name="android.permission.BLUETOOTH" />

app/src/main/java/net/sharksystem/asap/android/apps/ASAPAndroidPeer.java

@@ -227,6 +227,7 @@ private ASAPAndroidPeer(Collection<CharSequence> supportedFormats,
         this.requiredPermissions.add(Manifest.permission.BLUETOOTH);
         this.requiredPermissions.add(Manifest.permission.BLUETOOTH_ADMIN);
         this.requiredPermissions.add(Manifest.permission.ACCESS_COARSE_LOCATION);
+        this.requiredPermissions.add(Manifest.permission.ACCESS_FINE_LOCATION);
 
         // check for write permissions
         Log.d(this.getLogStart(), "ask for required permissions");

app/src/main/java/net/sharksystem/asap/android/bluetooth/BluetoothEngine.java

@@ -9,7 +9,6 @@
 import android.content.IntentFilter;
 import android.util.Log;
 
-import net.sharksystem.asap.ASAPEncounterManager;
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.EncounterConnectionType;
 import net.sharksystem.asap.android.service.MacLayerEngine;
@@ -455,7 +454,7 @@ void handleBTSocket(BluetoothSocket socket, boolean initiator) throws IOExceptio
         StreamPair streamPair = StreamPairImpl.getStreamPairWithEndpointAddress(
                 socket.getInputStream(), socket.getOutputStream(), remoteMacAddress);
 
-        this.getAsapService().getASAPEncounterManager().handleEncounter(
+        this.getASAPService().getASAPEncounterManager().handleEncounter(
                 streamPair, EncounterConnectionType.AD_HOC_LAYER_2_NETWORK, initiator);
     }
 

app/src/main/java/net/sharksystem/asap/android/service/ASAPService.java

@@ -258,7 +258,8 @@ void startWifiDirect() {
 
     void stopWifiDirect() {
         Log.d("ASAPService", "stop wifi p2p");
-        WifiP2PEngine ASAPWifiP2PEngine = WifiP2PEngine.getASAPWifiP2PEngine();
+        WifiP2PEngine ASAPWifiP2PEngine =
+                WifiP2PEngine.getASAPWifiP2PEngine(this, this);
         if(ASAPWifiP2PEngine != null) {
             ASAPWifiP2PEngine.stop();
         }

app/src/main/java/net/sharksystem/asap/android/service/MacLayerEngine.java

@@ -1,10 +1,11 @@
 package net.sharksystem.asap.android.service;
 
 import android.content.Context;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
+import android.content.pm.PackageManager;
 import android.util.Log;
 
+import androidx.core.app.ActivityCompat;
+
 import net.sharksystem.asap.ASAPException;
 import net.sharksystem.asap.protocol.ASAPConnection;
 
@@ -49,7 +50,7 @@ protected Context getContext() {
         return this.context;
     }
 
-    protected ASAPService getAsapService() {
+    public ASAPService getASAPService() {
         return this.asapService;
     }
 
@@ -70,6 +71,18 @@ private String getLogStart() {
         return "ASAPMacLayerEngine";
     }
 
+    public boolean permissionCheck(String requiredPermission) {
+        if (ActivityCompat.checkSelfPermission(this.asapService, requiredPermission)
+                != PackageManager.PERMISSION_GRANTED) {
+            Log.e(this.getLogStart(),
+                    "failure: required permission not granted \n" +
+                            "check Android ASAP peer init process and \n" +
+                            "check manifest");
+            return false;
+        }
+        return true;
+    }
+
     /**
      * TODO: do we need this? I doubt it (thsc)
      * It can be called to check whether open connection are still running. It's a good idea for
@@ -151,7 +164,7 @@ protected void launchASAPConnection(
 //            TestConnectionHandler testConnectionHandler = new TestConnectionHandler(this.is, this.os);
 //            testConnectionHandler.start();
             this.asapConnections.put(address,
-                this.getAsapService().getASAPPeer().handleConnection(inputStream, outputStream));
+                this.getASAPService().getASAPPeer().handleConnection(inputStream, outputStream));
 
         } catch (IOException | ASAPException e) {
             Log.d(this.getLogStart(), "while launching asap connection: " + e.getLocalizedMessage());

app/src/main/java/net/sharksystem/asap/android/wifidirect/WifiDirectBroadcastReceiver.java

@@ -1,13 +1,18 @@
 package net.sharksystem.asap.android.wifidirect;
 
+import android.Manifest;
+import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.NetworkInfo;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.util.Log;
 
+import androidx.core.app.ActivityCompat;
+
 class WifiDirectBroadcastReceiver extends BroadcastReceiver {
     // https://developer.android.com/guide/topics/connectivity/wifip2p#java
 
@@ -16,25 +21,26 @@ class WifiDirectBroadcastReceiver extends BroadcastReceiver {
     private final Context context;
     private final WifiP2pManager.PeerListListener peerListListener;
     private final WifiP2pManager.ConnectionInfoListener connectionInfoListener;
-    private final WifiP2PEngine aaspWifiP2PEngine;
+    private final WifiP2PEngine asapWifiP2PEngine;
 
     public WifiDirectBroadcastReceiver(
-            WifiP2PEngine aaspWifiP2PEngine,
+            WifiP2PEngine asapWifiP2PEngine,
             WifiP2pManager manager,
             WifiP2pManager.Channel channel,
             Context context,
             WifiP2pManager.PeerListListener peerListListener,
             WifiP2pManager.ConnectionInfoListener connectionInfoListener
     ) {
         super();
-        this.aaspWifiP2PEngine = aaspWifiP2PEngine;
+        this.asapWifiP2PEngine = asapWifiP2PEngine;
         this.mManager = manager;
         this.mChannel = channel;
         this.context = context;
         this.peerListListener = peerListListener;
         this.connectionInfoListener = connectionInfoListener;
     }
 
+    @SuppressLint("MissingPermission")
     @Override
     public void onReceive(Context context, Intent intent) {
         // https://developer.android.com/guide/topics/connectivity/wifip2p#java
@@ -49,19 +55,22 @@ public void onReceive(Context context, Intent intent) {
                 Log.d("Wifi_BR", "BL: wifi p2p enabled");
 
                 // discoverPeers peers
-                this.aaspWifiP2PEngine.discoverPeers();
+                this.asapWifiP2PEngine.discoverPeers();
             } else {
                 // Wi-Fi P2P is not enabled
-                Log.d("Wifi_BR","BL: wifi p2p not enabled");
+                Log.d("Wifi_BR", "BL: wifi p2p not enabled");
             }
 
         } else if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) {
             // Call WifiP2pManager.requestPeers() to get a list of current peers
             // that event is a result of a previous discoverPeers peers
 
             Log.d("Wifi_BR", "p2p peers changed");
-            // call for a list of peers
             if (mManager != null) {
+                if(!this.asapWifiP2PEngine.permissionCheck(Manifest.permission.ACCESS_FINE_LOCATION)) {
+                    return;
+                }
+                // ask for a list of new peers - send to PeerListListener
                 mManager.requestPeers(mChannel, this.peerListListener);
             }
 
@@ -94,4 +103,8 @@ public void onReceive(Context context, Intent intent) {
             // TODO do something useful with that information
         }
     }
+
+    private String getLogStart() {
+        return this.getClass().getSimpleName();
+    }
 }

app/src/main/java/net/sharksystem/asap/android/wifidirect/WifiP2PChannelListener.java

@@ -0,0 +1,16 @@
+package net.sharksystem.asap.android.wifidirect;
+
+import android.net.wifi.p2p.WifiP2pManager;
+
+public class WifiP2PChannelListener implements WifiP2pManager.ChannelListener {
+    private final WifiP2PEngine wifiP2PEngine;
+
+    public WifiP2PChannelListener(WifiP2PEngine wifiP2PEngine) {
+        this.wifiP2PEngine = wifiP2PEngine;
+    }
+
+    @Override
+    public void onChannelDisconnected() {
+
+    }
+}