Merge pull request #49 from PhotoBackup/15-should-handle-301-redirection

Support for Bucket Picker and redirection

Author: stephanepechard

app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 24
         versionCode 24
-        versionName "0.9.0"
+        versionName "0.10.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/fr/s13d/photobackup/PBActivity.java

@@ -25,6 +25,7 @@
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import fr.s13d.photobackup.media.PBMediaStore;
 import fr.s13d.photobackup.preferences.PBPreferenceFragment;
 
 public class PBActivity extends Activity {

app/src/main/java/fr/s13d/photobackup/PBApplication.java

@@ -19,16 +19,33 @@
 package fr.s13d.photobackup;
 
 import android.app.Application;
+import android.preference.PreferenceManager;
+
+import java.util.Map;
+import java.util.Set;
 
 
 public class PBApplication extends Application {
 
     private final static String LOG_TAG = "PBApplication";
+    private static PBApplication app;
+
 
     @Override
     public void onCreate() {
         super.onCreate();
-        Log.e(LOG_TAG, "Initializing app");
+        Log.d(LOG_TAG, "Initializing app");
+        app = this;
+
+        if (BuildConfig.DEBUG) {
+            Log.d(LOG_TAG, "Default SharedPreferences:");
+            Map<String, ?> allPrefs = PreferenceManager.getDefaultSharedPreferences(this).getAll();
+            Set<String> set = allPrefs.keySet();
+            for(String s : set) {
+                Log.d(LOG_TAG, s + "<" + allPrefs.get(s).getClass().getSimpleName() +"> =  "
+                        + allPrefs.get(s).toString());
+            }
+        }
     }
 
 
@@ -38,4 +55,11 @@ public void onCreate() {
     public final static String PB_USER_AGENT = "PhotoBackup Android Client v" + BuildConfig.VERSION_NAME;
     public static final String PB_PICTURES_SHARED_PREFS = "PB_PICTURES_SHARED_PREFS";
 
+
+    /////////////
+    // Getters //
+    /////////////
+    public static PBApplication getApp() {
+        return app;
+    }
 }

app/src/main/java/fr/s13d/photobackup/PBMediaStore.java

@@ -27,6 +27,9 @@
 
 import fr.s13d.photobackup.interfaces.PBMediaSenderInterface;
 import fr.s13d.photobackup.interfaces.PBMediaStoreInterface;
+import fr.s13d.photobackup.media.PBMedia;
+import fr.s13d.photobackup.media.PBMediaSender;
+import fr.s13d.photobackup.media.PBMediaStore;
 
 
 public class PBService extends Service implements PBMediaStoreInterface, PBMediaSenderInterface {
@@ -89,7 +92,7 @@ public PBService getService() {
     // Methods //
     /////////////
     public void sendNextMedia() {
-        for (PBMedia media : getMediaStore().getMedias()) {
+        for (PBMedia media : getMediaStore().getMediaList()) {
             if (media.getState() != PBMedia.PBMediaState.SYNCED) {
                 sendMedia(media, false);
                 break;
@@ -113,9 +116,8 @@ public void onSyncMediaStoreTaskPostExecute() {
     //////////////////////////////////////
     // PBMediaSenderInterface callbacks //
     //////////////////////////////////////
-    public void onSendSuccess() {
-        sendNextMedia();
-    }
+    public void onMessage(final String message) { }
+    public void onSendSuccess() { sendNextMedia(); }
     public void onSendFailure() {}
     public void onTestSuccess() {}
     public void onTestFailure() {}
@@ -143,10 +145,11 @@ public void onChange(boolean selfChange, Uri uri) {
             if (uri.toString().equals("content://media/external/images/media")) {
 
                 try {
-                    final PBMedia media = getMediaStore().getLastMediaInStore();
-                    media.setState(PBMedia.PBMediaState.WAITING);
-                    getMediaSender().send(media, false);
-                    //mediaStore.sync();
+                    final PBMedia media = getMediaStore().createMediaForLatestInStore();
+                    if (media != null) {
+                        media.setState(PBMedia.PBMediaState.WAITING);
+                        getMediaSender().send(media, false);
+                    }
                 }
                 catch (Exception e) {
                     Log.e(LOG_TAG, "Upload failed :-(");
@@ -162,7 +165,7 @@ public void onChange(boolean selfChange, Uri uri) {
     /////////////
     public PBMediaStore getMediaStore() {
         if (mediaStore == null) {
-            mediaStore = new PBMediaStore(this);
+            mediaStore = new PBMediaStore();
             mediaStore.addInterface(this);
             mediaStore.sync();
         }
@@ -172,15 +175,15 @@ public PBMediaStore getMediaStore() {
 
     private PBMediaSender getMediaSender() {
         if (mediaSender == null) {
-            mediaSender = new PBMediaSender(this);
+            mediaSender = new PBMediaSender();
             mediaSender.addInterface(this);
         }
         return mediaSender;
     }
 
 
     public int getMediaSize() {
-        return getMediaStore().getMedias().size();
+        return getMediaStore().getMediaList().size();
     }
 
 

app/src/main/java/fr/s13d/photobackup/PBService.java

@@ -30,6 +30,8 @@
 
 import java.util.List;
 
+import fr.s13d.photobackup.media.PBMedia;
+import fr.s13d.photobackup.media.PBMediaStore;
 import fr.s13d.photobackup.preferences.PBPreferenceFragment;
 
 public class PBWifiBroadcastReceiver extends BroadcastReceiver {
@@ -72,10 +74,10 @@ public void onReceive(final Context context, final Intent intent) {
             if (mediaStore == null) {
                 return;
             }
-            List<PBMedia> medias = mediaStore.getMedias();
+            List<PBMedia> medias = mediaStore.getMediaList();
             Log.i(LOG_TAG, "media count = " + medias.size());
 
-            for (PBMedia media : mediaStore.getMedias()) {
+            for (PBMedia media : medias) {
                 // TODO replace with media.isUnsaved after PR merge and getAge
                 if (media.getAge() < 3600 * 24 * 7 && media.getState() != PBMedia.PBMediaState.SYNCED) {
                     Log.i(LOG_TAG, "Notify to send " + media.getPath());

app/src/main/java/fr/s13d/photobackup/PBWifiBroadcastReceiver.java

@@ -20,6 +20,9 @@
 
 
 public interface PBMediaSenderInterface {
+
+    void onMessage(final String message);
+
     void onSendSuccess();
     void onSendFailure();