diff --git a/android/android.iml b/android/android.iml
new file mode 100644
index 0000000..1528ca5
--- /dev/null
+++ b/android/android.iml
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index ad5f665..b0e8496 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,34 +1,36 @@
buildscript {
- repositories {
- jcenter()
- }
+ repositories {
+ jcenter()
+ google()
+ }
- dependencies {
- classpath 'com.android.tools.build:gradle:1.2.3'
- }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.4.0'
+ }
}
apply plugin: 'com.android.library'
android {
- compileSdkVersion 23
- buildToolsVersion "23.0.1"
+ compileSdkVersion 28
+ buildToolsVersion "28.0.3"
- defaultConfig {
- minSdkVersion 16
- targetSdkVersion 21
- versionCode 1
- versionName "1.0"
- }
- lintOptions {
- abortOnError false
- }
+ defaultConfig {
+ minSdkVersion 16
+ targetSdkVersion 28
+ versionCode 1
+ versionName "1.1"
+ }
+ lintOptions {
+ abortOnError false
+ }
}
repositories {
- mavenCentral()
+ jcenter()
+ google()
}
dependencies {
- compile "com.facebook.react:react-native:0.19.+"
+ implementation "com.facebook.react:react-native:0.20.1"
}
diff --git a/android/src/main/java/com/tuanpm/RCTSmartconfig/RCTSmartconfigModule.java b/android/src/main/java/com/tuanpm/RCTSmartconfig/RCTSmartconfigModule.java
index d628597..a2a717b 100644
--- a/android/src/main/java/com/tuanpm/RCTSmartconfig/RCTSmartconfigModule.java
+++ b/android/src/main/java/com/tuanpm/RCTSmartconfig/RCTSmartconfigModule.java
@@ -61,8 +61,8 @@ public void stop() {
public void start(final ReadableMap options, final Promise promise) {
String ssid = options.getString("ssid");
String pass = options.getString("password");
- Boolean hidden = false;
- //Int taskResultCountStr = 1;
+ // Boolean hidden = false;
+ // Int taskResultCountStr = 1;
Log.d(TAG, "ssid " + ssid + ":pass " + pass);
stop();
new EsptouchAsyncTask(new TaskListener() {
@@ -91,11 +91,11 @@ public void onFinished(List result) {
promise.resolve(ret);
} else {
Log.d(TAG, "Error run smartconfig");
- promise.reject("new IllegalViewOperationException()");
+ promise.reject("", "new IllegalViewOperationException()");
}
}
- }).execute(ssid, new String(""), pass, "YES", "1");
+ }).execute(ssid, "", pass, "YES", "1");
//promise.resolve(encoded);
//promise.reject("Error creating media file.");
//
@@ -104,7 +104,7 @@ public void onFinished(List result) {
public interface TaskListener {
- public void onFinished(List result);
+ void onFinished(List result);
}
private class EsptouchAsyncTask extends AsyncTask> {
@@ -133,6 +133,7 @@ public EsptouchAsyncTask(TaskListener listener) {
protected void onPreExecute() {
Log.d(TAG, "Begin task");
}
+
@Override
protected List doInBackground(String... params) {
Log.d(TAG, "doing task");
diff --git a/android/src/main/java/com/tuanpm/RCTSmartconfig/RCTSmartconfigPackage.java b/android/src/main/java/com/tuanpm/RCTSmartconfig/RCTSmartconfigPackage.java
index 7bcb31f..0b1a2fa 100644
--- a/android/src/main/java/com/tuanpm/RCTSmartconfig/RCTSmartconfigPackage.java
+++ b/android/src/main/java/com/tuanpm/RCTSmartconfig/RCTSmartconfigPackage.java
@@ -1,16 +1,15 @@
package com.tuanpm.RCTSmartconfig;
-import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import android.util.Log;
import com.facebook.react.ReactPackage;
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.uimanager.ViewManager;
import com.facebook.react.bridge.JavaScriptModule;
+
public class RCTSmartconfigPackage implements ReactPackage {