Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/287788
Change subject: Hygiene: remove redundant URI parameter
......................................................................
Hygiene: remove redundant URI parameter
AppContentProvider defaults notify to true for observers. This flag only
needs to be used when false. Also, rename from
WikipediaApp.FROM_READING_LIST_PAGE_OBSERVER to
AppContentProviderContract.NOTIFY since it's completely generic and
concerns contractors.
Change-Id: Ibc0c091689cb5278213227ff7858a7e91b6bb105
---
M app/src/main/java/org/wikipedia/WikipediaApp.java
M app/src/main/java/org/wikipedia/database/AppContentProvider.java
M app/src/main/java/org/wikipedia/database/DatabaseClient.java
M
app/src/main/java/org/wikipedia/database/contract/AppContentProviderContract.java
4 files changed, 7 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/88/287788/1
diff --git a/app/src/main/java/org/wikipedia/WikipediaApp.java
b/app/src/main/java/org/wikipedia/WikipediaApp.java
index ee61928..c81b082 100644
--- a/app/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/app/src/main/java/org/wikipedia/WikipediaApp.java
@@ -24,6 +24,7 @@
import org.wikipedia.crash.hockeyapp.HockeyAppCrashReporter;
import org.wikipedia.database.Database;
import org.wikipedia.database.DatabaseClient;
+import org.wikipedia.database.contract.AppContentProviderContract;
import org.wikipedia.database.contract.ReadingListPageContract;
import org.wikipedia.editing.EditTokenStorage;
import org.wikipedia.editing.summaries.EditSummary;
@@ -41,8 +42,8 @@
import org.wikipedia.readinglist.page.ReadingListPageRow;
import org.wikipedia.readinglist.page.database.ReadingListPageHttpRow;
import org.wikipedia.readinglist.page.database.disk.ReadingListPageDiskRow;
-import org.wikipedia.savedpages.SavedPage;
import org.wikipedia.savedpages.ReadingListPageObserver;
+import org.wikipedia.savedpages.SavedPage;
import org.wikipedia.search.RecentSearch;
import org.wikipedia.settings.Prefs;
import org.wikipedia.theme.Theme;
@@ -76,8 +77,6 @@
private static final float FONT_SIZE_FACTOR = 0.1f;
public static final int PREFERRED_THUMB_SIZE = 320;
-
- public static final String FROM_READING_LIST_PAGE_OBSERVER =
"fromReadingListPageObserver";
private final RemoteConfig remoteConfig = new RemoteConfig();
private final UserInfoStorage userInfoStorage = new UserInfoStorage();
@@ -592,7 +591,7 @@
readingListPageObserver = new ReadingListPageObserver(null);
Uri readingListPageBaseUri = ReadingListPageContract.Disk.URI;
Uri uriWithQuery = readingListPageBaseUri.buildUpon()
- .appendQueryParameter(FROM_READING_LIST_PAGE_OBSERVER,
"false").build();
+ .appendQueryParameter(AppContentProviderContract.NOTIFY,
"false").build();
WikipediaApp.getInstance().getContentResolver()
.registerContentObserver(uriWithQuery, true,
readingListPageObserver);
L.i("Registered reading list page observer");
diff --git a/app/src/main/java/org/wikipedia/database/AppContentProvider.java
b/app/src/main/java/org/wikipedia/database/AppContentProvider.java
index 85db4be..71f71c6 100644
--- a/app/src/main/java/org/wikipedia/database/AppContentProvider.java
+++ b/app/src/main/java/org/wikipedia/database/AppContentProvider.java
@@ -11,7 +11,7 @@
import android.support.annotation.Nullable;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.database.contract.ReadingListPageContract;
+import org.wikipedia.database.contract.AppContentProviderContract;
import org.wikipedia.util.log.L;
import java.util.Arrays;
@@ -84,11 +84,6 @@
SQLiteDatabase db = writableDatabase();
int rows = db.delete(endpoint.tables(), selection, selectionArgs);
- if (uri.equals(ReadingListPageContract.Page.URI)) {
- uri = uri.buildUpon()
-
.appendQueryParameter(WikipediaApp.FROM_READING_LIST_PAGE_OBSERVER, "true")
- .build();
- }
notifyChange(uri);
return rows;
}
@@ -105,7 +100,7 @@
}
private void notifyChange(@NonNull Uri uri) {
- boolean notify =
uri.getBooleanQueryParameter(WikipediaApp.FROM_READING_LIST_PAGE_OBSERVER,
true);
+ boolean notify =
uri.getBooleanQueryParameter(AppContentProviderContract.NOTIFY, true);
if (getContentResolver() == null || !notify) {
return;
}
diff --git a/app/src/main/java/org/wikipedia/database/DatabaseClient.java
b/app/src/main/java/org/wikipedia/database/DatabaseClient.java
index ea9c348..a4e7b2b 100644
--- a/app/src/main/java/org/wikipedia/database/DatabaseClient.java
+++ b/app/src/main/java/org/wikipedia/database/DatabaseClient.java
@@ -9,9 +9,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.readinglist.page.ReadingListPage;
-
public class DatabaseClient<T> {
@NonNull private final ContentProviderClient client;
@NonNull private final DatabaseTable<T> databaseTable;
@@ -29,13 +26,7 @@
public void persist(T obj) {
try {
- Uri uri = uri();
- if
(ReadingListPage.DATABASE_TABLE.getBaseContentURI().equals(uri)) {
- uri = uri.buildUpon()
-
.appendQueryParameter(WikipediaApp.FROM_READING_LIST_PAGE_OBSERVER, "true")
- .build();
- }
- client.insert(uri, toContentValues(obj));
+ client.insert(uri(), toContentValues(obj));
} catch (RemoteException e) {
throw new RuntimeException(e);
}
diff --git
a/app/src/main/java/org/wikipedia/database/contract/AppContentProviderContract.java
b/app/src/main/java/org/wikipedia/database/contract/AppContentProviderContract.java
index 95f32a8..0695488 100644
---
a/app/src/main/java/org/wikipedia/database/contract/AppContentProviderContract.java
+++
b/app/src/main/java/org/wikipedia/database/contract/AppContentProviderContract.java
@@ -12,4 +12,5 @@
.scheme(ContentResolver.SCHEME_CONTENT)
.authority(AUTHORITY)
.build();
+ String NOTIFY = "notify";
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/287788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc0c091689cb5278213227ff7858a7e91b6bb105
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
