Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/142525
Change subject: Don't duplicate history entry if the same item is clicked twice.
......................................................................
Don't duplicate history entry if the same item is clicked twice.
Bug: 66760
Change-Id: Id78f2fbdc796a1a34c8f6829ca0632b9b4705fbe
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
2 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/25/142525/1
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index c5ffdcb..5b9aa84 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -164,6 +164,11 @@
return;
}
+ // hold on... is this the same page that's already being displayed?
+ if (curPageFragment != null &&
curPageFragment.getTitle().equals(title)) {
+ return;
+ }
+
// animate the new fragment into place
// then hide the previous fragment.
final PageViewFragment prevFragment = curPageFragment;
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 86d621a..d8a9f4a 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -486,6 +486,9 @@
setState(STATE_INITIAL_FETCH);
new RestSectionsFetchTask().execute();
+ // Update our history entry, in case the Title was changed (i.e.
normalized)
+ curEntry = new HistoryEntry(title, curEntry.getTimestamp(),
curEntry.getSource());
+
// Add history entry now
new HistorySaveTask(curEntry).execute();
--
To view, visit https://gerrit.wikimedia.org/r/142525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id78f2fbdc796a1a34c8f6829ca0632b9b4705fbe
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
