diff --git a/android/.project b/android/.project index 0e0a1bac..8b147968 100644 --- a/android/.project +++ b/android/.project @@ -14,4 +14,15 @@ org.eclipse.buildship.core.gradleprojectnature + + + 1763473651231 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs index 8c253d67..4ca572fb 100644 --- a/android/.settings/org.eclipse.buildship.core.prefs +++ b/android/.settings/org.eclipse.buildship.core.prefs @@ -1,11 +1,11 @@ -arguments= +arguments=--init-script /var/folders/6q/sbj9h5lx6rsfs_cfzqmwrj4m0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/6q/sbj9h5lx6rsfs_cfzqmwrj4m0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle auto.sync=false build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0)) +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 gradle.user.home= -java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_144.jdk/Contents/Home +java.home=/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home jvm.arguments= offline.mode=false override.workspace.settings=true diff --git a/android/build.gradle b/android/build.gradle index e7461c99..d6bd9f11 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -163,7 +163,7 @@ dependencies { // noinspection GradleDynamicVersion api 'com.facebook.react:react-native:0.63.4' // implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'com.ttlock:ttlock:3.5.4' + implementation 'com.ttlock:ttlock:3.5.6' // implementation(name: 'ttlock-release', ext: 'aar') implementation 'com.google.code.gson:gson:2.6.1' } diff --git a/android/src/main/java/com/reactnativettlock/TtlockModule.java b/android/src/main/java/com/reactnativettlock/TtlockModule.java index e6d5ae8a..2d639313 100644 --- a/android/src/main/java/com/reactnativettlock/TtlockModule.java +++ b/android/src/main/java/com/reactnativettlock/TtlockModule.java @@ -235,13 +235,15 @@ public String getName() { // } @ReactMethod - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + public void onRequestPermissionsResult(int requestCode, ReadableArray permissions, ReadableArray grantResults) { switch (requestCode) { case PERMISSIONS_REQUEST_CODE: { // If request is cancelled, the result arrays are empty. - if (grantResults.length > 0) { - for (int i=0;i 0) { + for (int i=0;i org.eclipse.buildship.core.gradleprojectnature + + + 1763473651228 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/example/android/.settings/org.eclipse.buildship.core.prefs b/example/android/.settings/org.eclipse.buildship.core.prefs index e8895216..4ca572fb 100644 --- a/example/android/.settings/org.eclipse.buildship.core.prefs +++ b/example/android/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ +arguments=--init-script /var/folders/6q/sbj9h5lx6rsfs_cfzqmwrj4m0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/6q/sbj9h5lx6rsfs_cfzqmwrj4m0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home=/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/example/android/app/src/main/java/com/example/reactnativettlock/MainActivity.java b/example/android/app/src/main/java/com/example/reactnativettlock/MainActivity.java index b4f129a2..20847918 100644 --- a/example/android/app/src/main/java/com/example/reactnativettlock/MainActivity.java +++ b/example/android/app/src/main/java/com/example/reactnativettlock/MainActivity.java @@ -5,6 +5,8 @@ import com.facebook.react.ReactActivity; import com.facebook.react.ReactInstanceManager; import com.reactnativettlock.TtlockModule; +import com.facebook.react.bridge.Arguments; +import com.facebook.react.bridge.WritableArray; public class MainActivity extends ReactActivity { /** @@ -27,7 +29,18 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in ReactInstanceManager mReactInstanceManager = getReactNativeHost().getReactInstanceManager(); TtlockModule ttlockModule = mReactInstanceManager.getCurrentReactContext().getNativeModule(TtlockModule.class); - ttlockModule.onRequestPermissionsResult(requestCode, permissions, grantResults); + WritableArray permissionsArray = Arguments.createArray(); + for (String permission : permissions) { + permissionsArray.pushString(permission); + } + + // Convert int[] to WritableArray for Turbo Module compatibilityAdd commentMore actions + WritableArray grantResultsArray = Arguments.createArray(); + for (int result : grantResults) { + grantResultsArray.pushInt(result); + } + + ttlockModule.onRequestPermissionsResult(requestCode, permissionsArray, grantResults); } }