Merge pull request #5 from inthepocket/feature/android-10-support

Feature/android 10 support

android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.2'
     }
 }
 

android/gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

android/src/main/java/com/reactlibrary/RNWifiModule.java

@@ -20,8 +20,9 @@
 import android.content.IntentFilter;
 import android.content.BroadcastReceiver;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.List;
 
@@ -240,21 +241,11 @@ public void connectToProtectedSSID(@NonNull final String SSID, @NonNull final St
 	 * @param promise to resolve or reject if connecting worked
 	 */
 	private void connectTo(@NonNull final String SSID, @NonNull final String password, @NonNull final WIFI_ENCRYPTION encryption, @NonNull final Promise promise) {
-//		// TODO: Test on Android 10
-//		if (isAndroid10OrLater()) {
-//			final WifiNetworkSpecifier wifiNetworkSpecifier = new WifiNetworkSpecifier.Builder()
-//					.setSsid(SSID)
-//					.setWpa2Passphrase(password)
-//					.build();
-//
-//			final ConnectivityManager connectivityManager = (ConnectivityManager) this.context.getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-//			if (connectivityManager == null) {
-//				promise.reject("error", "error");
-//				return;
-//			}
-//
-//			promise.resolve(null);
-//		} else {
+		// Note: For now Android 10 still works but in the future, the WifiConfiguration methods are all deprecated.
+		// if (isAndroid10OrLater()) {
+		// 		1) create WifiNetworkSpecifier https://developer.android.com/reference/android/net/wifi/WifiNetworkSpecifier.Builder
+		//		2) create NetworkRequest https://developer.android.com/reference/android/net/NetworkRequest.Builder
+		//      3) connectivityManager.requestNetwork()
 
 		// create network
 		final WifiConfiguration wifiConfiguration = new WifiConfiguration();

android/src/main/java/com/reactlibrary/utils/PermissionUtils.java

@@ -5,8 +5,8 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 
 import java.security.InvalidParameterException;