Choosing buckets also filters the upload journal on change

Author: zealot128

src/fr/s13d/photobackup/PBMediaStore.java

@@ -87,7 +87,7 @@ public PBMedia getMedia(int id) {
         }
         Cursor cursor = queries.getMediaById(id);
         if (cursor == null) {
-            Log.i(LOG_TAG, "Photo not returned. Probably filtered by Bucket or deleted");
+            Log.e(LOG_TAG, "Photo not returned. Probably filtered by Bucket or deleted");
             return null;
         }
         Integer idCol = cursor.getColumnIndex(MediaStore.Images.Media.BUCKET_ID);

src/fr/s13d/photobackup/PBMediaStoreQueries.java

@@ -24,6 +24,7 @@
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
+import android.text.TextUtils;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -54,7 +55,6 @@ public boolean isSelectedBucket(String bucketId) {
         Log.d(LOG_TAG, "Checking if " + bucketId + " is selected by user..");
 
         for (String bucket: buckets) {
-            Log.d(LOG_TAG, "Selected bucket: " + bucket);
             if(bucket.equals(bucketId)) {
                 Log.d(LOG_TAG, "Is selected bucket! Continuing");
                 return true;
@@ -65,10 +65,18 @@ public boolean isSelectedBucket(String bucketId) {
     }
 
     public Cursor getAllMedia() {
+        String where;
         Cursor cursor = null;
         final String[] projection = new String[] { "_id", "_data", "date_added" };
+        Set<String> buckets = prefs.getStringSet(PBPreferenceFragment.PREF_BUCKETS, null);
+        if (buckets != null && buckets.size() > 0) {
+            String args = TextUtils.join(", ", buckets);
+            where = "bucket_id in (" + args + ")";
+        } else {
+            where = null;
+        }
         try {
-            cursor = context.getContentResolver().query(uri, projection, null, null, "date_added DESC");
+            cursor = context.getContentResolver().query(uri, projection, where, null, "date_added DESC");
         } catch(SecurityException e) {
             e.printStackTrace();
         }

src/fr/s13d/photobackup/preferences/PBPreferenceFragment.java

@@ -197,7 +197,12 @@ public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
         Log.i(LOG_TAG, "onSharedPreferenceChanged: " + key);
         if (key.equals(PREF_SERVICE_RUNNING)) {
             startOrStopService(sharedPreferences);
-        } else if (key.equals(PREF_WIFI_ONLY) || key.equals(PREF_RECENT_UPLOAD_ONLY) || key.equals(PREF_BUCKETS)) {
+        } else if (key.equals(PREF_WIFI_ONLY) || key.equals(PREF_RECENT_UPLOAD_ONLY)) {
+            setSummaries();
+        } else if (key.equals(PREF_BUCKETS)) {
+            if (currentService != null) {
+                currentService.getMediaStore().sync();
+            }
             setSummaries();
         } else if (sharedPreferences == null) {
             Log.e(LOG_TAG, "Error: preferences == null");