Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378794 )
Change subject: Hygiene: Session logging cleanup
......................................................................
Hygiene: Session logging cleanup
* Clean up legacy Saved Pages logging stuff
* Clean up other references to HistoryEntry.SOURCE_SAVED
* Add call to app.getSessionFunnel.restSectionsFetchEnd back in
* Other minor cleanup in the pageLoadComplete listener callback in
PageFragmentLoadState
Change-Id: I9e2a029230cc7436b5aaf0785497c0c5612f0980
---
M app/src/main/java/org/wikipedia/analytics/SessionData.java
M app/src/main/java/org/wikipedia/edit/EditHandler.java
M app/src/main/java/org/wikipedia/history/HistoryEntry.java
M app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
4 files changed, 10 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/94/378794/1
diff --git a/app/src/main/java/org/wikipedia/analytics/SessionData.java
b/app/src/main/java/org/wikipedia/analytics/SessionData.java
index fc98006..339c249 100644
--- a/app/src/main/java/org/wikipedia/analytics/SessionData.java
+++ b/app/src/main/java/org/wikipedia/analytics/SessionData.java
@@ -14,7 +14,6 @@
private int pagesFromInternal;
private int pagesFromExternal;
private int pagesFromHistory;
- private int pagesFromSaved;
private int pagesFromReadingList;
private int pagesFromNearby;
private int pagesFromDisambig;
@@ -37,9 +36,6 @@
break;
case HistoryEntry.SOURCE_HISTORY:
pagesFromHistory++;
- break;
- case HistoryEntry.SOURCE_SAVED_PAGE:
- pagesFromSaved++;
break;
case HistoryEntry.SOURCE_READING_LIST:
pagesFromReadingList++;
@@ -111,10 +107,6 @@
return pagesFromHistory;
}
- public int getPagesFromSaved() {
- return pagesFromSaved;
- }
-
public int getPagesFromReadingList() {
return pagesFromReadingList;
}
@@ -145,7 +137,7 @@
public int getTotalPages() {
return pagesFromSearch + pagesFromRandom + pagesFromLangLink +
pagesFromInternal
- + pagesFromExternal + pagesFromHistory + pagesFromSaved +
pagesFromReadingList
- + pagesFromNearby + pagesFromDisambig;
+ + pagesFromExternal + pagesFromHistory + pagesFromReadingList
+ pagesFromNearby
+ + pagesFromDisambig;
}
}
diff --git a/app/src/main/java/org/wikipedia/edit/EditHandler.java
b/app/src/main/java/org/wikipedia/edit/EditHandler.java
index ef0cef8..3804019 100644
--- a/app/src/main/java/org/wikipedia/edit/EditHandler.java
+++ b/app/src/main/java/org/wikipedia/edit/EditHandler.java
@@ -1,6 +1,5 @@
package org.wikipedia.edit;
-import android.content.DialogInterface;
import android.content.Intent;
import android.support.annotation.Nullable;
import android.support.v7.app.AlertDialog;
@@ -12,7 +11,6 @@
import org.wikipedia.analytics.ProtectedEditAttemptFunnel;
import org.wikipedia.auth.AccountUtil;
import org.wikipedia.bridge.CommunicationBridge;
-import org.wikipedia.history.HistoryEntry;
import org.wikipedia.page.Page;
import org.wikipedia.page.PageFragment;
import org.wikipedia.page.Section;
@@ -68,25 +66,6 @@
return;
}
if (messageType.equals("editSectionClicked")) {
- if (fragment.getHistoryEntry().getSource() ==
HistoryEntry.SOURCE_SAVED_PAGE) {
- new AlertDialog.Builder(fragment.getActivity())
- .setCancelable(false)
- .setMessage(R.string.edit_saved_page_refresh)
-
.setPositiveButton(R.string.edit_saved_page_refresh_yes, new
DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface
dialogInterface, int i) {
- fragment.refreshPage();
- }
- })
-
.setNegativeButton(R.string.edit_saved_page_refresh_no, new
DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface
dialogInterface, int i) {
- dialogInterface.dismiss();
- }
- })
- .show();
- return;
- }
startEditingSection(messagePayload.optInt("sectionID"), null);
}
}
diff --git a/app/src/main/java/org/wikipedia/history/HistoryEntry.java
b/app/src/main/java/org/wikipedia/history/HistoryEntry.java
index ab70846..dc082ee 100644
--- a/app/src/main/java/org/wikipedia/history/HistoryEntry.java
+++ b/app/src/main/java/org/wikipedia/history/HistoryEntry.java
@@ -15,7 +15,6 @@
public static final int SOURCE_INTERNAL_LINK = 2;
public static final int SOURCE_EXTERNAL_LINK = 3;
public static final int SOURCE_HISTORY = 4;
- public static final int SOURCE_SAVED_PAGE = 5;
public static final int SOURCE_LANGUAGE_LINK = 6;
public static final int SOURCE_RANDOM = 7;
public static final int SOURCE_MAIN_PAGE = 8;
diff --git a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
index 279cb00..0668192 100644
--- a/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragmentLoadState.java
@@ -307,16 +307,16 @@
bridge.addListener("pageLoadComplete", new SynchronousBridgeListener()
{
@Override
public void onMessage(JSONObject payload) {
+ app.getSessionFunnel().restSectionsFetchEnd();
+
+ if (fragment.callback() != null) {
+ fragment.callback().onPageUpdateProgressBar(false, true,
0);
+ }
+
try {
if (!sequenceNumber.inSync(payload.getInt("sequence"))) {
return;
}
-
- // Do any other stuff that should happen upon page load
completion...
- if (fragment.callback() != null) {
- fragment.callback().onPageUpdateProgressBar(false,
true, 0);
- }
-
if (payload.has("sections")) {
// augment our current Page object with updated
Sections received from JS
List<Section> sectionList = new ArrayList<>();
@@ -331,16 +331,13 @@
}
Page page = model.getPage();
page.getSections().addAll(sectionList);
-
- loading = false;
- networkErrorCallback = null;
- fragment.onPageLoadComplete();
}
} catch (JSONException e) {
- //
+ L.e(e);
}
loading = false;
+ networkErrorCallback = null;
fragment.onPageLoadComplete();
// trigger layout of the bottom content
--
To view, visit https://gerrit.wikimedia.org/r/378794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e2a029230cc7436b5aaf0785497c0c5612f0980
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
