More cleanup now that clean Dao classes are available from Dagger.

Author: psh

app/src/main/java/fr/free/nrw/commons/category/CategoryDao.java

@@ -46,7 +46,7 @@ public void save(Category category) {
      * @param name Category's name
      * @return category from database, or null if not found
      */
-    public @Nullable
+    @Nullable
     Category find(String name) {
         Cursor cursor = null;
         ContentProviderClient db = clientProvider.get();
@@ -77,7 +77,7 @@ Category find(String name) {
      *
      * @return a list containing recent categories
      */
-    public @NonNull
+    @NonNull
     List<String> recentCategories(int limit) {
         List<String> items = new ArrayList<>();
         Cursor cursor = null;

app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java

@@ -17,17 +17,43 @@
 
 import fr.free.nrw.commons.settings.Prefs;
 
+import static fr.free.nrw.commons.contributions.ContributionDao.Table.ALL_FIELDS;
 import static fr.free.nrw.commons.contributions.ContributionsContentProvider.BASE_URI;
 import static fr.free.nrw.commons.contributions.ContributionsContentProvider.uriForId;
 
 public class ContributionDao {
+    /*
+        This sorts in the following order:
+        Currently Uploading
+        Failed (Sorted in ascending order of time added - FIFO)
+        Queued to Upload (Sorted in ascending order of time added - FIFO)
+        Completed (Sorted in descending order of time added)
+
+        This is why Contribution.STATE_COMPLETED is -1.
+     */
+    static final String CONTRIBUTION_SORT = Table.COLUMN_STATE + " DESC, "
+            + Table.COLUMN_UPLOADED + " DESC , ("
+            + Table.COLUMN_TIMESTAMP + " * "
+            + Table.COLUMN_STATE + ")";
+
     private final Provider<ContentProviderClient> clientProvider;
 
     @Inject
     public ContributionDao(@Named("contribution") Provider<ContentProviderClient> clientProvider) {
         this.clientProvider = clientProvider;
     }
 
+    Cursor loadAllContributions() {
+        ContentProviderClient db = clientProvider.get();
+        try {
+            return db.query(BASE_URI, ALL_FIELDS, "", null, CONTRIBUTION_SORT);
+        } catch (RemoteException e) {
+            return null;
+        } finally {
+            db.release();
+        }
+    }
+
     public void save(Contribution contribution) {
         ContentProviderClient db = clientProvider.get();
         try {
@@ -59,7 +85,7 @@ public void delete(Contribution contribution) {
         }
     }
 
-    public static ContentValues toContentValues(Contribution contribution) {
+    ContentValues toContentValues(Contribution contribution) {
         ContentValues cv = new ContentValues();
         cv.put(Table.COLUMN_FILENAME, contribution.getFilename());
         if (contribution.getLocalUri() != null) {

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java

@@ -65,21 +65,6 @@ public  class       ContributionsActivity
     private UploadService uploadService;
     private boolean isUploadServiceConnected;
     private ArrayList<DataSetObserver> observersWaitingForLoad = new ArrayList<>();
-    private String CONTRIBUTION_SELECTION = "";
-
-    /*
-        This sorts in the following order:
-        Currently Uploading
-        Failed (Sorted in ascending order of time added - FIFO)
-        Queued to Upload (Sorted in ascending order of time added - FIFO)
-        Completed (Sorted in descending order of time added)
-
-        This is why Contribution.STATE_COMPLETED is -1.
-     */
-    private String CONTRIBUTION_SORT = ContributionDao.Table.COLUMN_STATE + " DESC, "
-            + ContributionDao.Table.COLUMN_UPLOADED + " DESC , ("
-            + ContributionDao.Table.COLUMN_TIMESTAMP + " * "
-            + ContributionDao.Table.COLUMN_STATE + ")";
 
     private CompositeDisposable compositeDisposable = new CompositeDisposable();
 
@@ -127,8 +112,7 @@ protected void onAuthCookieAcquired(String authCookie) {
         startService(uploadServiceIntent);
         bindService(uploadServiceIntent, uploadServiceConnection, Context.BIND_AUTO_CREATE);
 
-        allContributions = getContentResolver().query(BASE_URI, ALL_FIELDS,
-                CONTRIBUTION_SELECTION, null, CONTRIBUTION_SORT);
+        allContributions = contributionDao.loadAllContributions();
 
         getSupportLoaderManager().initLoader(0, null, this);
     }
@@ -238,8 +222,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public Loader<Cursor> onCreateLoader(int i, Bundle bundle) {
         int uploads = prefs.getInt(UPLOADS_SHOWING, 100);
         return new CursorLoader(this, BASE_URI,
-                ALL_FIELDS, CONTRIBUTION_SELECTION, null,
-                CONTRIBUTION_SORT + "LIMIT " + uploads);
+                ALL_FIELDS, "", null,
+                ContributionDao.CONTRIBUTION_SORT + "LIMIT " + uploads);
     }
 
     @Override

app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java

@@ -89,6 +89,7 @@ public void onPerformSync(Account account, Bundle bundle, String authority,
         LogEventResult result;
         Boolean done = false;
         String queryContinue = null;
+        ContributionDao contributionDao = new ContributionDao(() -> contentProviderClient);
         while (!done) {
 
             try {
@@ -121,7 +122,7 @@ public void onPerformSync(Account account, Bundle bundle, String authority,
                         "", -1, dateUpdated, dateUpdated, user,
                         "", "");
                 contrib.setState(STATE_COMPLETED);
-                imageValues.add(ContributionDao.toContentValues(contrib));
+                imageValues.add(contributionDao.toContentValues(contrib));
 
                 if (imageValues.size() % COMMIT_THRESHOLD == 0) {
                     try {

app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequenceDao.java

@@ -24,20 +24,6 @@ public ModifierSequenceDao(@Named("modification") Provider<ContentProviderClient
         this.clientProvider = clientProvider;
     }
 
-    public ModifierSequence fromCursor(Cursor cursor) {
-        // Hardcoding column positions!
-        ModifierSequence ms = null;
-        try {
-            ms = new ModifierSequence(Uri.parse(cursor.getString(1)),
-                new JSONObject(cursor.getString(2)));
-        } catch (JSONException e) {
-            throw new RuntimeException(e);
-        }
-        ms.setContentUri( ModificationsContentProvider.uriForId(cursor.getInt(0)));
-
-        return ms;
-    }
-
     public void save(ModifierSequence sequence) {
         ContentProviderClient db = clientProvider.get();
         try {
@@ -64,6 +50,20 @@ public void delete(ModifierSequence sequence) {
         }
     }
 
+    ModifierSequence fromCursor(Cursor cursor) {
+        // Hardcoding column positions!
+        ModifierSequence ms = null;
+        try {
+            ms = new ModifierSequence(Uri.parse(cursor.getString(1)),
+                    new JSONObject(cursor.getString(2)));
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+        ms.setContentUri( ModificationsContentProvider.uriForId(cursor.getInt(0)));
+
+        return ms;
+    }
+
     private JSONObject toJSON(ModifierSequence sequence) {
         JSONObject data = new JSONObject();
         try {

app/src/main/java/fr/free/nrw/commons/upload/UploadService.java

@@ -4,7 +4,6 @@
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Intent;
@@ -55,7 +54,6 @@ public class UploadService extends HandlerService<Contribution> {
     @Inject ContributionDao contributionDao;
 
     private NotificationManager notificationManager;
-    private ContentProviderClient contributionsProviderClient;
     private NotificationCompat.Builder curProgressNotification;
     private int toUpload;
 
@@ -115,7 +113,6 @@ public void onProgress(long transferred, long total) {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        contributionsProviderClient.release();
         Timber.d("UploadService.onDestroy; %s are yet to be uploaded", unfinishedUploads);
     }
 
@@ -124,7 +121,6 @@ public void onCreate() {
         super.onCreate();
 
         notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
-        contributionsProviderClient = this.getContentResolver().acquireContentProviderClient(ContributionsContentProvider.CONTRIBUTION_AUTHORITY);
     }
 
     @Override