Refactor-do_not_use_flutter_isolate

android/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -48,6 +48,6 @@ android {
 repositories { maven { url 'https://jitpack.io' } }
 
 dependencies {
-    implementation 'com.github.ankidroid:Anki-Android:api-v1.1.0'
+    implementation 'com.github.ankidroid:Anki-Android:v2.17.4'
 }
 

android/src/main/kotlin/com/aaalkoud/flutter_ankidroid/FlutterAnkidroidPlugin.kt

@@ -1,8 +1,11 @@
 package com.aaalkoud.flutter_ankidroid
 
+import android.app.Activity
+import android.app.Application
 import android.content.Intent
 import android.content.Context
 import android.content.pm.PackageManager
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import java.io.File
@@ -13,26 +16,117 @@ import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
+import io.flutter.plugin.common.PluginRegistry
 import io.flutter.plugin.common.MethodChannel.Result
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.plugin.common.PluginRegistry.Registrar
+import io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+
+
 
 /** FlutterAnkidroidPlugin */
-class FlutterAnkidroidPlugin: FlutterPlugin, MethodCallHandler {
-
+public class FlutterAnkidroidPlugin : FlutterPlugin, MethodCallHandler, RequestPermissionsResultListener, ActivityAware {
+
+  private var act: Activity? = null
+
   private lateinit var channel : MethodChannel
   private lateinit var context: Context
   private lateinit var api : AddContentApi
 
+  private var ankiPermissionCode = 4321
+  private var ankiPermissionName = "com.ichi2.anki.permission.READ_WRITE_DATABASE"
+  private var permissionRequestResult : Result? = null
+
+
+
   override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
-    channel = MethodChannel(flutterPluginBinding.binaryMessenger, "flutter_ankidroid")
+
     context = flutterPluginBinding.applicationContext
     api = AddContentApi(context)
+
+    channel = MethodChannel(flutterPluginBinding.flutterEngine.dartExecutor, "flutter_ankidroid")
     channel.setMethodCallHandler(this)
+
+  }
+  override fun onAttachedToActivity(binding : ActivityPluginBinding) {
+    act = binding.activity
+    binding.addRequestPermissionsResultListener(this)
+  }
+  override fun onDetachedFromActivityForConfigChanges() {
+    act = null;
+  }
+  override fun onReattachedToActivityForConfigChanges(binding : ActivityPluginBinding) {
+    act = binding.activity
+    binding.addRequestPermissionsResultListener(this)
+  }
+  override fun onDetachedFromActivity() {
+    act = null;
+  }
+
+  override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray): Boolean{
+
+    var permissionGranted : Boolean = false
+
+    when(requestCode) {
+      ankiPermissionCode -> {
+        if ( null != grantResults ) {
+          permissionGranted = grantResults.isNotEmpty() &&
+            grantResults.get(0) == PackageManager.PERMISSION_GRANTED
+        }
+      }
+    }
+    permissionRequestResult!!.success(permissionGranted)
+    return permissionGranted
+  }
+
+  /*
+  * Checks if the user already gave permission to interact with anki
+  * Returns true if permission is granted, false otherwise
+  */
+  fun checkPermission(): Boolean{
+
+    val permission = ContextCompat.checkSelfPermission(context, ankiPermissionName)
+    val granted = permission == PackageManager.PERMISSION_GRANTED
+
+    return granted
+
+  }
+
+  /*
+  * Shows a native permission request to interact with ankidroid
+  */
+  fun requestPermission(result: Result){
+
+    val granted = checkPermission()
+
+    if(granted){
+      result.success(granted)
+      return
+    }
+    else {
+      ActivityCompat.requestPermissions(act!!, arrayOf(ankiPermissionName), ankiPermissionCode)
+    }
+
   }
 
   override fun onMethodCall(call: MethodCall, result: Result) {
-    val permission = ContextCompat.checkSelfPermission(context, "com.ichi2.anki.permission.READ_WRITE_DATABASE")
-    if (permission != PackageManager.PERMISSION_GRANTED) {
+
+    var granted : Boolean = checkPermission()
+
+    if(call.method == "checkPermission"){
+      result.success(granted);
+      return
+    }
+    else if(call.method == "requestPremission"){
+      permissionRequestResult = result
+      requestPermission(result)
+      return
+    }
+
+    if (!granted) {
       result.error("Permission to use and modify AnkiDroid database not granted!", "Permission to use and modify AnkiDroid database not granted!", null)
+      return
     }
 
     when (call.method) {
@@ -80,11 +174,13 @@ class FlutterAnkidroidPlugin: FlutterPlugin, MethodCallHandler {
       "findDuplicateNotesWithKey" -> {
         val mid = call.argument<Long>("mid")!!
         val key = call.argument<String>("key")!!
-        val dupes = api.findDuplicateNotes(mid, key).map {hashMapOf(
-          "id" to it.id,
-          "fields" to it.fields.toList(),
-          "tags" to it.tags.toList()
-        )}
+        val dupes = api.findDuplicateNotes(mid, key).map {
+          hashMapOf(
+            "id" to it!!.getId(),
+            "fields" to it!!.getFields().toList(),
+            "tags" to it!!.getTags().toList()
+          )
+        }
 
         result.success(dupes)
       }
@@ -95,15 +191,15 @@ class FlutterAnkidroidPlugin: FlutterPlugin, MethodCallHandler {
         val dupes = api.findDuplicateNotes(mid, keys)
 
         val list = mutableListOf<List<Map<String, Any>>>()
-        for (i in 0 until dupes.size()) {
-          val innerList = dupes.valueAt(i)
+        for (i in 0 until dupes!!.size()) {
+          val innerList = dupes!!.valueAt(i)
 
           if (innerList != null) {
 
             list.add(innerList.map {hashMapOf(
-              "id" to it.id,
-              "fields" to it.fields.toList(),
-              "tags" to it.tags.toList()
+              "id" to it!!.getId(),
+              "fields" to it!!.getFields().toList(),
+              "tags" to it!!.getTags().toList()
             )})
 
           } else {
@@ -139,9 +235,9 @@ class FlutterAnkidroidPlugin: FlutterPlugin, MethodCallHandler {
         val note = api.getNote(noteId)
 
         result.success(hashMapOf(
-          "id" to note.id,
-          "fields" to note.fields.toList(),
-          "tags" to note.tags.toList()
+          "id" to note!!.getId(),
+          "fields" to note!!.getFields().toList(),
+          "tags" to note!!.getTags().toList()
         ))
       }
 
@@ -182,7 +278,7 @@ class FlutterAnkidroidPlugin: FlutterPlugin, MethodCallHandler {
       "getFieldList" -> {
         val modelId = call.argument<Long>("modelId")!!
 
-        result.success(api.getFieldList(modelId).toList())
+        result.success(api.getFieldList(modelId)!!.toList())
       }
 
       "modelList" -> result.success(api.modelList)
@@ -224,4 +320,5 @@ class FlutterAnkidroidPlugin: FlutterPlugin, MethodCallHandler {
   override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
     channel.setMethodCallHandler(null)
   }
+
 }

example/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.9.20'
     repositories {
         google()
         mavenCentral()

example/pubspec.lock

@@ -21,18 +21,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.1"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.3"
+    version: "1.18.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -45,14 +37,6 @@ packages:
       relative: true
     source: path
     version: "0.8.1"
-  flutter_isolate:
-    dependency: transitive
-    description:
-      name: flutter_isolate
-      sha256: "994ddec596da4ca12ca52154fd59404077584643eb7e3f1008a55fda9fe0b76b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.4"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -61,14 +45,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -81,47 +57,23 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
-  request_permission:
-    dependency: transitive
-    description:
-      name: request_permission
-      sha256: f058e75a3ff29a6f5d5ed1042673d7d4d7e5abcda12256675cf88d095dfa84f6
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
+    version: "1.15.0"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.2"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
@@ -131,5 +83,5 @@ packages:
     source: hosted
     version: "2.1.4"
 sdks:
-  dart: ">=3.0.5 <4.0.0"
+  dart: ">=3.3.0-0 <4.0.0"
   flutter: ">=3.3.0"