bantucracy · sabzo · Mar 2, 2020
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,8 +24,11 @@ dependencies {
     androidTestCompile('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'androidx.appcompat:appcompat:1.0.0'
-    compile 'com.google.code.gson:gson:2.8.0'
-    testCompile 'junit:junit:4.12'
-    compile project(':ayanda')
+
+    api 'com.squareup.okhttp3:okhttp:3.10.0'
+    api 'org.nanohttpd:nanohttpd:2.3.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.code.gson:gson:2.8.0'
+    testImplementation 'junit:junit:4.12'
+    implementation project(':ayanda')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="sintulabs.ayanda">
+    <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="sintulabs.ayanda">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
@@ -18,8 +18,8 @@
 
         </activity>
         <activity android:name="sample.BluetoothActivity" android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
 
+            android:theme="@style/AppTheme.NoActionBar">
         </activity>
         <activity
             android:name="sample.WifiDirectActivity"

diff --git a/app/src/main/java/sample/MyClient.java b/app/src/main/java/sample/MyClient.java
@@ -46,7 +46,6 @@ public MyClient(Context applicationContext) {
         }
     }
 
-
     public OkHttpClient getHTTPClient() {
         return mClient;
     }
@@ -146,7 +145,6 @@ else if (mimeType.startsWith("video"))
             else if (mimeType.startsWith("audio"))
                 fileExt = "m4a";
         }
-
         return fileExt;
     }
 
@@ -159,5 +157,4 @@ private String buildUrl(String url, String path) {
         }
         return sbUrl.toString();
     }
-
 }
diff --git a/app/src/main/java/sample/MyServer.java b/app/src/main/java/sample/MyServer.java
@@ -76,7 +76,7 @@ public void run() {
             return NanoHTTPD.newFixedLengthResponse(Response.Status.OK, "text/plain", fileToShare.getMetadataJson());
 
         } else {
-            String msg = "<html><body><h1>Hello server</h1>\n";
+            String msg = "<html><body><h1  >Hello server</h1>\n";
             Map<String, String> parms = session.getParms();
             if (parms.get("username") == null) {
                 msg += "<form action='?' method='get'>\n  <p>Your name: <input type='text' name='username'></p>\n" + "</form>\n";

diff --git a/app/src/main/java/sample/WifiDirectActivity.java b/app/src/main/java/sample/WifiDirectActivity.java
@@ -48,6 +48,7 @@ public class WifiDirectActivity extends AppCompatActivity {
     private List peers = new ArrayList();
     private List peerNames = new ArrayList();
     private ArrayAdapter<String> peersAdapter = null;
+    private int defualtPort = 8080;
 
     private Button btnWdShareFile;
     private Button btnWdDiscover;
@@ -91,53 +92,33 @@ public void wifiP2pThisDeviceChangedAction(Intent intent) {
 
             @Override
             public void onConnectedAsServer(Server server) {
-
+                try {
+                    a.setServer(new MyServer(WifiDirectActivity.this, defualtPort));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
 
             @Override
             public void onConnectedAsClient(final InetAddress groupOwnerAddress) {
+                // This is essentially polling,
                 new Thread(new Runnable() {
                     @Override
                     public void run() {
                         MyClient client = new MyClient(WifiDirectActivity.this);
-                        try {
-
-                                final String response = client
-                                    .get(groupOwnerAddress.getHostAddress() + ":" + Integer.toString(8080));
-                            new Handler(Looper.getMainLooper()).post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Toast.makeText(WifiDirectActivity.this, response, Toast.LENGTH_LONG).show();
-                                }
-                            });
-
-
-                        } catch (IOException e) {
-                           e.printStackTrace();
-                        }
-
                         try {
                             final File file = client.getFile(groupOwnerAddress.getHostAddress() + ":" + Integer.toString(8080));
                         } catch (IOException e) {
                             e.printStackTrace();
                         }
-
-
                         if (nearbyMedia != null) {
-
                            client.uploadFile(groupOwnerAddress.getHostAddress() + ":" + Integer.toString(8080), nearbyMedia);
+                           nearbyMedia = null;
                         }
                     }
                 }).start();
-
             }
         });
-        try {
-            int defualtPort = 8080;
-            a.setServer(new MyServer(this, defualtPort));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
     }
 
     private void createView() {
@@ -188,28 +169,21 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             // Load the selected image into a preview
             ImageView ivPreview = (ImageView) findViewById(R.id.ivPreviewWD);
             ivPreview.setImageBitmap(selectedImage);
-
             String filePath = getRealPathFromURI(photoUri);
-
-
             try {
                 nearbyMedia = new NearbyMedia();
                 nearbyMedia.setMimeType("image/jpeg");
                 nearbyMedia.setTitle("pic");
-
                 nearbyMedia.setFileMedia(new File(filePath));
-
                 //get a JSON reprecation of the metadata we want to share
                 Gson gson = new GsonBuilder()
                         .setDateFormat(DateFormat.FULL, DateFormat.FULL).create();
                 nearbyMedia.mMetadataJson = gson.toJson("key:value");
-
                 a.wdShareFile(nearbyMedia);
             } catch (IOException e) {
                 nearbyMedia = null;
                 e.printStackTrace();
             }
-
         }
     }
 

