jenkins-bot has submitted this change and it was merged.
Change subject: Fix possible crash involving the Share tooltip.
......................................................................
Fix possible crash involving the Share tooltip.
This only seems to happen in 4.2.2, where it's possible that the system
returns null when we request the View for an ActionMode menu item.
Also removed an unnecessary parameter from showShareToolTip().
Bug: T106679
Change-Id: I8fd7cc1c0a7348b148a58cce838f207930e4da0a
---
M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
1 file changed, 10 insertions(+), 9 deletions(-)
Approvals:
Mholloway: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
index cfca5f5..aef1f6e 100755
--- a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -5,7 +5,6 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Color;
-import android.graphics.drawable.Drawable;
import android.support.annotation.ColorInt;
import android.support.annotation.ColorRes;
import android.support.annotation.IntegerRes;
@@ -251,16 +250,18 @@
// ensure the tool tip is shown after CAB animation.
final View shareItemView = ActivityUtil.getMenuItemView(activity,
shareItem);
- int delay = getInteger(android.R.integer.config_longAnimTime);
- shareItemView.postDelayed(new Runnable() {
- @Override
- public void run() {
- showShareToolTip(shareItemView, shareItem.getIcon());
- }
- }, delay);
+ if (shareItemView != null) {
+ int delay = getInteger(android.R.integer.config_longAnimTime);
+ shareItemView.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ showShareToolTip(shareItemView);
+ }
+ }, delay);
+ }
}
- private void showShareToolTip(View shareItemView, Drawable icon) {
+ private void showShareToolTip(View shareItemView) {
ToolTipUtil.showToolTip(activity, shareItemView,
R.layout.inflate_tool_tip_share,
getColor(SHARE_TOOL_TIP_COLOR), ToolTip.Position.CENTER);
}
--
To view, visit https://gerrit.wikimedia.org/r/226714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fd7cc1c0a7348b148a58cce838f207930e4da0a
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
