refactor: remove deprecated APIs and improve serialization handling

Author: YogendraShelke

android/src/main/java/com/mendix/mendixnative/MendixApplication.java

@@ -5,7 +5,6 @@
 import com.mendix.mendixnative.react.splash.MendixSplashScreenPresenter;
 
 import java.util.List;
-import java.util.Map;
 
 public interface MendixApplication extends ReactApplication {
   boolean getUseDeveloperSupport();

android/src/main/java/com/mendix/mendixnative/MendixInitializer.kt

@@ -2,7 +2,6 @@ package com.mendix.mendixnative
 
 import android.app.Activity
 import com.facebook.react.ReactHost
-import com.facebook.react.devsupport.DevSupportManagerBase
 import com.facebook.react.modules.network.OkHttpClientProvider
 import com.mendix.mendixnative.config.AppPreferences
 import com.mendix.mendixnative.react.*

android/src/main/java/com/mendix/mendixnative/activity/MendixReactActivity.kt

@@ -1,17 +1,18 @@
 package com.mendix.mendixnative.activity
 
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.bridge.ReactContext
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.mendix.mendixnative.DevAppMenuHandler
 import com.mendix.mendixnative.MendixApplication
 import com.mendix.mendixnative.MendixInitializer
 import com.mendix.mendixnative.react.MendixApp
 import com.mendix.mendixnative.react.splash.MendixSplashScreenPresenter
 import com.mendix.mendixnative.util.MendixBackwardsCompatUtility
+import java.io.Serializable
 
 open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScreenHandler {
 
@@ -24,7 +25,7 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
 
   override fun onCreate(savedInstanceState: Bundle?) {
     mendixApp = mendixApp
-      ?: intent.getSerializableExtra(MENDIX_APP_INTENT_KEY) as? MendixApp
+      ?: getSerializableData(MENDIX_APP_INTENT_KEY, MendixApp::class.java)
         ?: throw IllegalStateException("MendixApp configuration can't be null")
     val mendixApplication = application as? MendixApplication
       ?: throw ClassCastException("Application needs to implement MendixApplication")
@@ -36,6 +37,19 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
     super.onCreate(null)
   }
 
+  inline fun <reified T : Serializable> getSerializableData(key: String?, clazz: Class<T>): T? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      intent.getSerializableExtra<T?>(key, clazz)
+    } else {
+      @Suppress("DEPRECATION")
+      val data = intent.getSerializableExtra(key)
+      if (data is T) {
+        return data
+      }
+      return null
+    }
+  }
+
   override fun onDestroy() {
     mendixInitializer.onDestroy()
     super.onDestroy()
@@ -46,12 +60,9 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
   }
 
   override fun showDevAppMenu() {
-    currentDevSupportManager?.showDevOptionsDialog();
+    currentDevSupportManager?.showDevOptionsDialog()
   }
 
-  private val currentReactContext: ReactContext?
-    get() = reactHost.currentReactContext
-
   val currentDevSupportManager: DevSupportManager?
     get() = reactHost.devSupportManager
 

android/src/main/java/com/mendix/mendixnative/fragment/MendixReactFragment.kt

@@ -1,6 +1,7 @@
 package com.mendix.mendixnative.fragment
 
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.KeyEvent
 import com.facebook.react.devsupport.interfaces.DevSupportManager
@@ -9,6 +10,7 @@ import com.mendix.mendixnative.MendixInitializer
 import com.mendix.mendixnative.activity.LaunchScreenHandler
 import com.mendix.mendixnative.react.MendixApp
 import com.mendix.mendixnative.util.MendixDoubleTapRecognizer
+import java.io.Serializable
 
 /**
  * Class used for Sample apps
@@ -54,7 +56,7 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
     }
 
     if (mendixApp == null) {
-      mendixApp = requireArguments().getSerializable(ARG_MENDIX_APP) as MendixApp?
+      mendixApp = getSerializableData(ARG_MENDIX_APP, MendixApp::class.java)
         ?: throw IllegalArgumentException("Mendix app is required")
     }
 
@@ -73,6 +75,19 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
     super.onCreate(savedInstanceState)
   }
 
+  inline fun <reified T : Serializable> getSerializableData(key: String?, clazz: Class<T>): T? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      requireArguments().getSerializable<T?>(key, clazz)
+    } else {
+      @Suppress("DEPRECATION")
+      val data = requireArguments().getSerializable(key)
+      if (data is T) {
+        return data
+      }
+      return null
+    }
+  }
+
   fun onNewIntent(intent: Intent) {
     reactHost?.currentReactContext?.let {
       it.onNewIntent(it.currentActivity, intent)
@@ -100,7 +115,7 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
 
   override fun showDevAppMenu() {
     activity?.let {
-      currentDevSupportManager?.showDevOptionsDialog();
+      currentDevSupportManager?.showDevOptionsDialog()
     }
   }
 

android/src/main/java/com/mendix/mendixnative/react/ClearData.kt

@@ -48,12 +48,12 @@ fun clearDataWithReactContext(applicationContext: Application, reactHost: ReactH
   deleteAppDatabaseAsync(reactContext, object : BooleanCallback {
     var fired = false
 
-    override fun invoke(success: Boolean) {
+    override fun invoke(res: Boolean) {
       if (fired) return
 
       fired = true
 
-      if (!success) {
+      if (!res) {
         reportError("database")
       }
 
@@ -62,7 +62,7 @@ fun clearDataWithReactContext(applicationContext: Application, reactHost: ReactH
       }
 
       clearSecureStorage(reactContext?.applicationContext)
-      if (!success) {
+      if (!res) {
         reportError("encrypted storage")
       }
 

android/src/main/java/com/mendix/mendixnative/react/cookie/NativeCookieModule.kt

@@ -2,13 +2,11 @@ package com.mendix.mendixnative.react.cookie
 
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.bridge.WritableNativeMap
 import com.facebook.react.modules.network.ForwardingCookieHandler
 
 class NativeCookieModule(val reactContext: ReactApplicationContext) {
   fun clearAll(promise: Promise) {
-    ForwardingCookieHandler(reactContext).clearCookies {
+    ForwardingCookieHandler().clearCookies {
       promise.resolve(null)
     }
   }