Updated turtle mode icons and fixed tutle mode status indication.

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));
 		}
 

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 {

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;