jenkins-bot has submitted this change and it was merged.
Change subject: Fix lifecycle of syntax highlighter when editing.
......................................................................
Fix lifecycle of syntax highlighter when editing.
(clean it up in onDestroy, instead of onStop.)
Also remove an unnecessary usage of Bus.
Bug: T147704
Bug: T146538
Change-Id: I98489996c94dd66178ddd3b63e2e9082286e4fe5
---
M app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
1 file changed, 9 insertions(+), 20 deletions(-)
Approvals:
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
b/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
index 9d40adb..7d35a90 100644
--- a/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
@@ -25,8 +25,6 @@
import org.mediawiki.api.json.ApiException;
import org.mediawiki.api.json.RequestBuilder;
-import com.squareup.otto.Bus;
-
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
@@ -64,7 +62,6 @@
public static final String EXTRA_HIGHLIGHT_TEXT =
"org.wikipedia.edit_section.highlight";
private WikipediaApp app;
- private Bus bus;
private PageTitle title;
public PageTitle getPageTitle() {
@@ -151,9 +148,6 @@
updateEditLicenseText();
editSummaryFragment.setTitle(title);
- bus = app.getBus();
- bus.register(this);
-
funnel = app.getFunnelManager().getEditFunnel(title);
// Only send the editing start log event if the activity is created
for the first time
@@ -215,6 +209,15 @@
// set focus to the EditText, but keep the keyboard hidden until the
user changes the cursor location:
sectionText.requestFocus();
getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+ }
+
+ @Override
+ public void onDestroy() {
+ if (progressDialog.isShowing()) {
+ progressDialog.dismiss();
+ }
+ syntaxHighlighter.cleanup();
+ super.onDestroy();
}
@Override
@@ -738,19 +741,5 @@
} else {
finish();
}
- }
-
- @Override
- protected void onStop() {
- if (progressDialog.isShowing()) {
- progressDialog.dismiss();
- }
- if (bus != null) {
- bus.unregister(this);
- bus = null;
- L.d("Deregistering bus");
- }
- syntaxHighlighter.cleanup();
- super.onStop();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/315261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98489996c94dd66178ddd3b63e2e9082286e4fe5
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@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
