Skip to content

Commit eaad505

Browse files
committed
Added pull request AmolGangadhare#292 from Maurizio Pinotti to fork
1 parent c466d32 commit eaad505

File tree

7 files changed

+35
-86
lines changed

7 files changed

+35
-86
lines changed

.idea/libraries/Flutter_Plugins.xml

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 25 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.idea/gradle.xml

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.idea/modules.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/src/main/java/com/amolg/flutterbarcodescanner/FlutterBarcodeScannerPlugin.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
import java.util.Map;
1818

19-
import io.flutter.embedding.android.FlutterActivity;
20-
2119
import io.flutter.embedding.engine.plugins.FlutterPlugin;
2220
import io.flutter.embedding.engine.plugins.activity.ActivityAware;
2321
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
@@ -39,7 +37,7 @@
3937
public class FlutterBarcodeScannerPlugin implements MethodCallHandler, ActivityResultListener, StreamHandler, FlutterPlugin, ActivityAware {
4038
private static final String CHANNEL = "flutter_barcode_scanner";
4139

42-
private static FlutterActivity activity;
40+
private static Activity activity;
4341
private static Result pendingResult;
4442
private Map<String, Object> arguments;
4543

@@ -68,7 +66,7 @@ public class FlutterBarcodeScannerPlugin implements MethodCallHandler, ActivityR
6866
public FlutterBarcodeScannerPlugin() {
6967
}
7068

71-
private FlutterBarcodeScannerPlugin(FlutterActivity activity, final PluginRegistry.Registrar registrar) {
69+
private FlutterBarcodeScannerPlugin(Activity activity, final PluginRegistry.Registrar registrar) {
7270
FlutterBarcodeScannerPlugin.activity = activity;
7371
}
7472

@@ -84,7 +82,7 @@ public static void registerWith(final PluginRegistry.Registrar registrar) {
8482
if (registrar.context() != null) {
8583
applicationContext = (Application) (registrar.context().getApplicationContext());
8684
}
87-
FlutterBarcodeScannerPlugin instance = new FlutterBarcodeScannerPlugin((FlutterActivity) registrar.activity(), registrar);
85+
FlutterBarcodeScannerPlugin instance = new FlutterBarcodeScannerPlugin((Activity) registrar.activity(), registrar);
8886
instance.createPluginSetup(registrar.messenger(), applicationContext, activity, registrar, null);
8987
}
9088

@@ -245,7 +243,7 @@ private void createPluginSetup(
245243
final ActivityPluginBinding activityBinding) {
246244

247245

248-
this.activity = (FlutterActivity) activity;
246+
this.activity = activity;
249247
eventChannel =
250248
new EventChannel(messenger, "flutter_barcode_scanner_receiver");
251249
eventChannel.setStreamHandler(this);

0 commit comments

Comments
 (0)