fetch button for updates in podcastmanager

gpodder · Jun 14, 2011 · c0b0651 · c0b0651
1 parent 0068217
commit c0b0651
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 16 deletions.
diff --git a/GpodRoid.iml b/GpodRoid.iml
@@ -25,8 +25,8 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="jdk" jdkName="Android 2.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/res/menu/podcastmanager.xml b/res/menu/podcastmanager.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android">
 
 
-  <item android:id="@+id/subscriptions" android:icon="@drawable/android:ic_menu_agenda" android:title="subscriptions" />
-  <item android:id="@+id/fetch_updates" android:icon="@drawable/android:ic_menu_agenda" android:title="subscriptions" />
+  <item android:id="@+id/fetch_updates" android:icon="@drawable/android:ic_popup_sync" android:title="fetch updates" />
+  <!--<item android:id="@+id/fetch_updates" android:icon="@drawable/android:ic_menu_agenda" android:title="subscriptions" />-->
 
 </menu>
diff --git a/src/com/unitedcoders/android/gpodroid/activity/PodcastManager.java b/src/com/unitedcoders/android/gpodroid/activity/PodcastManager.java
@@ -4,16 +4,14 @@
 import android.content.*;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
+import android.view.*;
 import android.view.View.OnClickListener;
 import android.widget.*;
 import android.widget.AdapterView.OnItemClickListener;
 import com.unitedcoders.android.gpodroid.*;
 import com.unitedcoders.android.gpodroid.database.GpodDB;
 import com.unitedcoders.android.gpodroid.services.DownloadService;
+import com.unitedcoders.android.gpodroid.services.UpdateService;
 import roboguice.activity.RoboTabActivity;
 import roboguice.inject.InjectView;
 
@@ -27,12 +25,16 @@ public class PodcastManager extends RoboTabActivity implements OnClickListener {
     private TabHost mTabHost;
 
     // podcasts in archive
-    @InjectView(R.id.lv_shows) private ListView lvShows;
-    @InjectView(R.id.lv_podcasts) private ListView lvPodcasts;
-    @InjectView(R.id.lv_downloads) private ListView lvDownloads;
+    @InjectView(R.id.lv_shows)
+    private ListView lvShows;
+    @InjectView(R.id.lv_podcasts)
+    private ListView lvPodcasts;
+    @InjectView(R.id.lv_downloads)
+    private ListView lvDownloads;
 //    private ListView lvDownloads;
 
-    @InjectView(R.id.tabmgr_sdcard) private ViewFlipper sdcardFlipper;
+    @InjectView(R.id.tabmgr_sdcard)
+    private ViewFlipper sdcardFlipper;
     private PodcastListAdapter podcastAdapter;
     private PodcastListAdapter downloadAdapter;
     private ArrayAdapter showAdapter;
@@ -65,13 +67,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mTabHost.addTab(mTabHost.newTabSpec("tab_test1").setIndicator("Podcasts").setContent(R.id.tabmgr_sdcard));
         mTabHost.addTab(mTabHost.newTabSpec("tab_test3").setIndicator("New")
-                                .setContent(R.id.tabmgr_subscriptions));
+                .setContent(R.id.tabmgr_subscriptions));
 
         mTabHost.setCurrentTab(0);
 
-//        showShows();
-//        showDownloads();
-
 
     }
 
@@ -105,7 +104,9 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
                 return super.onKeyDown(keyCode, event);
             }
         }
-        return true;
+
+
+        return super.onKeyDown(keyCode, event);
     }
 
 
@@ -277,4 +278,27 @@ public void onReceive(Context context, Intent intent) {
     };
 
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+//        super.onCreateOptionsMenu(menu);
+        if (getParent() != null) {
+            return getParent().onCreateOptionsMenu(menu);
+        }
+
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.podcastmanager, menu);
+        return true;
+    }
+
+    /**
+     * fetch new subscriptions
+     * @param item
+     * @return
+     */
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        startService(new Intent(getApplicationContext(), UpdateService.class));
+        return super.onOptionsItemSelected(item);
+    }
+
 }
diff --git a/src/com/unitedcoders/android/gpodroid/activity/SelectDevice.java b/src/com/unitedcoders/android/gpodroid/activity/SelectDevice.java
@@ -121,6 +121,7 @@ public void run() {
                 Looper.prepare();
                 devices = GpodderAPI.getDevices();
                 handler.post(displayResults);
+                Looper.loop();
             }
         };
         t.start();

diff --git a/src/com/unitedcoders/android/gpodroid/services/UpdateService.java b/src/com/unitedcoders/android/gpodroid/services/UpdateService.java
@@ -68,6 +68,7 @@ public void run() {
         public void run() {
             Looper.prepare();
             backgroundPodcastInfoFetcher();
+            Looper.loop();
         }
     };