support v2 and multiple plgd instances (#32)

Author: ondrejtomcik

android/app/build.gradle

@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -45,7 +45,7 @@ android {
     defaultConfig {
         applicationId "dev.plgd.client"
         minSdkVersion 17
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/app/src/main/kotlin/dev/plgd/mobile/MainActivity.kt

@@ -13,15 +13,18 @@ import kotlinx.coroutines.withContext
 
 class MainActivity: FlutterActivity() {
     private val CHANNEL = "plgd.dev/client"
-    private var sdkClient: ocfclient.Ocfclient_? = null;
+    private var sdkClient: Ocfclient.Ocfclient_? = null;
     private val _mainScope = CoroutineScope(Dispatchers.Main)
 
     override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
         GeneratedPluginRegistrant.registerWith(flutterEngine)
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL).setMethodCallHandler { call, result ->
             when (call.method) {
                 "initialize" -> this.initializeOCFClient(call, result)
+                "close" -> this.closeOCFClient(result)
+                "getOwnerId" -> this.getOwnerId(result)
                 "discoverDevices" -> this.discoverDevices(call, result)
+                "getResource" -> this.getResource(call, result)
                 "ownDevice" -> this.ownDevice(call, result)
                 "setAccessForCloud" -> this.setAccessForCloud(call, result)
                 "onboardDevice" -> this.onboardDevice(call, result)
@@ -34,11 +37,12 @@ class MainActivity: FlutterActivity() {
     private fun initializeOCFClient(call: MethodCall, result: MethodChannel.Result) {
         var accessToken = call.argument<String>("accessToken");
         var cloudConfiguration = call.argument<String>("cloudConfiguration")
+        var signingServerAddress = call.argument<String>("signingServerAddress")
         _mainScope.launch {
             try {
-                sdkClient = ocfclient.Ocfclient_()
+                sdkClient = Ocfclient.Ocfclient_()
                 withContext(Dispatchers.IO) {
-                    sdkClient!!.initialize(accessToken, cloudConfiguration)
+                    sdkClient!!.initialize(accessToken, cloudConfiguration, signingServerAddress)
                 }
                 result.success(true)
             } catch (e: Exception) {
@@ -48,6 +52,32 @@ class MainActivity: FlutterActivity() {
         }
     }
 
+    private fun closeOCFClient(result: MethodChannel.Result) {
+        _mainScope.launch {
+            try {
+                withContext(Dispatchers.IO) {
+                    sdkClient!!.close()
+                }
+                result.success(true)
+            } catch (e: Exception) {
+                result.error("-1", e.message, "")
+            }
+        }
+    }
+
+    private fun getOwnerId(result: MethodChannel.Result) {
+        _mainScope.launch {
+            try {
+                var ownerId = withContext(Dispatchers.IO) {
+                    sdkClient!!.getOwnerID()
+                }
+                result.success(ownerId)
+            } catch (e: Exception) {
+                result.error("-1", e.message, "")
+            }
+        }
+    }
+
     private fun discoverDevices(call: MethodCall, result: MethodChannel.Result) {
         var discoveryTimeout = call.arguments<Int>()
         _mainScope.launch {
@@ -62,6 +92,21 @@ class MainActivity: FlutterActivity() {
         }
     }
 
+    private fun getResource(call: MethodCall, result: MethodChannel.Result) {
+        var deviceId = call.argument<String>("deviceID")
+        var href = call.argument<String>("href")
+        _mainScope.launch {
+            try {
+                var resourceContent = withContext(Dispatchers.IO) {
+                    sdkClient!!.getResource(deviceId, href)
+                }
+                result.success(resourceContent)
+            } catch (e: Exception) {
+                result.error("-1", e.message, "")
+            }
+        }
+    }
+
     private fun ownDevice(call: MethodCall, result: MethodChannel.Result) {
         var deviceId = call.argument<String>("deviceID")
         var accessToken = call.argument<String>("accessToken")
@@ -94,10 +139,12 @@ class MainActivity: FlutterActivity() {
     private fun onboardDevice(call: MethodCall, result: MethodChannel.Result) {
         var deviceId = call.argument<String>("deviceID")
         var authCode = call.argument<String>("authCode")
+        var authorizationProvider = call.argument<String>("authorizationProvider")
+
         _mainScope.launch {
             try {
                 withContext(Dispatchers.IO) {
-                    sdkClient!!.onboardDevice(deviceId, authCode)
+                    sdkClient!!.onboardDevice(deviceId, authCode, authorizationProvider)
                 }
                 result.success(true)
             } catch (e: Exception) {