Redownload station list menu item

Author: basinilya

Piterfm-Xmlupdate/src/Main.java

@@ -12,6 +12,7 @@
 
     <string name="ac_settings">Настройки</string>
     <string name="ac_refresh">Обновить</string>
+    <string name="ac_redownload">Скачать список станций</string>
     <string name="ac_search">Поиск</string>
     <string name="ac_exit">Выход</string>
     <string name="ac_favourite">Избранное</string>

libs/htmlcleaner-2.10.jar

@@ -96,6 +96,7 @@ public boolean onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu) {
         menu.add(0, 200, 200, R.string.ac_settings).setIcon(R.drawable.ic_action_settings).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         menu.add(0, 300, 300, R.string.ac_search).setIcon(R.drawable.ic_action_search).setActionView(R.layout.action_search)
                                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
+        menu.add(0, 350, 350, R.string.ac_redownload).setIcon(R.drawable.ic_navigation_refresh).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         menu.add(0, 400, 400, R.string.ac_exit    ).setIcon(R.drawable.ic_cancel).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         return super.onCreateOptionsMenu(menu);
@@ -121,7 +122,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
     public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
         switch (item.getItemId()){
             case 100:
-                ((RadioFragment) mAdapter.getItem(mPager.getCurrentItem())).updateChannels();
+                ((RadioFragment) mAdapter.getItem(mPager.getCurrentItem())).updateChannels(false);
                 break;
             case 200:
                 startActivity(new Intent(this, SettingsActivity.class));
@@ -130,6 +131,9 @@ public boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem item) {
                 search = (EditText) item.getActionView();
                 search.addTextChangedListener(filterTextWatcher);
                 break;
+            case 350:
+                ((RadioFragment) mAdapter.getItem(mPager.getCurrentItem())).updateChannels(true);
+                break;
             case 400:
 
                 final AlertDialog alert;

res/values/strings.xml

@@ -48,11 +48,10 @@ public RadioFragment(Radio radio) {
         this.radio = radio;
     }
 
-
-    public void updateChannels() {
+    public void updateChannels(boolean redownload) {
         GetChannelsTask task = new GetChannelsTask(getActivity());
         task.setChannelsLoadingListener(this);
-        task.execute(radio, true);
+        task.execute(radio, true, redownload);
     }
 
     @Override

src/ru/piter/fm/activities/RadioActivity.java

@@ -36,8 +36,10 @@ public List<Channel> doWork(Object... objects) throws Exception {
 
         if (radio.getName().equals(RadioFactory.FAVOURITE))
             channels = db.selectAllChannels(radio);
-        else
-            channels = RadioUtils.getRadioChannels(radio, context);
+        else {
+            boolean redownload = objects.length > 2 && (Boolean)objects[2];
+            channels = RadioUtils.getRadioChannels(radio, context, redownload);
+        }
 
 //        // force update
 //        if (!radio.getName().equals(RadioFactory.FAVOURITE) && (channels == null || objects.length > 1)) {