diff --git a/ayanda/build.gradle b/ayanda/build.gradle
@@ -23,13 +23,13 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.squareup.okhttp3:okhttp:3.10.0'
-    compile 'org.nanohttpd:nanohttpd:2.3.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'org.nanohttpd:nanohttpd:2.3.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     testImplementation 'org.robolectric:robolectric:4.3'
     implementation 'com.google.android.gms:play-services-location:11.8.0'
-    compile 'androidx.appcompat:appcompat:1.0.0'
-    testCompile 'junit:junit:4.12'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/ayanda/src/main/java/sintulabs/p2p/IWifiDirect.java b/ayanda/src/main/java/sintulabs/p2p/IWifiDirect.java
@@ -13,6 +13,7 @@ public interface IWifiDirect {
     void wifiP2pPeersChangedAction();
     void wifiP2pConnectionChangedAction(Intent intent);
     void wifiP2pThisDeviceChangedAction(Intent intent);
+    // This can be overriden with a custom Server class
     void onConnectedAsServer(Server server);
     void onConnectedAsClient(InetAddress groupOwnerAddress);
 }
diff --git a/ayanda/src/main/java/sintulabs/p2p/Lan.java b/ayanda/src/main/java/sintulabs/p2p/Lan.java
@@ -4,32 +4,21 @@
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
 import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
-import android.widget.Toast;
-import fi.iki.elonen.NanoHTTPD;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
-import okio.BufferedSink;
-import okio.Okio;
 
-import java.io.ByteArrayOutputStream;
+
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 
 /**

diff --git a/ayanda/src/main/java/sintulabs/p2p/Server.java b/ayanda/src/main/java/sintulabs/p2p/Server.java
@@ -27,13 +27,13 @@ public int getPort() {
     }
 
     public void setFileToShare(NearbyMedia media) {
-       mServer.setFileToShare(media);
-    }
+       mServer.setFileToShare(media);    }
 
     public static Server getInstance() throws IOException {
         if (server == null) {
             throw new IOException("Server not defined");
         }
+
         return server;
     }
 

diff --git a/ayanda/src/main/java/sintulabs/p2p/WifiDirect.java b/ayanda/src/main/java/sintulabs/p2p/WifiDirect.java
@@ -355,7 +355,7 @@ public void discover() {
      */
     @Override
     public Boolean isSupported() {
-        return null;
+        return wiFiP2pEnabled;
     }
 
     /**
@@ -364,6 +364,6 @@ public Boolean isSupported() {
      */
     @Override
     public Boolean isEnabled() {
-        return null;
+        return wiFiP2pEnabled;
     }
 }