BearND has uploaded a new change for review.
https://gerrit.wikimedia.org/r/183737
Change subject: Fix crash in Find in page
......................................................................
Fix crash in Find in page
Find in page was crashing:
android.content.res.Resources$NotFoundException: Unable to find resource ID #0x0
at android.content.res.Resources.getResourceName(Resources.java:2026)
at
org.wikipedia.page.snippet.SnippetShareAdapter.onTextSelected(SnippetShareAdapter.java:54)
at
org.wikipedia.page.PageActivity.onSupportActionModeStarted(PageActivity.java:758)
Change-Id: Iabb304fc63a1941457a81db76215bbc779aece01
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetShareAdapter.java
2 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/37/183737/1
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index dd1637d..705dd6b 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -753,7 +753,8 @@
*/
@Override
public void onSupportActionModeStarted(ActionMode mode) {
- if (snippetShareAdapter == null) {
+ if (snippetShareAdapter == null
+ && SnippetShareAdapter.isTextSelectionMenu(mode.getMenu())) {
snippetShareAdapter = new SnippetShareAdapter(this);
snippetShareAdapter.onTextSelected(mode);
}
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 5c8a9d9..712407e 100644
---
a/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetShareAdapter.java
+++
b/wikipedia/src/main/java/org/wikipedia/page/snippet/SnippetShareAdapter.java
@@ -30,6 +30,11 @@
private MenuItem copyMenuItem;
private ShareAFactFunnel funnel;
+ public static boolean isTextSelectionMenu(Menu menu) {
+ // While not perfect, this at least filters out our own "Find in page"
action mode
+ return menu.getItem(0) != null && menu.getItem(0).getItemId() != 0;
+ }
+
public SnippetShareAdapter(PageActivity activity) {
this.activity = activity;
app = (WikipediaApp) activity.getApplicationContext();
--
To view, visit https://gerrit.wikimedia.org/r/183737
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabb304fc63a1941457a81db76215bbc779aece01
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
