refactor(android): update SDK versions and dependencies

Author: fadi-george

android/build.gradle

@@ -7,11 +7,10 @@ def safeExtGet(prop, fallback) {
 
 android {
     namespace "com.onesignal.rnonesignalandroid"
-    compileSdkVersion safeExtGet('compileSdkVersion', 28)
-    buildToolsVersion safeExtGet('buildToolsVersion', '28.0.3')
+    compileSdkVersion safeExtGet('compileSdkVersion', 34)
 
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
+        minSdkVersion safeExtGet('minSdkVersion', 21)
     }
     buildTypes {
         release {
@@ -20,16 +19,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
 
     // api is used instead of implementation so the parent :app project can access any of the OneSignal Java
     //   classes if needed. Such as com.onesignal.NotificationExtenderService

android/proguard-rules.pro

@@ -1,17 +1,2 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /usr/local/Cellar/android-sdk/24.4.1_1/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+# OneSignal SDK ships its own consumer proguard rules.
+# Add project-specific rules here if needed.

android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java

@@ -80,8 +80,6 @@ public class RNOneSignal extends NativeOneSignalSpec
                 INotificationLifecycleListener {
     public static final String NAME = "OneSignal";
 
-    private ReactApplicationContext mReactApplicationContext;
-
     private boolean oneSignalInitDone;
     private boolean hasSetPermissionObserver = false;
     private boolean hasSetPushSubscriptionObserver = false;
@@ -194,8 +192,7 @@ private void removeObservers() {
 
     public RNOneSignal(ReactApplicationContext reactContext) {
         super(reactContext);
-        mReactApplicationContext = reactContext;
-        mReactApplicationContext.addLifecycleEventListener(this);
+        reactContext.addLifecycleEventListener(this);
         notificationWillDisplayCache = new HashMap<String, INotificationWillDisplayEvent>();
         preventDefaultCache = new HashMap<String, INotificationWillDisplayEvent>();
 
@@ -229,7 +226,6 @@ public void onCatalystInstanceDestroy() {
 
     @Override
     public void initialize(String appId) {
-        Context context = mReactApplicationContext.getCurrentActivity();
         OneSignalWrapper.setSdkType("reactnative");
         OneSignalWrapper.setSdkVersion("050213");
 
@@ -238,10 +234,10 @@ public void initialize(String appId) {
             return;
         }
 
+        ReactApplicationContext reactContext = getReactApplicationContext();
+        Context context = reactContext.getCurrentActivity();
         if (context == null) {
-            // in some cases, especially when react-native-navigation is installed,
-            // the activity can be null, so we can initialize with the context instead
-            context = mReactApplicationContext.getApplicationContext();
+            context = reactContext.getApplicationContext();
         }
 
         OneSignal.initWithContext(context, appId);
@@ -362,7 +358,7 @@ public void onWillDisplay(INotificationWillDisplayEvent event) {
 
         INotification notification = event.getNotification();
         String notificationId = notification.getNotificationId();
-        notificationWillDisplayCache.put(notificationId, (INotificationWillDisplayEvent) event);
+        notificationWillDisplayCache.put(notificationId, event);
         event.preventDefault();
 
         try {
@@ -686,19 +682,21 @@ public void removeAliases(ReadableArray aliasLabels) {
     @Override
     public void getOnesignalId(Promise promise) {
         String onesignalId = OneSignal.getUser().getOnesignalId();
-        if (onesignalId.isEmpty()) {
-            onesignalId = null;
+        if (onesignalId == null || onesignalId.isEmpty()) {
+            promise.resolve(null);
+        } else {
+            promise.resolve(onesignalId);
         }
-        promise.resolve(onesignalId);
     }
 
     @Override
     public void getExternalId(Promise promise) {
         String externalId = OneSignal.getUser().getExternalId();
-        if (externalId.isEmpty()) {
-            externalId = null;
+        if (externalId == null || externalId.isEmpty()) {
+            promise.resolve(null);
+        } else {
+            promise.resolve(externalId);
         }
-        promise.resolve(externalId);
     }
 
     @Override

android/src/main/java/com/onesignal/rnonesignalandroid/RNUtils.java

@@ -171,7 +171,7 @@ public static HashMap<String, Object> convertInAppMessageClickEventToMap(IInAppM
         return hash;
     }
 
-    public static HashMap<String, Object> convertPushSubscriptionStateToMap(PushSubscriptionState state) {
+    private static HashMap<String, Object> convertPushSubscriptionStateToMap(PushSubscriptionState state) {
         HashMap<String, Object> hash = new HashMap<>();
         if (state.getToken() != null && !state.getToken().isEmpty()) {
             hash.put("token", state.getToken());
@@ -188,7 +188,7 @@ public static HashMap<String, Object> convertPushSubscriptionStateToMap(PushSubs
         return hash;
     }
 
-    public static HashMap<String, Object> convertUserStateToMap(UserState user) {
+    private static HashMap<String, Object> convertUserStateToMap(UserState user) {
         HashMap<String, Object> hash = new HashMap<>();
 
         if (user.getExternalId() != null && !user.getExternalId().isEmpty()) {