jenkins-bot has submitted this change and it was merged.
Change subject: Fix NPE in tabbed browsing
......................................................................
Fix NPE in tabbed browsing
TabsProvider.enterTabMode(Runnable) was meant to handle a null parameter
as evidenced by the no parameter version which invokes it with null.
This patch adds null protection and specifies @Nullable on the
parameter.
No known repro steps at this time.
Change-Id: Ibdc58bf49cc5551fb00a9352a11486dd5390054f
---
M wikipedia/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
b/wikipedia/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
index a796992..80adf08 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
@@ -11,6 +11,7 @@
import com.squareup.picasso.Picasso;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import android.support.v7.view.ActionMode;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -100,13 +101,15 @@
providerListener.onEnterTabView();
}
- private void enterTabMode(Runnable onTabModeEntered) {
+ private void enterTabMode(@Nullable Runnable onTabModeEntered) {
if (tabActionMode != null) {
// already inside action mode...
// but make sure to update the list of tabs.
tabListAdapter.notifyDataSetInvalidated();
tabListView.smoothScrollToPosition(tabList.size() - 1);
- onTabModeEntered.run();
+ if (onTabModeEntered != null) {
+ onTabModeEntered.run();
+ }
return;
}
parentActivity.startSupportActionMode(new
TabActionModeCallback(onTabModeEntered));
--
To view, visit https://gerrit.wikimedia.org/r/227394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdc58bf49cc5551fb00a9352a11486dd5390054f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
