jenkins-bot has submitted this change and it was merged.
Change subject: Fix possible crash when switching language after activity
closed.
......................................................................
Fix possible crash when switching language after activity closed.
Also fix checkstyle item.
Change-Id: I0c5513059b419a5a140454b96eeb0e1f428597b0
---
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
M wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
index 8ba18c6..f6ece45 100644
--- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
@@ -6,7 +6,6 @@
import android.os.Looper;
import android.support.v4.app.Fragment;
import android.text.format.DateUtils;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -207,8 +206,10 @@
uiThread.postDelayed(new Runnable() {
@Override
public void run() {
+ if (!isAdded()) {
+ return;
+ }
((PageActivity)getActivity()).displayMainPage();
- Log.d("Wikipedia", "Show da main page yo");
}
}, DateUtils.SECOND_IN_MILLIS);
// clear Wikidata cache, since the descriptions will need to be
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
index 59f74cf..a112e0b 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java
@@ -8,9 +8,9 @@
import org.wikipedia.views.ObservableWebView;
public class SearchBarHideHandler implements
ObservableWebView.OnScrollChangeListener,
ObservableWebView.OnUpOrCancelMotionEventListener,
ObservableWebView.OnDownMotionEventListener {
+ private static final int HUMAN_SCROLL_THRESHOLD = 200;
private final ObservableWebView webview;
private final View quickReturnView;
- private final int HUMAN_SCROLL_THRESHOLD = 200;
private final float displayDensity;
public SearchBarHideHandler(ObservableWebView webview, View
quickReturnView) {
--
To view, visit https://gerrit.wikimedia.org/r/177254
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c5513059b419a5a140454b96eeb0e1f428597b0
Gerrit-PatchSet: 3
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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
