Merge pull request #903 from mfietz/issue/898-store-has-embedded-picture

Store information if file has embedded picture in the database

2 files changed, 61 insertions, 4 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index add0ca62d..5b80b8f9d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.activity;
 
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -31,6 +32,7 @@ import java.util.List;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.NavListAdapter;
+import de.danoeh.antennapod.core.event.ProgressEvent;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.QueueEvent;
@@ -95,6 +97,8 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
     private CharSequence currentTitle;
     private String currentFragment;
 
+    private ProgressDialog pd;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getNoTitleTheme());
@@ -470,6 +474,9 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
         cancelLoadTask();
         EventDistributor.getInstance().unregister(contentUpdate);
         EventBus.getDefault().unregister(this);
+        if(pd != null) {
+            pd.dismiss();
+        }
     }
 
     @Override
@@ -573,6 +580,24 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
         loadData();
     }
 
+    public void onEventMainThread(ProgressEvent event) {
+        Log.d(TAG, "onEvent(" + event + ")");
+        switch(event.action) {
+            case START:
+                pd = new ProgressDialog(this);
+                pd.setMessage(event.message);
+                pd.setIndeterminate(true);
+                pd.setCancelable(false);
+                pd.show();
+                break;
+            case END:
+                if(pd != null) {
+                    pd.dismiss();
+                }
+                break;
+        }
+    }
+
     private EventDistributor.EventListener contentUpdate = new EventDistributor.EventListener() {
 
         @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/config/StorageCallbacksImpl.java b/app/src/main/java/de/danoeh/antennapod/config/StorageCallbacksImpl.java
index 943e05690..d8fab34c8 100644
--- a/app/src/main/java/de/danoeh/antennapod/config/StorageCallbacksImpl.java
+++ b/app/src/main/java/de/danoeh/antennapod/config/StorageCallbacksImpl.java
@@ -4,6 +4,7 @@ package de.danoeh.antennapod.config;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.media.MediaMetadataRetriever;
 import android.util.Log;
 
 import de.danoeh.antennapod.core.StorageCallbacks;
@@ -13,11 +14,11 @@ public class StorageCallbacksImpl implements StorageCallbacks {
 
     @Override
     public int getDatabaseVersion() {
-        return 15;
+        return 16;
     }
 
     @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+    public void onUpgrade(final SQLiteDatabase db, int oldVersion, int newVersion) {
         Log.w("DBAdapter", "Upgrading from version " + oldVersion + " to "
                 + newVersion + ".");
         if (oldVersion <= 1) {
@@ -125,7 +126,6 @@ public class StorageCallbacksImpl implements StorageCallbacks {
                     PodDBAdapter.KEY_CHAPTER_TYPE));
         }
         if(oldVersion <= 14) {
-
             db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
                     + " ADD COLUMN " + PodDBAdapter.KEY_AUTO_DOWNLOAD + " INTEGER");
             db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_ITEMS
@@ -137,7 +137,6 @@ public class StorageCallbacksImpl implements StorageCallbacks {
 
             db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
                     + " ADD COLUMN " + PodDBAdapter.KEY_HIDE + " TEXT");
-
             
             db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEEDS
                     + " ADD COLUMN " + PodDBAdapter.KEY_LAST_UPDATE_FAILED + " INTEGER DEFAULT 0");
@@ -149,5 +148,38 @@ public class StorageCallbacksImpl implements StorageCallbacks {
             db.execSQL(PodDBAdapter.CREATE_INDEX_QUEUE_FEEDITEM);
             db.execSQL(PodDBAdapter.CREATE_INDEX_SIMPLECHAPTERS_FEEDITEM);
         }
+        if(oldVersion <= 15) {
+            db.execSQL("ALTER TABLE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " ADD COLUMN " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + " INTEGER DEFAULT -1");
+            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=0"
+                    + " WHERE " + PodDBAdapter.KEY_DOWNLOADED + "=0");
+            Cursor c = db.rawQuery("SELECT " + PodDBAdapter.KEY_FILE_URL
+                    + " FROM " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                    + " WHERE " + PodDBAdapter.KEY_DOWNLOADED + "=1 "
+                    + " AND " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=-1", null);
+            if(c.moveToFirst()) {
+                MediaMetadataRetriever mmr = new MediaMetadataRetriever();
+                do {
+                    String fileUrl = c.getString(0);
+                    try {
+                        mmr.setDataSource(fileUrl);
+                        byte[] image = mmr.getEmbeddedPicture();
+                        if (image != null) {
+                            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=1"
+                                    + " WHERE " + PodDBAdapter.KEY_FILE_URL + "='"+ fileUrl + "'");
+                        } else {
+                            db.execSQL("UPDATE " + PodDBAdapter.TABLE_NAME_FEED_MEDIA
+                                    + " SET " + PodDBAdapter.KEY_HAS_EMBEDDED_PICTURE + "=0"
+                                    + " WHERE " + PodDBAdapter.KEY_FILE_URL + "='"+ fileUrl + "'");
+                        }
+                    } catch(Exception e) {
+                        e.printStackTrace();
+                    }
+                } while(c.moveToNext());
+            }
+            c.close();
+        }
     }
 }