fix(Android): Update Android code (#220)

Author: eliaslecomte

android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
 
         dependencies {
-            classpath("com.android.tools.build:gradle:4.2.2")
+            classpath 'com.android.tools.build:gradle:7.1.3'
         }
     }
 }
@@ -21,7 +21,7 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 28)
+    compileSdkVersion safeExtGet('compileSdkVersion', 31)
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -30,7 +30,7 @@ android {
 
     defaultConfig {
         minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 28)
+        targetSdkVersion safeExtGet('targetSdkVersion', 31)
     }
     lintOptions{
         abortOnError false

android/src/main/java/com/tradle/react/UdpErrorCodes.java

@@ -0,0 +1,12 @@
+package com.tradle.react;
+
+public enum UdpErrorCodes {
+
+    clientNotFound,
+
+    socketAlreadyBoundError,
+
+    sendError,
+
+    setBroadcast,
+}

android/src/main/java/com/tradle/react/UdpErrorUtil.java

@@ -7,24 +7,22 @@
 
 package com.tradle.react;
 
-import javax.annotation.Nullable;
-
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 
+import javax.annotation.Nonnull;
+
 /**
  * Helper class for udp errors.
  */
 public class UdpErrorUtil {
     /**
      * Create Error object to be passed back to the JS callback.
      */
-    /* package */ static WritableMap getError(@Nullable String key, String errorMessage) {
-        WritableMap errorMap = Arguments.createMap();
+    /* package */ static WritableMap getError(@Nonnull String key, String errorMessage) {
+        final WritableMap errorMap = Arguments.createMap();
+        errorMap.putString("key", key);
         errorMap.putString("message", errorMessage);
-        if (key != null) {
-            errorMap.putString("key", key);
-        }
         return errorMap;
     }
 }

android/src/main/java/com/tradle/react/UdpSocketClient.java

@@ -1,6 +1,5 @@
 package com.tradle.react;
 
-import androidx.annotation.Nullable;
 import android.util.Base64;
 
 import com.facebook.react.bridge.Callback;
@@ -17,10 +16,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 import static com.tradle.react.UdpSenderTask.OnDataSentListener;
 
+import javax.annotation.Nullable;
+
 /**
  * Client class that wraps a sender and a receiver for UDP data.
  */
@@ -225,7 +225,7 @@ public void onDataSentError(UdpSenderTask task, String error) {
         }
 
         if (callback != null) {
-            callback.invoke(UdpErrorUtil.getError(null, error));
+            callback.invoke(UdpErrorUtil.getError(UdpErrorCodes.sendError.name(), error));
         }
     }
 

android/src/main/java/com/tradle/react/UdpSockets.java

@@ -3,9 +3,6 @@
 import android.content.Context;
 import android.net.wifi.WifiManager;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import android.util.SparseArray;
 
 import com.facebook.common.logging.FLog;
@@ -25,6 +22,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * The NativeModule in charge of storing active {@link UdpSocketClient}s, and acting as an api layer.
  */
@@ -41,7 +41,7 @@ public UdpSockets(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
-    @NonNull
+    @Nonnull
     @Override
     public String getName() {
         return TAG;
@@ -74,7 +74,7 @@ private UdpSocketClient findClient(final Integer cId, final Callback callback) {
             if (callback == null) {
                 FLog.e(TAG, "missing callback parameter.");
             } else {
-                callback.invoke(UdpErrorUtil.getError(null, "no client found with id " + cId), null);
+                callback.invoke(UdpErrorUtil.getError(UdpErrorCodes.clientNotFound.name(), "no client found with id " + cId), null);
             }
         }
 
@@ -123,7 +123,7 @@ public void run() {
                     callback.invoke(null, result);
                 } catch (Exception e) {
                     // Socket is already bound or a problem occurred during binding
-                    callback.invoke(UdpErrorUtil.getError(null, e.getMessage()));
+                    callback.invoke(UdpErrorUtil.getError(UdpErrorCodes.socketAlreadyBoundError.name(), e.getMessage()));
                 }
             }
         }));
@@ -221,7 +221,7 @@ public void run() {
                 try {
                     client.send(base64String, port, address, callback);
                 } catch (Exception exception) {
-                    callback.invoke((UdpErrorUtil.getError(null, exception.getMessage())));
+                    callback.invoke((UdpErrorUtil.getError(UdpErrorCodes.sendError.name(), exception.getMessage())));
                 }
             }
         }));
@@ -268,7 +268,7 @@ public void run() {
                     client.setBroadcast(flag);
                     callback.invoke();
                 } catch (SocketException e) {
-                    callback.invoke(UdpErrorUtil.getError(null, e.getMessage()));
+                    callback.invoke(UdpErrorUtil.getError(UdpErrorCodes.setBroadcast.name(), e.getMessage()));
                 }
             }
         }));

android/src/main/java/com/tradle/react/UdpSocketsModule.java

@@ -8,6 +8,7 @@
 package com.tradle.react;
 
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
@@ -22,13 +23,18 @@ public final class UdpSocketsModule implements ReactPackage {
     @Override
     public List<NativeModule> createNativeModules(
             ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<NativeModule>();
+        List<NativeModule> modules = new ArrayList<>();
 
         modules.add(new UdpSockets(reactContext));
 
         return modules;
     }
 
+    @Override
+    public List<Class<? extends JavaScriptModule>> createJSModules() {
+        return Collections.emptyList();
+    }
+
     @Override
     public List<ViewManager> createViewManagers(
             ReactApplicationContext reactContext) {