diff --git a/core/res/drawable-hdpi/ic_action_rss.png b/core/res/drawable-hdpi/ic_action_rss.png index 1c5baa20..6aa10203 100644 Binary files a/core/res/drawable-hdpi/ic_action_rss.png and b/core/res/drawable-hdpi/ic_action_rss.png differ diff --git a/core/res/drawable-hdpi/ic_action_turtle_disabled.png b/core/res/drawable-hdpi/ic_action_turtle_disabled.png index 1532eb39..a99cd104 100644 Binary files a/core/res/drawable-hdpi/ic_action_turtle_disabled.png and b/core/res/drawable-hdpi/ic_action_turtle_disabled.png differ diff --git a/core/res/drawable-hdpi/ic_action_turtle_enabled.png b/core/res/drawable-hdpi/ic_action_turtle_enabled.png index f132d256..1532eb39 100644 Binary files a/core/res/drawable-hdpi/ic_action_turtle_enabled.png and b/core/res/drawable-hdpi/ic_action_turtle_enabled.png differ diff --git a/core/res/drawable-mdpi/ic_action_rss.png b/core/res/drawable-mdpi/ic_action_rss.png index 29ce14e8..2c5d0933 100644 Binary files a/core/res/drawable-mdpi/ic_action_rss.png and b/core/res/drawable-mdpi/ic_action_rss.png differ diff --git a/core/res/drawable-mdpi/ic_action_turtle_disabled.png b/core/res/drawable-mdpi/ic_action_turtle_disabled.png index fedbfc9b..70155517 100644 Binary files a/core/res/drawable-mdpi/ic_action_turtle_disabled.png and b/core/res/drawable-mdpi/ic_action_turtle_disabled.png differ diff --git a/core/res/drawable-mdpi/ic_action_turtle_enabled.png b/core/res/drawable-mdpi/ic_action_turtle_enabled.png index 576931ed..fedbfc9b 100644 Binary files a/core/res/drawable-mdpi/ic_action_turtle_enabled.png and b/core/res/drawable-mdpi/ic_action_turtle_enabled.png differ diff --git a/core/res/drawable-xhdpi/ic_action_rss.png b/core/res/drawable-xhdpi/ic_action_rss.png index 762be0e5..03365510 100644 Binary files a/core/res/drawable-xhdpi/ic_action_rss.png and b/core/res/drawable-xhdpi/ic_action_rss.png differ diff --git a/core/res/drawable-xhdpi/ic_action_turtle_disabled.png b/core/res/drawable-xhdpi/ic_action_turtle_disabled.png index 8bfedf1e..12068f67 100644 Binary files a/core/res/drawable-xhdpi/ic_action_turtle_disabled.png and b/core/res/drawable-xhdpi/ic_action_turtle_disabled.png differ diff --git a/core/res/drawable-xhdpi/ic_action_turtle_enabled.png b/core/res/drawable-xhdpi/ic_action_turtle_enabled.png index bf572ee3..8bfedf1e 100644 Binary files a/core/res/drawable-xhdpi/ic_action_turtle_enabled.png and b/core/res/drawable-xhdpi/ic_action_turtle_enabled.png differ diff --git a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java b/core/src/org/transdroid/core/app/settings/ApplicationSettings.java index d1a8eab1..6cf68aa9 100644 --- a/core/src/org/transdroid/core/app/settings/ApplicationSettings.java +++ b/core/src/org/transdroid/core/app/settings/ApplicationSettings.java @@ -112,7 +112,7 @@ public class ApplicationSettings { edit.putBoolean("server_ssltrustall_" + i, prefs.getBoolean("server_ssltrustall_" + (i + 1), false)); edit.putString("server_ssltrustkey_" + i, prefs.getString("server_ssltrustkey_" + (i + 1), null)); edit.putString("server_folder_" + i, prefs.getString("server_folder_" + (i + 1), null)); - edit.putBoolean("server_useauth_" + i, prefs.getBoolean("server_useauth_" + (i + 1), false)); + edit.putBoolean("server_useauth_" + i, prefs.getBoolean("server_useauth_" + (i + 1), true)); edit.putString("server_user_" + i, prefs.getString("server_user_" + (i + 1), null)); edit.putString("server_pass_" + i, prefs.getString("server_pass_" + (i + 1), null)); edit.putString("server_extrapass_" + i, prefs.getString("server_extrapass_" + (i + 1), null)); @@ -121,7 +121,7 @@ public class ApplicationSettings { edit.putString("server_ftpurl_" + i, prefs.getString("server_ftpurl_" + (i + 1), null)); edit.putString("server_ftppass_" + i, prefs.getString("server_ftppass_" + (i + 1), null)); edit.putString("server_timeout_" + i, prefs.getString("server_timeout_" + (i + 1), null)); - edit.putBoolean("server_alarmfinished_" + i, prefs.getBoolean("server_alarmfinished_" + (i + 1), false)); + edit.putBoolean("server_alarmfinished_" + i, prefs.getBoolean("server_alarmfinished_" + (i + 1), true)); edit.putBoolean("server_alarmfinished_" + i, prefs.getBoolean("server_alarmfinished_" + (i + 1), false)); } diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java index 8a208786..76ebe1da 100644 --- a/core/src/org/transdroid/core/gui/TorrentsActivity.java +++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java @@ -100,6 +100,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi protected ApplicationSettings applicationSettings; @InstanceState boolean firstStart = true; + boolean skipNextOnNavigationItemSelectedCall = false; private IDaemonAdapter currentConnection = null; @InstanceState protected NavigationFilter currentFilter = null; @@ -154,7 +155,8 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi return; } // Set this as selection in the action bar spinner; we can use the server setting key since we have stable ids - getSupportActionBar().setSelectedNavigationItem(lastUsed.getOrder()); + getSupportActionBar().setSelectedNavigationItem(lastUsed.getOrder() + 1); + skipNextOnNavigationItemSelectedCall = true; // Handle any start up intents if (firstStart && getIntent() != null) { @@ -242,6 +244,10 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi */ @Override public boolean onNavigationItemSelected(int itemPosition, long itemId) { + if (skipNextOnNavigationItemSelectedCall) { + skipNextOnNavigationItemSelectedCall = false; + return false; + } Object item = navigationSpinnerAdapter.getItem(itemPosition); if (item instanceof SimpleListItem) { // A filter item was selected form the navigation spinner @@ -297,9 +303,8 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi if (fragmentDetails != null && fragmentDetails.getActivity() != null) { fragmentDetails.clear(); } - fragmentTorrents.updateIsLoading(true); updateFragmentVisibility(true); - refreshTorrents(); + refreshScreen(); return; } @@ -558,7 +563,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi @Background protected void updateTurtleMode(boolean enable) { DaemonTaskResult result = SetAlternativeModeTask.create(currentConnection, enable).execute(); - if (result instanceof GetStatsTaskSuccessResult) { + if (result instanceof DaemonTaskSuccessResult) { // Success; no need to retrieve it again - just update the visual indicator onTurtleModeRetrieved(enable); } else { diff --git a/core/src/org/transdroid/core/gui/TorrentsFragment.java b/core/src/org/transdroid/core/gui/TorrentsFragment.java index fa71b2e2..cebeab27 100644 --- a/core/src/org/transdroid/core/gui/TorrentsFragment.java +++ b/core/src/org/transdroid/core/gui/TorrentsFragment.java @@ -91,6 +91,7 @@ public class TorrentsFragment extends SherlockFragment { * Clears the currently visible list of torrents. */ public void clear() { + this.torrents = null; this.connectionErrorMessage = null; this.currentTextFilter = null; this.currentNavigationFilter = null;