Skip to content

Commit 364df91

Browse files
committed
Revert onCreate changes
Revert ReaderSdk.initialize changes in TatsuUkraine:flutter-3. This change causes the application to crash whenever the app is background and the app has been initialized before.
1 parent 7b1cd0a commit 364df91

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

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

-15
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.squareup.sdk.reader.flutter;
1717

18-
import android.app.Activity;
1918
import android.content.Context;
2019

2120
import androidx.annotation.NonNull;
@@ -40,8 +39,6 @@ public class SquareReaderSdkFlutterPlugin implements MethodCallHandler, FlutterP
4039
private CheckoutModule checkoutModule;
4140
private ReaderSettingsModule readerSettingsModule;
4241
private StoreCustomerCardModule storeCustomerCardModule;
43-
private Activity currentActivity;
44-
private static boolean sdkInitialized = false;
4542

4643
public static void registerWith(Registrar registrar) {
4744
SquareReaderSdkFlutterPlugin instance = new SquareReaderSdkFlutterPlugin(registrar.activity());
@@ -68,16 +65,13 @@ private void init(Context context) {
6865
}
6966

7067
private void setContextForModules(final Activity activity) {
71-
currentActivity = activity;
7268
checkoutModule.setContext(activity);
7369
readerSettingsModule.setContext(activity);
7470
storeCustomerCardModule.setContext(activity);
7571
}
7672

7773
@Override
7874
public void onMethodCall(MethodCall call, @NonNull Result result) {
79-
initializeReaderSdk();
80-
8175
String methodName = call.method;
8276
switch (methodName) {
8377
case "isAuthorized":
@@ -151,13 +145,4 @@ public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBindin
151145
public void onDetachedFromActivity() {
152146

153147
}
154-
155-
private void initializeReaderSdk() {
156-
if (sdkInitialized) {
157-
return;
158-
}
159-
160-
ReaderSdk.initialize(currentActivity.getApplication());
161-
sdkInitialized = true;
162-
}
163148
}

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

+11-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,17 @@ limitations under the License.
1515
*/
1616
package com.example.flutter.squareup.sdk.reader;
1717

18-
import io.flutter.embedding.android.FlutterActivity
18+
import androidx.annotation.NonNull;
1919

20-
class MainActivity: FlutterActivity() {
20+
import io.flutter.embedding.android.FlutterActivity;
21+
import io.flutter.embedding.engine.FlutterEngine;
22+
import io.flutter.plugins.GeneratedPluginRegistrant;
23+
24+
public class MainActivity extends FlutterActivity {
25+
26+
@Override
27+
public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
28+
GeneratedPluginRegistrant.registerWith(flutterEngine);
29+
}
2130
}
2231

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

+17-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,22 @@ limitations under the License.
1515
*/
1616
package com.example.flutter.squareup.sdk.reader;
1717

18-
import io.flutter.app.FlutterApplication
18+
import android.app.Activity;
1919

20-
class MainApplication: FlutterApplication() {
20+
import androidx.annotation.CallSuper;
21+
22+
import com.squareup.sdk.reader.ReaderSdk;
23+
import io.flutter.app.FlutterApplication;
24+
25+
import io.flutter.view.FlutterMain;
26+
27+
28+
public class MainApplication extends FlutterApplication {
29+
30+
@Override
31+
public void onCreate() {
32+
super.onCreate();
33+
ReaderSdk.initialize(this);
34+
FlutterMain.startInitialization(this);
35+
}
2136
}

0 commit comments

Comments
 (0)