Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[Share] Support v2 android embedder. #2156

Merged
cyanglaz merged 25 commits into from
Oct 21, 2019
Merged

[Share] Support v2 android embedder. #2156

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c1b7aa8
git st
Oct 4, 2019
0395b36
gradle properties update
Oct 4, 2019
3b396f3
new embedding
Oct 4, 2019
3f57f80
Update gradle.properties
Oct 4, 2019
d372d3d
refactor
Oct 4, 2019
fa50246
Merge branch 'migrate_share' of github.com:cyanglaz/plugins into migr…
Oct 4, 2019
f8066d2
update javadocs
Oct 7, 2019
0296390
add license header
Oct 7, 2019
f268c32
merge 2 packages
Oct 7, 2019
6488ff6
refactor
Oct 7, 2019
4530b8d
refactor
Oct 7, 2019
ae774b6
rename activities
Oct 8, 2019
250eb14
non public
Oct 8, 2019
7e0d74f
fix gradle
Oct 11, 2019
3033ef6
review fixes
Oct 14, 2019
c76a838
review fixes
Oct 14, 2019
db46000
Merge branch 'master' into migrate_share
Oct 14, 2019
83dfcb5
revert the change that moved the activity out of the constructor
Oct 14, 2019
9ae8145
add driver tests
Oct 15, 2019
3ba4341
e2e tests
Oct 15, 2019
b51bb35
Merge branch 'master' into migrate_share
Oct 15, 2019
7acd1d9
Update pubspec.yaml
Oct 15, 2019
1722803
Update MainActivity.java
Oct 15, 2019
2ffc180
remove androidx constraint
Oct 21, 2019
ba7e66b
Update pubspec.yaml
Oct 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor
  • Loading branch information
Chris Yang committed Oct 7, 2019
commit 6488ff60c810a0a8f41a4835bd48cf83216bf3e3
21 changes: 12 additions & 9 deletions packages/share/android/src/main/java/io/flutter/plugins/share/SharePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import io.flutter.embedding.engine.plugins.FlutterPlugin;
import io.flutter.embedding.engine.plugins.activity.ActivityAware;
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.PluginRegistry.Registrar;

Expand All @@ -18,21 +19,16 @@ public class SharePlugin implements FlutterPlugin, ActivityAware {
private MethodCallHandler handler;
private Activity activity;
private Share share;
private MethodChannel methodChannel;

public static void registerWith(Registrar registrar) {
MethodChannel channel = new MethodChannel(registrar.messenger(), CHANNEL);
Share share = new Share(registrar.activity());
MethodCallHandler handler = new MethodCallHandler(share);
channel.setMethodCallHandler(handler);
SharePlugin plugin = new SharePlugin();
plugin.setUpChannel(registrar.messenger());
}

@Override
public void onAttachedToEngine(FlutterPluginBinding binding) {
final MethodChannel methodChannel =
new MethodChannel(binding.getFlutterEngine().getDartExecutor(), CHANNEL);
share = new Share(activity);
handler = new MethodCallHandler(share);
methodChannel.setMethodCallHandler(handler);
setUpChannel(binding.getFlutterEngine().getDartExecutor());
}

@Override
Expand All @@ -59,4 +55,11 @@ public void onReattachedToActivityForConfigChanges(ActivityPluginBinding binding
public void onDetachedFromActivityForConfigChanges() {
onDetachedFromActivity();
}

private void setUpChannel(BinaryMessenger messenger) {
methodChannel = new MethodChannel(messenger, CHANNEL);
share = new Share(activity);
Copy link
Contributor

@matthew-carroll matthew-carroll Oct 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like activity is always null at this point. You can probably remove the local activity variable and exclusively use the setter method, instead.

handler = new MethodCallHandler(share);
methodChannel.setMethodCallHandler(handler);
}
}