Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183753
Change subject: Add back-button behavior to Share context.
......................................................................
Add back-button behavior to Share context.
Also made the clipListener static, so that it doesn't get re-created and
re-added to the Clipboard service multiple times, and thus pop up multiple
share choosers for a single share event.
Change-Id: I3dc7df414a1646699f3f9e72dcab8c0e7c734433
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetShareAdapter.java
2 files changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/53/183753/1
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index a91e183..2a941ed 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -526,6 +526,10 @@
@Override
public void onBackPressed() {
+ if (snippetShareAdapter != null) {
+ snippetShareAdapter.finish();
+ return;
+ }
if (drawerLayout.isDrawerOpen(Gravity.START)) {
drawerLayout.closeDrawer(Gravity.START);
return;
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetShareAdapter.java
b/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetShareAdapter.java
index 712407e..886b6fb 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetShareAdapter.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetShareAdapter.java
@@ -26,7 +26,7 @@
private final PageActivity activity;
private final WikipediaApp app;
private ActionMode webViewActionMode;
- private ClipboardManager.OnPrimaryClipChangedListener clipListener;
+ private static ClipboardManager.OnPrimaryClipChangedListener clipListener;
private MenuItem copyMenuItem;
private ShareAFactFunnel funnel;
@@ -40,6 +40,12 @@
app = (WikipediaApp) activity.getApplicationContext();
}
+ public void finish() {
+ if (webViewActionMode != null) {
+ webViewActionMode.finish();
+ }
+ }
+
/**
* Since API <11 doesn't provide a long-press context for the WebView
anyway, and we're
* using clipboard features that are only supported in API 11+, we'll mark
this whole
--
To view, visit https://gerrit.wikimedia.org/r/183753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dc7df414a1646699f3f9e72dcab8c0e7c734433
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
