Merge branch 'master' into bump_targetSdk_to_34

CHANGELOG.md

@@ -1,9 +1,10 @@
 ## Changelog
 
-### v5.0.0 Aug 22st, 2023
+### v4.0.1 Aug 29st, 2024
 
 * Upgrade to Reader SDK 1.7.7 on Android.
-* Support CompileSDK and targetSDK 33 on Android
+* Support CompileSDK and targetSDK 34 on Android
+* Fixed the [issue](https://github.com/square/reader-sdk-flutter-plugin/pull/116) with resuming the app after process is killed on Android.
 
 ### v4.0.0 Sep 1st, 2022
 

android/src/main/java/com/squareup/sdk/reader/flutter/SquareReaderSdkFlutterPlugin.java

@@ -157,7 +157,12 @@ private void initializeReaderSdk() {
       return;
     }
 
-    ReaderSdk.initialize(currentActivity.getApplication());
-    sdkInitialized = true;
+    try {
+      ReaderSdk.initialize(currentActivity.getApplication());
+      sdkInitialized = true;
+    } catch (IllegalStateException e) {
+      // allow double-initialization; devs _should_ init in Application.onCreate,
+      // but to be non-breaking we try here also in case they didn't.
+    }
   }
-}
+}

example/android/app/src/main/java/com/example/flutter/squareup/sdk/reader/MainActivity.kt → example/android/app/src/main/java/com/example/flutter/squareup/sdk/reader/MainActivity.java

@@ -15,8 +15,10 @@
 */
 package com.example.flutter.squareup.sdk.reader;
 
-import io.flutter.embedding.android.FlutterActivity
+import androidx.annotation.NonNull;
 
-class MainActivity: FlutterActivity() {
+import io.flutter.embedding.android.FlutterActivity;
+
+public class MainActivity extends FlutterActivity {
 }
 

example/android/app/src/main/java/com/example/flutter/squareup/sdk/reader/MainApplication.kt → example/android/app/src/main/java/com/example/flutter/squareup/sdk/reader/MainApplication.java

@@ -15,7 +15,18 @@
 */
 package com.example.flutter.squareup.sdk.reader;
 
-import io.flutter.app.FlutterApplication
+import com.squareup.sdk.reader.ReaderSdk;
+import io.flutter.app.FlutterApplication;
 
-class MainApplication: FlutterApplication() {
+import io.flutter.view.FlutterMain;
+
+
+public class MainApplication extends FlutterApplication {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        ReaderSdk.initialize(this);
+        FlutterMain.startInitialization(this);
+    }
 }