Merge pull request #116 from square/bcheng/revert-oncreate-changes

Revert onCreate changes

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);
+    }
 }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: square_reader_sdk
 description: An open source Flutter plugin for calling Square’s native Reader SDK implementations to take in-person payments on iOS and Android.
-version: 4.0.0
+version: 4.0.1
 homepage: https://github.com/square/reader-sdk-flutter-plugin
 
 environment: