From cd44899f83fda8747180c4696bed162205ffed22 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 11 Oct 2013 12:00:07 +0200
Subject: [PATCH 1/4] Click on empty/error messages refreshes the torrents and
 details screens. Fixes #20.

---
 core/res/layout/fragment_details.xml          | 13 +++++++
 .../transdroid/core/gui/DetailsActivity.java  | 38 +++++++++---------
 .../transdroid/core/gui/DetailsFragment.java  | 39 ++++++++++++++++---
 .../core/gui/TorrentTasksExecutor.java        |  5 +++
 .../transdroid/core/gui/TorrentsActivity.java | 12 ++++--
 .../transdroid/core/gui/TorrentsFragment.java | 18 +++++++++
 .../gui/navigation/RefreshableActivity.java   | 28 +++++++++++++
 .../core/service/ConnectivityHelper.java      |  4 +-
 8 files changed, 129 insertions(+), 28 deletions(-)
 create mode 100644 core/src/org/transdroid/core/gui/navigation/RefreshableActivity.java

diff --git a/core/res/layout/fragment_details.xml b/core/res/layout/fragment_details.xml
index cc8306dd..e2700c2c 100644
--- a/core/res/layout/fragment_details.xml
+++ b/core/res/layout/fragment_details.xml
@@ -52,4 +52,17 @@
 		android:textIsSelectable="false"
 		android:visibility="visible" />
 
+	<TextView
+		android:id="@+id/error_text"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:drawablePadding="8dip"
+		android:drawableTop="?attr/loading_progress"
+		android:gravity="center"
+		android:maxWidth="400dip"
+		android:padding="@dimen/margin_default"
+		android:textIsSelectable="false"
+		android:visibility="gone" />
+	
 </FrameLayout>
diff --git a/core/src/org/transdroid/core/gui/DetailsActivity.java b/core/src/org/transdroid/core/gui/DetailsActivity.java
index 3f6e1bd0..0f3c816d 100644
--- a/core/src/org/transdroid/core/gui/DetailsActivity.java
+++ b/core/src/org/transdroid/core/gui/DetailsActivity.java
@@ -35,6 +35,7 @@ import org.transdroid.core.gui.lists.LocalTorrent;
 import org.transdroid.core.gui.log.Log;
 import org.transdroid.core.gui.navigation.Label;
 import org.transdroid.core.gui.navigation.NavigationHelper;
+import org.transdroid.core.gui.navigation.RefreshableActivity;
 import org.transdroid.core.service.ConnectivityHelper;
 import org.transdroid.daemon.Daemon;
 import org.transdroid.daemon.IDaemonAdapter;
@@ -79,7 +80,7 @@ import de.keyboardsurfer.android.widget.crouton.Crouton;
  */
 @EActivity(resName = "activity_details")
 @OptionsMenu(resName = "activity_details")
-public class DetailsActivity extends SherlockFragmentActivity implements TorrentTasksExecutor {
+public class DetailsActivity extends SherlockFragmentActivity implements TorrentTasksExecutor, RefreshableActivity {
 
 	@Extra
 	@InstanceState
@@ -148,8 +149,8 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 	}
 
 	@OptionsItem(resName = "action_refresh")
-	protected void refreshScreen() {
-		fragmentDetails.updateIsLoading(true);
+	public void refreshScreen() {
+		fragmentDetails.updateIsLoading(true, null);
 		refreshTorrent();
 		refreshTorrentDetails(torrent);
 		refreshTorrentFiles(torrent);
@@ -162,7 +163,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 			onTorrentsRetrieved(((RetrieveTaskSuccessResult) result).getTorrents(),
 					((RetrieveTaskSuccessResult) result).getLabels());
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, true);
 		}
 	}
 
@@ -174,7 +175,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof GetTorrentDetailsTaskSuccessResult) {
 			onTorrentDetailsRetrieved(torrent, ((GetTorrentDetailsTaskSuccessResult) result).getTorrentDetails());
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -186,7 +187,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof GetFileListTaskSuccessResult) {
 			onTorrentFilesRetrieved(torrent, ((GetFileListTaskSuccessResult) result).getFiles());
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -198,7 +199,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_resumed, torrent.getName()));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -210,7 +211,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_paused, torrent.getName()));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -222,7 +223,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_started, torrent.getName()));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -234,7 +235,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_stopped, torrent.getName()));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -247,7 +248,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 			closeActivity(getString(withData ? R.string.result_removed_with_data : R.string.result_removed,
 					torrent.getName()));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -267,7 +268,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_labelset, newLabel));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -278,7 +279,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_trackersupdated));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -289,7 +290,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_locationset, newLocation));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -301,7 +302,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(R.string.result_priotitiesset));
 		} else {
-			onCommunicationError((DaemonTaskFailureResult) result);
+			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}
 	}
 
@@ -326,9 +327,10 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 	}
 
 	@UiThread
-	protected void onCommunicationError(DaemonTaskFailureResult result) {
+	protected void onCommunicationError(DaemonTaskFailureResult result, boolean isCritical) {
 		Log.i(this, result.getException().toString());
-		fragmentDetails.updateIsLoading(false);
+		String error = getString(LocalTorrent.getResourceForDaemonException(result.getException()));
+		fragmentDetails.updateIsLoading(false, isCritical? error: null);
 		Crouton.showText(this, getString(LocalTorrent.getResourceForDaemonException(result.getException())),
 				NavigationHelper.CROUTON_ERROR_STYLE);
 	}
@@ -336,7 +338,7 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
 	@UiThread
 	protected void onTorrentsRetrieved(List<Torrent> torrents, List<org.transdroid.daemon.Label> labels) {
 		// Update the details fragment accordingly
-		fragmentDetails.updateIsLoading(false);
+		fragmentDetails.updateIsLoading(false, null);
 		fragmentDetails.perhapsUpdateTorrent(torrents);
 		fragmentDetails.updateLabels(Label.convertToNavigationLabels(labels,
 				getResources().getString(R.string.labels_unlabeled)));
diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/core/src/org/transdroid/core/gui/DetailsFragment.java
index 2697335b..80b2f591 100644
--- a/core/src/org/transdroid/core/gui/DetailsFragment.java
+++ b/core/src/org/transdroid/core/gui/DetailsFragment.java
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.InstanceState;
 import org.androidannotations.annotations.OptionsItem;
@@ -34,6 +35,7 @@ import org.transdroid.core.gui.lists.SimpleListItemAdapter;
 import org.transdroid.core.gui.navigation.Label;
 import org.transdroid.core.gui.navigation.NavigationHelper;
 import org.transdroid.core.gui.navigation.NavigationHelper_;
+import org.transdroid.core.gui.navigation.RefreshableActivity;
 import org.transdroid.core.gui.navigation.SelectionManagerMode;
 import org.transdroid.core.gui.navigation.SetLabelDialog;
 import org.transdroid.core.gui.navigation.SetLabelDialog.OnLabelPickedListener;
@@ -85,13 +87,15 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 	protected ArrayList<Label> currentLabels = null;
 	@InstanceState
 	protected boolean isLoadingTorrent = false;
+	@InstanceState
+	protected boolean hasCriticalError = false;
 	private ServerSetting currentServerSettings = null;
 
 	// Views
 	@ViewById(resName = "details_list")
 	protected SherlockListView detailsList;
 	@ViewById
-	protected TextView emptyText;
+	protected TextView emptyText, errorText;
 	@ViewById
 	protected ProgressBar loadingProgress;
 
@@ -128,19 +132,22 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 
 	/**
 	 * Updates the details adapter header to show the new torrent data.
-	 * @param newTorrent The new torrent object
+	 * @param newTorrent The new, non-null torrent object
 	 */
 	public void updateTorrent(Torrent newTorrent) {
-		clear();
 		this.torrent = newTorrent;
+		this.hasCriticalError = false;
 		((DetailsAdapter) detailsList.getAdapter()).updateTorrent(newTorrent);
 		// Make the list (with details header) visible
 		detailsList.setVisibility(View.VISIBLE);
 		emptyText.setVisibility(View.GONE);
+		errorText.setVisibility(View.GONE);
 		loadingProgress.setVisibility(View.GONE);
 		// Also update the available actions in the action bar
 		getActivity().supportInvalidateOptionsMenu();
 		// Refresh the detailed statistics (errors) and list of files
+		torrentDetails = null;
+		torrentFiles = null;
 		getTasksExecutor().refreshTorrentDetails(torrent);
 		getTasksExecutor().refreshTorrentFiles(torrent);
 	}
@@ -208,7 +215,8 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 	public void clear() {
 		detailsList.setAdapter(new DetailsAdapter(getActivity()));
 		detailsList.setVisibility(View.GONE);
-		emptyText.setVisibility(!isLoadingTorrent ? View.VISIBLE : View.GONE);
+		emptyText.setVisibility(!isLoadingTorrent && !hasCriticalError ? View.VISIBLE : View.GONE);
+		errorText.setVisibility(!isLoadingTorrent && hasCriticalError ? View.VISIBLE : View.GONE);
 		loadingProgress.setVisibility(isLoadingTorrent ? View.VISIBLE : View.GONE);
 		// Note: this.torrent is not cleared as we need to know later what the fragment was originally bound to
 		torrentDetails = null;
@@ -218,10 +226,13 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 	/**
 	 * Updates the shown screen depending on whether the torrent is loading
 	 * @param isLoading True if the torrent is (re)loading, false otherwise
+	 * @param connectionErrorMessage The error message text to show to the user, or null if there was no error
 	 */
-	public void updateIsLoading(boolean isLoading) {
+	public void updateIsLoading(boolean isLoading, String connectionErrorMessage) {
 		this.isLoadingTorrent = isLoading;
-		if (isLoadingTorrent)
+		this.hasCriticalError = connectionErrorMessage != null;
+		errorText.setText(connectionErrorMessage);
+		if (isLoading || hasCriticalError)
 			clear();
 	}
 
@@ -330,6 +341,22 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 		getTasksExecutor().updateLocation(torrent, newLocation);
 	}
 
+	@Click
+	protected void emptyTextClicked() {
+		// Refresh the activity (that contains this fragment) when the empty view gear is clicked
+		if (getActivity() != null && getActivity() instanceof RefreshableActivity) {
+			((RefreshableActivity) getActivity()).refreshScreen();
+		}
+	}
+
+	@Click
+	protected void errorTextClicked() {
+		// Refresh the activity (that contains this fragment) when the error view gear is clicked
+		if (getActivity() != null && getActivity() instanceof RefreshableActivity) {
+			((RefreshableActivity) getActivity()).refreshScreen();
+		}
+	}
+
 	private MultiChoiceModeListenerCompat onDetailsSelected = new MultiChoiceModeListenerCompat() {
 
 		SelectionManagerMode selectionManagerMode;
diff --git a/core/src/org/transdroid/core/gui/TorrentTasksExecutor.java b/core/src/org/transdroid/core/gui/TorrentTasksExecutor.java
index d693063b..c8011e3b 100644
--- a/core/src/org/transdroid/core/gui/TorrentTasksExecutor.java
+++ b/core/src/org/transdroid/core/gui/TorrentTasksExecutor.java
@@ -22,6 +22,11 @@ import org.transdroid.daemon.Priority;
 import org.transdroid.daemon.Torrent;
 import org.transdroid.daemon.TorrentFile;
 
+/**
+ * Interface to be implemented by any activity that wants containing fragments to be able to load data and execute
+ * commands against a torrent server.
+ * @author Eric Kok
+ */
 public interface TorrentTasksExecutor {
 	void resumeTorrent(Torrent torrent);
 	void pauseTorrent(Torrent torrent);
diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java
index 5f09ef4f..2b45c909 100644
--- a/core/src/org/transdroid/core/gui/TorrentsActivity.java
+++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java
@@ -122,7 +122,8 @@ import de.keyboardsurfer.android.widget.crouton.Crouton;
  */
 @EActivity(resName = "activity_torrents")
 @OptionsMenu(resName = "activity_torrents")
-public class TorrentsActivity extends SherlockFragmentActivity implements OnNavigationListener, TorrentTasksExecutor {
+public class TorrentsActivity extends SherlockFragmentActivity implements OnNavigationListener, TorrentTasksExecutor,
+		RefreshableActivity {
 
 	// Navigation components
 	@Bean
@@ -385,6 +386,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 			// Clear the currently shown list of torrents and perhaps the details
 			fragmentTorrents.clear(true, true);
 			if (fragmentDetails != null && fragmentDetails.getActivity() != null) {
+				fragmentDetails.updateIsLoading(false, null);
 				fragmentDetails.clear();
 				fragmentDetails.setCurrentServerSettings(server);
 			}
@@ -401,6 +403,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 			navigationSpinnerAdapter.updateCurrentFilter(currentFilter);
 			// Clear the details view
 			if (fragmentDetails != null) {
+				fragmentDetails.updateIsLoading(false, null);
 				fragmentDetails.clear();
 			}
 		}
@@ -547,7 +550,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 	}
 
 	@OptionsItem(resName = "action_refresh")
-	protected void refreshScreen() {
+	public void refreshScreen() {
 		fragmentTorrents.updateIsLoading(true);
 		refreshTorrents();
 		if (Daemon.supportsStats(currentConnection.getType()))
@@ -942,8 +945,11 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 		String error = getString(LocalTorrent.getResourceForDaemonException(result.getException()));
 		Crouton.showText(this, error, NavigationHelper.CROUTON_ERROR_STYLE);
 		fragmentTorrents.updateIsLoading(false);
-		if (isCritical)
+		if (isCritical) {
 			fragmentTorrents.updateError(error);
+			if (fragmentDetails != null)
+				fragmentDetails.updateIsLoading(false, error);
+		}
 	}
 
 	@UiThread
diff --git a/core/src/org/transdroid/core/gui/TorrentsFragment.java b/core/src/org/transdroid/core/gui/TorrentsFragment.java
index 30dad2a8..e37e01de 100644
--- a/core/src/org/transdroid/core/gui/TorrentsFragment.java
+++ b/core/src/org/transdroid/core/gui/TorrentsFragment.java
@@ -23,6 +23,7 @@ import java.util.Locale;
 
 import org.androidannotations.annotations.AfterViews;
 import org.androidannotations.annotations.Bean;
+import org.androidannotations.annotations.Click;
 import org.androidannotations.annotations.EFragment;
 import org.androidannotations.annotations.InstanceState;
 import org.androidannotations.annotations.ItemClick;
@@ -33,6 +34,7 @@ import org.transdroid.core.gui.lists.TorrentsAdapter;
 import org.transdroid.core.gui.lists.TorrentsAdapter_;
 import org.transdroid.core.gui.navigation.Label;
 import org.transdroid.core.gui.navigation.NavigationFilter;
+import org.transdroid.core.gui.navigation.RefreshableActivity;
 import org.transdroid.core.gui.navigation.SelectionManagerMode;
 import org.transdroid.core.gui.navigation.SetLabelDialog;
 import org.transdroid.core.gui.navigation.SetLabelDialog.OnLabelPickedListener;
@@ -304,6 +306,22 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 
 	};
 
+	@Click
+	protected void emptyTextClicked() {
+		// Refresh the activity (that contains this fragment) when the empty view gear is clicked
+		if (getActivity() != null && getActivity() instanceof RefreshableActivity) {
+			((RefreshableActivity) getActivity()).refreshScreen();
+		}
+	}
+
+	@Click
+	protected void errorTextClicked() {
+		// Refresh the activity (that contains this fragment) when the error view gear is clicked
+		if (getActivity() != null && getActivity() instanceof RefreshableActivity) {
+			((RefreshableActivity) getActivity()).refreshScreen();
+		}
+	}
+
 	@ItemClick(resName = "torrent_list")
 	protected void torrentsListClicked(Torrent torrent) {
 		((TorrentsActivity) getActivity()).openDetails(torrent);
diff --git a/core/src/org/transdroid/core/gui/navigation/RefreshableActivity.java b/core/src/org/transdroid/core/gui/navigation/RefreshableActivity.java
new file mode 100644
index 00000000..b5df126a
--- /dev/null
+++ b/core/src/org/transdroid/core/gui/navigation/RefreshableActivity.java
@@ -0,0 +1,28 @@
+/* 
+ * Copyright 2010-2013 Eric Kok et al.
+ * 
+ * Transdroid is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Transdroid is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.transdroid.core.gui.navigation;
+
+/**
+ * Interface to be implemented by any activity that allows its content to be refreshed; fragments can ask for
+ * user-initiated refreshes.
+ * @author Eric Kok
+ */
+public interface RefreshableActivity {
+
+	public void refreshScreen();
+
+}
diff --git a/core/src/org/transdroid/core/service/ConnectivityHelper.java b/core/src/org/transdroid/core/service/ConnectivityHelper.java
index a4e1805f..2b00671d 100644
--- a/core/src/org/transdroid/core/service/ConnectivityHelper.java
+++ b/core/src/org/transdroid/core/service/ConnectivityHelper.java
@@ -42,7 +42,8 @@ public class ConnectivityHelper {
 			return false;
 
 		// Still good? Check the current active network instead
-		return connectivityManager.getActiveNetworkInfo().isConnected();
+		return connectivityManager.getActiveNetworkInfo() != null
+				&& connectivityManager.getActiveNetworkInfo().isConnected();
 	}
 
 	public String getConnectedNetworkName() {
@@ -51,4 +52,5 @@ public class ConnectivityHelper {
 		}
 		return null;
 	}
+
 }

From e3c0af15577a7654c7e02a00bf5ecaa920e76944 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 11 Oct 2013 13:09:19 +0200
Subject: [PATCH 2/4] Fixed widget preview torrents list UI.

---
 .../core/widget/WidgetConfigActivity.java     |   6 +-
 .../core/widget/WidgetPreviewAdapter.java     | 102 ++++++++++++++++++
 2 files changed, 103 insertions(+), 5 deletions(-)
 create mode 100644 core/src/org/transdroid/core/widget/WidgetPreviewAdapter.java

diff --git a/core/src/org/transdroid/core/widget/WidgetConfigActivity.java b/core/src/org/transdroid/core/widget/WidgetConfigActivity.java
index 01d8276f..b87b0ba1 100644
--- a/core/src/org/transdroid/core/widget/WidgetConfigActivity.java
+++ b/core/src/org/transdroid/core/widget/WidgetConfigActivity.java
@@ -32,7 +32,6 @@ import org.transdroid.core.app.settings.ApplicationSettings;
 import org.transdroid.core.app.settings.ServerSetting;
 import org.transdroid.core.gui.lists.SimpleListItemSpinnerAdapter;
 import org.transdroid.core.gui.lists.SortByListItem;
-import org.transdroid.core.gui.lists.TorrentsAdapter;
 import org.transdroid.core.gui.navigation.StatusType;
 import org.transdroid.core.gui.navigation.StatusType.StatusTypeFilter;
 import org.transdroid.core.service.ConnectivityHelper;
@@ -76,8 +75,6 @@ public class WidgetConfigActivity extends SherlockActivity {
 	protected TextView filterText, serverText, errorText;
 	@ViewById
 	protected ListView torrentsList;
-	@Bean
-	protected TorrentsAdapter previewTorrentsAdapter;
 	private List<Torrent> previewTorrents = null;
 
 	// Settings and helpers
@@ -122,7 +119,6 @@ public class WidgetConfigActivity extends SherlockActivity {
 		sortSpinner.setAdapter(new SimpleListItemSpinnerAdapter<SortByListItem>(this, 0, sortOrders));
 		// TODO: Update to AndroidAnnotations 3.0 and use @CheckedChanged
 		reverseorderCheckBox.setOnCheckedChangeListener(reverseorderCheckedChanged);
-		torrentsList.setAdapter(previewTorrentsAdapter);
 		torrentsList.setEmptyView(errorText);
 
 		// Set up action bar with a done button
@@ -215,7 +211,7 @@ public class WidgetConfigActivity extends SherlockActivity {
 				.sort(filteredTorrents, new TorrentsComparator(serverType, sortBy, reverseorderCheckBox.isChecked()));
 
 		// Finally update the widget preview with the live, filtered and sorted torrents list
-		previewTorrentsAdapter.update(filteredTorrents);
+		torrentsList.setAdapter(new WidgetPreviewAdapter(this, 0, filteredTorrents));
 		torrentsList.setVisibility(View.VISIBLE);
 		errorText.setVisibility(View.GONE);
 	}
diff --git a/core/src/org/transdroid/core/widget/WidgetPreviewAdapter.java b/core/src/org/transdroid/core/widget/WidgetPreviewAdapter.java
new file mode 100644
index 00000000..efd9c4d7
--- /dev/null
+++ b/core/src/org/transdroid/core/widget/WidgetPreviewAdapter.java
@@ -0,0 +1,102 @@
+/* 
+ * Copyright 2010-2013 Eric Kok et al.
+ * 
+ * Transdroid is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Transdroid is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.transdroid.core.widget;
+
+import java.util.List;
+
+import org.transdroid.core.R;
+import org.transdroid.core.gui.lists.LocalTorrent;
+import org.transdroid.daemon.Torrent;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+/**
+ * A list list item adapter that shows torrents as simplified, widget-style list items; the light theme is always used.
+ * @author Eric Kok
+ */
+public class WidgetPreviewAdapter extends ArrayAdapter<Torrent> {
+
+	/**
+	 * Constructs the custom array adapter that shows torrents in a widget list style for preview.
+	 * @param context The widget configuration activity context
+	 * @param foo Ignored parameter; the light theme widget appearance is always used
+	 * @param torrents The already-retrieved, non-null list of torrents to show
+	 */
+	public WidgetPreviewAdapter(Context context, int foo, List<Torrent> torrents) {
+		super(context, R.layout.list_item_widget_light, torrents);
+	}
+
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		
+		// Get the views
+		ViewHolder holder;
+		if (convertView == null) {
+			convertView = LayoutInflater.from(getContext()).inflate(R.layout.list_item_widget_light, parent, false);
+			holder = new ViewHolder();
+			holder.nameText = (TextView) convertView.findViewById(R.id.name_text);
+			holder.progressText = (TextView) convertView.findViewById(R.id.progress_text);
+			holder.ratioText = (TextView) convertView.findViewById(R.id.ratio_text);
+			holder.statusView = convertView.findViewById(R.id.status_view);
+			convertView.setTag(holder);
+		} else {
+			holder = (ViewHolder) convertView.getTag();
+		}
+		
+		// Bind the torrent values
+		Torrent torrent = getItem(position);
+		LocalTorrent local = LocalTorrent.fromTorrent(torrent);
+
+		int statusColour;
+		switch (torrent.getStatusCode()) {
+		case Downloading:
+			statusColour = R.color.torrent_downloading;
+			break;
+		case Paused:
+			statusColour = R.color.torrent_paused;
+			break;
+		case Seeding:
+			statusColour = R.color.torrent_seeding;
+			break;
+		case Error:
+			statusColour = R.color.torrent_error;
+			break;
+		default: // Checking, Waiting, Queued, Unknown
+			statusColour = R.color.torrent_other;
+			break;
+		}
+		holder.nameText.setText(torrent.getName());
+		holder.progressText.setText(local.getProgressSizeText(getContext().getResources(), false));
+		holder.ratioText.setText(local.getProgressEtaRatioText(getContext().getResources()));
+		holder.statusView.setBackgroundColor(getContext().getResources().getColor(statusColour));
+		return convertView;
+		
+	}
+
+	protected static class ViewHolder {
+		public TextView nameText;
+		public TextView progressText;
+		public TextView ratioText;
+		public View statusView;
+	}
+	
+}

From fc2cd9be257ec250463b486ca0a8bfd1329d345c Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 11 Oct 2013 16:13:01 +0200
Subject: [PATCH 3/4] Improving the general screen flow and unnecesary multiple
 refresh calls. Also fixes #11 and fixes #6.

---
 .../transdroid/core/gui/DetailsFragment.java  |  1 +
 .../transdroid/core/gui/TorrentsActivity.java | 30 +++++++++++++------
 .../transdroid/core/gui/TorrentsFragment.java | 10 +++----
 .../core/gui/rss/RssitemsFragment.java        |  5 +++-
 .../gui/search/SearchResultsFragment.java     |  5 +++-
 full/AndroidManifest.xml                      |  2 ++
 6 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/core/src/org/transdroid/core/gui/DetailsFragment.java
index 80b2f591..d934e154 100644
--- a/core/src/org/transdroid/core/gui/DetailsFragment.java
+++ b/core/src/org/transdroid/core/gui/DetailsFragment.java
@@ -249,6 +249,7 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 			menu.findItem(R.id.action_remove_withdata).setVisible(false);
 			menu.findItem(R.id.action_setlabel).setVisible(false);
 			menu.findItem(R.id.action_updatetrackers).setVisible(false);
+			menu.findItem(R.id.action_changelocation).setVisible(false);
 			return;
 		}
 		// Update action availability
diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java
index 2b45c909..f86bc875 100644
--- a/core/src/org/transdroid/core/gui/TorrentsActivity.java
+++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java
@@ -144,7 +144,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 	protected ApplicationSettings applicationSettings;
 	@InstanceState
 	boolean firstStart = true;
-	boolean skipNextOnNavigationItemSelectedCall = false;
+	int skipNextOnNavigationItemSelectedCalls = 2;
 	private IDaemonAdapter currentConnection = null;
 	@InstanceState
 	protected NavigationFilter currentFilter = null;
@@ -208,7 +208,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 		// Log messages from the server daemons using our singleton logger
 		DLog.setLogger(Log_.getInstance_(this));
 
-		// Connect to the last used server or a server that was supplied in the starting intent
+		// Connect to the last used server or a server that was explicitly supplied in the starting intent
 		ServerSetting lastUsed = applicationSettings.getLastUsedServer();
 		if (lastUsed == null) {
 			// No server settings yet;
@@ -230,15 +230,15 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 		}
 
 		// Set this as selection in the action bar spinner; we can use the server setting key since we have stable ids
+		// Note: skipNextOnNavigationItemSelectedCalls is used to prevent this event from triggering filterSelected
 		getSupportActionBar().setSelectedNavigationItem(lastUsed.getOrder() + 1);
-		skipNextOnNavigationItemSelectedCall = true;
+		filterSelected(lastUsed, true);
 
 		// Handle any start up intents
 		if (startTorrent != null) {
 			openDetails(startTorrent);
 			startTorrent = null;
 		} else if (firstStart && getIntent() != null) {
-			currentConnection = lastUsed.createServerAdapter(connectivityHelper.getConnectedNetworkName());
 			handleStartIntent();
 		}
 
@@ -258,10 +258,14 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 		if (lastUsed == null) {
 			// Still no settings
 			updateFragmentVisibility(false);
+			// There is a server know (now): forcefully select it to establish a connection
+			filterSelected(lastUsed, true);
 			return;
 		}
-		// There is a server know (now): forcefully select it to establish a connection
-		filterSelected(lastUsed, true);
+		
+		// If we had no connection before, establish it now
+		if (currentConnection == null)
+			filterSelected(lastUsed, true);
 	}
 
 	@Override
@@ -335,8 +339,8 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 	 */
 	@Override
 	public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-		if (skipNextOnNavigationItemSelectedCall) {
-			skipNextOnNavigationItemSelectedCall = false;
+		if (skipNextOnNavigationItemSelectedCalls > 0) {
+			skipNextOnNavigationItemSelectedCalls--;
 			return false;
 		}
 		Object item = navigationSpinnerAdapter.getItem(itemPosition);
@@ -354,7 +358,9 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 		@Override
 		public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 			filtersList.setItemChecked(position, true);
-			filterSelected((SimpleListItem) filtersList.getAdapter().getItem(position), false);
+			Object item = filtersList.getAdapter().getItem(position);
+			if (item instanceof SimpleListItem)
+				filterSelected((SimpleListItem) item, false);
 		}
 	};
 
@@ -425,6 +431,12 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 		}
 		supportInvalidateOptionsMenu();
 	}
+	
+	@Override
+	protected void onNewIntent(Intent intent) {
+		setIntent(intent);
+		handleStartIntent();
+	}
 
 	/**
 	 * If required, add torrents, switch to a specific server, etc.
diff --git a/core/src/org/transdroid/core/gui/TorrentsFragment.java b/core/src/org/transdroid/core/gui/TorrentsFragment.java
index e37e01de..de78df42 100644
--- a/core/src/org/transdroid/core/gui/TorrentsFragment.java
+++ b/core/src/org/transdroid/core/gui/TorrentsFragment.java
@@ -343,6 +343,11 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 		this.hasAConnection = hasAConnection;
 		this.daemonType = daemonType;
 		if (!hasAConnection) {
+			torrentsList.setVisibility(View.GONE);
+			emptyText.setVisibility(View.GONE);
+			loadingProgress.setVisibility(View.GONE);
+			errorText.setVisibility(View.GONE);
+			nosettingsText.setVisibility(View.VISIBLE);
 			clear(true, true); // Indirectly also calls updateViewVisibility()
 		} else {
 			updateViewVisibility();
@@ -381,11 +386,6 @@ public class TorrentsFragment extends SherlockFragment implements OnLabelPickedL
 
 	private void updateViewVisibility() {
 		if (!hasAConnection) {
-			torrentsList.setVisibility(View.GONE);
-			emptyText.setVisibility(View.GONE);
-			loadingProgress.setVisibility(View.GONE);
-			errorText.setVisibility(View.GONE);
-			nosettingsText.setVisibility(View.VISIBLE);
 			return;
 		}
 		boolean isEmpty = torrents == null || torrentsList.getAdapter().isEmpty();
diff --git a/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java b/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java
index f9c573d6..6a92b40b 100644
--- a/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java
+++ b/core/src/org/transdroid/core/gui/rss/RssitemsFragment.java
@@ -26,6 +26,7 @@ import org.androidannotations.annotations.InstanceState;
 import org.androidannotations.annotations.ItemClick;
 import org.androidannotations.annotations.ViewById;
 import org.transdroid.core.R;
+import org.transdroid.core.gui.TorrentsActivity_;
 import org.transdroid.core.gui.navigation.SelectionManagerMode;
 import org.transdroid.core.rssparser.Channel;
 import org.transdroid.core.rssparser.Item;
@@ -99,7 +100,9 @@ public class RssitemsFragment extends SherlockFragment {
 
 	@ItemClick(resName = "rssitems_list")
 	protected void onItemClicked(Item item) {
-		Intent i = new Intent(Intent.ACTION_VIEW, item.getTheLinkUri());
+		// Don't broadcast this intent; we can safely assume this is intended for Transdroid only
+		Intent i = TorrentsActivity_.intent(getActivity()).get();
+		i.setData(item.getTheLinkUri());
 		i.putExtra("TORRENT_TITLE", item.getTitle());
 		startActivity(i);
 	}
diff --git a/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java b/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java
index a1446e79..50383e7f 100644
--- a/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java
+++ b/core/src/org/transdroid/core/gui/search/SearchResultsFragment.java
@@ -33,6 +33,7 @@ import org.transdroid.core.app.search.SearchHelper.SearchSortOrder;
 import org.transdroid.core.app.search.SearchResult;
 import org.transdroid.core.app.search.SearchSite;
 import org.transdroid.core.app.settings.SystemSettings_;
+import org.transdroid.core.gui.TorrentsActivity_;
 import org.transdroid.core.gui.navigation.NavigationHelper_;
 import org.transdroid.core.gui.navigation.SelectionManagerMode;
 
@@ -121,7 +122,9 @@ public class SearchResultsFragment extends SherlockFragment {
 
 	@ItemClick(resName = "searchresults_list")
 	protected void onItemClicked(SearchResult item) {
-		Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse(item.getTorrentUrl()));
+		// Don't broadcast this intent; we can safely assume this is intended for Transdroid only
+		Intent i = TorrentsActivity_.intent(getActivity()).get();
+		i.setData(Uri.parse(item.getTorrentUrl()));
 		i.putExtra("TORRENT_TITLE", item.getName());
 		startActivity(i);
 	}
diff --git a/full/AndroidManifest.xml b/full/AndroidManifest.xml
index 83439e1e..a777240f 100644
--- a/full/AndroidManifest.xml
+++ b/full/AndroidManifest.xml
@@ -53,6 +53,7 @@
 		<activity
 			android:name="org.transdroid.core.gui.TorrentsActivity_"
 			android:allowTaskReparenting="true"
+			android:launchMode="singleTop"
 			android:label="@string/app_name"
 			android:theme="@style/TransdroidTheme"
 			android:uiOptions="splitActionBarWhenNarrow" >
@@ -227,6 +228,7 @@
 		<activity
 			android:name="org.transdroid.core.gui.rss.RssfeedsActivity_"
 			android:label="@string/rss_feeds"
+			android:launchMode="singleTop"
 			android:theme="@style/TransdroidTheme" />
 		<activity
 			android:name="org.transdroid.core.gui.rss.RssitemsActivity_"

From 2aef2f0f789f2afc5337f53fbad9b390c88ef136 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Fri, 11 Oct 2013 17:28:00 +0200
Subject: [PATCH 4/4] Fixed #17 so that the list view rows show a proper
 selection (activation) background colour.

---
 .../activatable_background_transdroid.xml     |  26 +++++
 .../activatable_background_transdroid2.xml    |  26 +++++
 core/res/layout/fragment_details.xml          |   3 +-
 core/res/layout/fragment_filters.xml          |   2 +-
 core/res/layout/fragment_rssfeeds.xml         |   2 +-
 core/res/layout/fragment_rssitems.xml         |   2 +-
 core/res/layout/fragment_searchresults.xml    |   2 +-
 core/res/layout/fragment_torrents.xml         |   2 +-
 core/res/layout/list_item_filter.xml          |   1 +
 core/res/layout/list_item_rssfeed.xml         |   7 +-
 core/res/layout/list_item_rssitem.xml         |   2 +-
 core/res/layout/list_item_searchresult.xml    |   2 +-
 core/res/layout/list_item_searchsite.xml      |   5 +-
 core/res/layout/list_item_torrent.xml         |   2 +-
 core/res/layout/list_item_torrentfile.xml     |   2 +-
 core/res/values/attrs.xml                     |   1 +
 core/res/values/styles.xml                    |   2 +
 .../widget/CheckableRelativeLayout.java       | 105 ------------------
 .../fr/marvinlabs/widget/InertCheckBox.java   |  75 -------------
 .../transdroid/core/gui/DetailsFragment.java  |   6 +-
 .../gui/lists/TorrentFilePriorityLayout.java  |   4 +-
 .../core/gui/lists/TorrentStatusLayout.java   |   4 +-
 .../core/gui/rss/RssitemStatusLayout.java     |   4 +-
 .../core/gui/search/SearchResultView.java     |   4 +-
 24 files changed, 86 insertions(+), 205 deletions(-)
 create mode 100644 core/res/drawable/activatable_background_transdroid.xml
 create mode 100644 core/res/drawable/activatable_background_transdroid2.xml
 delete mode 100644 core/src/fr/marvinlabs/widget/CheckableRelativeLayout.java
 delete mode 100644 core/src/fr/marvinlabs/widget/InertCheckBox.java

diff --git a/core/res/drawable/activatable_background_transdroid.xml b/core/res/drawable/activatable_background_transdroid.xml
new file mode 100644
index 00000000..20757ad7
--- /dev/null
+++ b/core/res/drawable/activatable_background_transdroid.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- File created by the Android Action Bar Style Generator
+
+     Copyright (C) 2011 The Android Open Source Project
+     Copyright (C) 2012 readyState Software Ltd
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:exitFadeDuration="@android:integer/config_mediumAnimTime" >
+    <item android:state_pressed="false" android:state_focused="true" android:drawable="@drawable/list_focused_transdroid" />
+    <item android:state_pressed="true" android:drawable="@drawable/pressed_background_transdroid" />
+    <item android:state_activated="true" android:drawable="@drawable/list_focused_transdroid" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/core/res/drawable/activatable_background_transdroid2.xml b/core/res/drawable/activatable_background_transdroid2.xml
new file mode 100644
index 00000000..c6c078b0
--- /dev/null
+++ b/core/res/drawable/activatable_background_transdroid2.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- File created by the Android Action Bar Style Generator
+
+     Copyright (C) 2011 The Android Open Source Project
+     Copyright (C) 2012 readyState Software Ltd
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:exitFadeDuration="@android:integer/config_mediumAnimTime" >
+    <item android:state_pressed="false" android:state_focused="true" android:drawable="@drawable/list_focused_transdroid2" />
+    <item android:state_pressed="true" android:drawable="@drawable/pressed_background_transdroid2" />
+    <item android:state_activated="true" android:drawable="@drawable/list_focused_transdroid2" />
+    <item android:drawable="@android:color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/core/res/layout/fragment_details.xml b/core/res/layout/fragment_details.xml
index e2700c2c..96e5a962 100644
--- a/core/res/layout/fragment_details.xml
+++ b/core/res/layout/fragment_details.xml
@@ -16,6 +16,7 @@
   along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/details_container"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent" >
 
@@ -26,7 +27,7 @@
 		android:choiceMode="multipleChoiceModal"
 		android:divider="@null"
 		android:dividerHeight="0dip"
-		android:listSelector="?attr/selectable_background_transdroid"
+		android:listSelector="@null"
 		android:visibility="gone" />
 
 	<ProgressBar
diff --git a/core/res/layout/fragment_filters.xml b/core/res/layout/fragment_filters.xml
index 191fec36..7bd32786 100644
--- a/core/res/layout/fragment_filters.xml
+++ b/core/res/layout/fragment_filters.xml
@@ -24,6 +24,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:choiceMode="singleChoice"
-		android:listSelector="?attr/selectable_background_transdroid" />
+		android:listSelector="@null" />
 
 </FrameLayout>
diff --git a/core/res/layout/fragment_rssfeeds.xml b/core/res/layout/fragment_rssfeeds.xml
index 8eb1f7a4..eb64ec87 100644
--- a/core/res/layout/fragment_rssfeeds.xml
+++ b/core/res/layout/fragment_rssfeeds.xml
@@ -24,7 +24,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:choiceMode="singleChoice"
-		android:listSelector="?attr/selectable_background_transdroid"
+		android:listSelector="@null"
 		android:visibility="gone" />
 
 	<TextView
diff --git a/core/res/layout/fragment_rssitems.xml b/core/res/layout/fragment_rssitems.xml
index 4e47e972..d3e83893 100644
--- a/core/res/layout/fragment_rssitems.xml
+++ b/core/res/layout/fragment_rssitems.xml
@@ -24,7 +24,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:choiceMode="multipleChoiceModal"
-		android:listSelector="?attr/selectable_background_transdroid"
+		android:listSelector="@null"
 		android:visibility="gone" />
 
 	<TextView
diff --git a/core/res/layout/fragment_searchresults.xml b/core/res/layout/fragment_searchresults.xml
index b3d312e0..0099bef4 100644
--- a/core/res/layout/fragment_searchresults.xml
+++ b/core/res/layout/fragment_searchresults.xml
@@ -24,7 +24,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:choiceMode="multipleChoiceModal"
-		android:listSelector="?attr/selectable_background_transdroid"
+		android:listSelector="@null"
 		android:visibility="gone" />
 
 	<ProgressBar
diff --git a/core/res/layout/fragment_torrents.xml b/core/res/layout/fragment_torrents.xml
index 399e0c4d..9984d969 100644
--- a/core/res/layout/fragment_torrents.xml
+++ b/core/res/layout/fragment_torrents.xml
@@ -24,7 +24,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
 		android:choiceMode="multipleChoiceModal"
-		android:listSelector="?attr/selectable_background_transdroid"
+		android:listSelector="@null"
 		android:visibility="gone" />
 
 	<ProgressBar
diff --git a/core/res/layout/list_item_filter.xml b/core/res/layout/list_item_filter.xml
index 88455742..3053399e 100644
--- a/core/res/layout/list_item_filter.xml
+++ b/core/res/layout/list_item_filter.xml
@@ -18,6 +18,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
+	android:background="?attr/activatable_background_transdroid"
 	android:paddingBottom="@dimen/margin_half"
 	android:paddingLeft="@dimen/margin_default"
 	android:paddingRight="@dimen/margin_default"
diff --git a/core/res/layout/list_item_rssfeed.xml b/core/res/layout/list_item_rssfeed.xml
index d5e53e6d..03cb8d54 100644
--- a/core/res/layout/list_item_rssfeed.xml
+++ b/core/res/layout/list_item_rssfeed.xml
@@ -19,6 +19,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
+	android:background="?attr/activatable_background_transdroid"
 	android:orientation="horizontal"
 	android:paddingBottom="@dimen/margin_half"
 	android:paddingLeft="@dimen/margin_default"
@@ -37,8 +38,8 @@
 		android:id="@+id/name_text"
 		android:layout_width="0dip"
 		android:layout_height="wrap_content"
-		android:layout_weight="1"
 		android:layout_marginTop="1dip"
+		android:layout_weight="1"
 		android:textIsSelectable="false" />
 
 	<TextView
@@ -46,9 +47,9 @@
 		style="@style/LabelTextView"
 		android:layout_width="wrap_content"
 		android:layout_height="24dip"
+		android:gravity="center_horizontal"
 		android:minWidth="24dip"
 		android:paddingLeft="4dip"
-		android:gravity="center_horizontal"
 		android:textIsSelectable="false" />
 
 	<ProgressBar
@@ -59,4 +60,4 @@
 		android:indeterminate="true"
 		android:indeterminateOnly="true" />
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/core/res/layout/list_item_rssitem.xml b/core/res/layout/list_item_rssitem.xml
index 9d0f93df..630d6a7d 100644
--- a/core/res/layout/list_item_rssitem.xml
+++ b/core/res/layout/list_item_rssitem.xml
@@ -18,7 +18,7 @@
 <org.transdroid.core.gui.rss.RssitemStatusLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="?attr/selectable_background_transdroid"
+	android:background="?attr/activatable_background_transdroid"
 	android:paddingBottom="@dimen/margin_half"
 	android:paddingLeft="@dimen/margin_default"
 	android:paddingRight="@dimen/margin_default"
diff --git a/core/res/layout/list_item_searchresult.xml b/core/res/layout/list_item_searchresult.xml
index d9b5092f..85f572d4 100644
--- a/core/res/layout/list_item_searchresult.xml
+++ b/core/res/layout/list_item_searchresult.xml
@@ -18,7 +18,7 @@
 <org.transdroid.core.gui.rss.RssitemStatusLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="?attr/selectable_background_transdroid"
+	android:background="?attr/activatable_background_transdroid"
 	android:paddingBottom="@dimen/margin_half"
 	android:paddingLeft="@dimen/margin_default"
 	android:paddingRight="@dimen/margin_default"
diff --git a/core/res/layout/list_item_searchsite.xml b/core/res/layout/list_item_searchsite.xml
index c5931109..18bbd480 100644
--- a/core/res/layout/list_item_searchsite.xml
+++ b/core/res/layout/list_item_searchsite.xml
@@ -19,6 +19,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
+	android:background="?attr/activatable_background_transdroid"
 	android:orientation="horizontal"
 	android:paddingBottom="@dimen/margin_half"
 	android:paddingLeft="@dimen/margin_default"
@@ -37,8 +38,8 @@
 		android:id="@+id/name_text"
 		android:layout_width="0dip"
 		android:layout_height="wrap_content"
-		android:layout_weight="1"
 		android:layout_marginTop="1dip"
+		android:layout_weight="1"
 		android:textIsSelectable="false" />
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/core/res/layout/list_item_torrent.xml b/core/res/layout/list_item_torrent.xml
index 6d513ee1..def4594a 100644
--- a/core/res/layout/list_item_torrent.xml
+++ b/core/res/layout/list_item_torrent.xml
@@ -18,7 +18,7 @@
 <org.transdroid.core.gui.lists.TorrentStatusLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="?attr/selectable_background_transdroid"
+	android:background="?attr/activatable_background_transdroid"
 	android:orientation="vertical"
 	android:paddingRight="@dimen/margin_default" >
 
diff --git a/core/res/layout/list_item_torrentfile.xml b/core/res/layout/list_item_torrentfile.xml
index 7eba161b..8decf552 100644
--- a/core/res/layout/list_item_torrentfile.xml
+++ b/core/res/layout/list_item_torrentfile.xml
@@ -18,7 +18,7 @@
 <org.transdroid.core.gui.lists.TorrentFilePriorityLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="?attr/selectable_background_transdroid"
+	android:background="?attr/activatable_background_transdroid"
 	android:orientation="vertical"
 	android:paddingBottom="@dimen/margin_half"
 	android:paddingLeft="@dimen/margin_default"
diff --git a/core/res/values/attrs.xml b/core/res/values/attrs.xml
index 64c2f81e..78e1bb1e 100644
--- a/core/res/values/attrs.xml
+++ b/core/res/values/attrs.xml
@@ -44,6 +44,7 @@
 	<attr name="ic_action_website" format="reference"/>
 	<attr name="ic_action_done" format="reference"/>
 	<attr name="loading_progress" format="reference"/>
+	<attr name="activatable_background_transdroid" format="reference"/>
 	<attr name="selectable_background_transdroid" format="reference"/>
 	<attr name="text_bright" format="reference" />
 	<attr name="text_actionbar" format="reference" />
diff --git a/core/res/values/styles.xml b/core/res/values/styles.xml
index 4e0cbf9a..0a3b3561 100644
--- a/core/res/values/styles.xml
+++ b/core/res/values/styles.xml
@@ -43,6 +43,7 @@
 		<item name="ic_action_trackers">@drawable/ic_action_trackers_light</item>
 		<item name="ic_action_website">@drawable/ic_action_website_light</item>
 		<item name="loading_progress">@drawable/loading_progress_light</item>
+		<item name="activatable_background_transdroid">@drawable/activatable_background_transdroid2</item>
 		<item name="selectable_background_transdroid">@drawable/selectable_background_transdroid2</item>
 		<item name="text_bright">@color/text_bright_light</item>
 		<item name="text_actionbar">@color/text_actionbar_light</item>
@@ -75,6 +76,7 @@
 		<item name="ic_action_trackers">@drawable/ic_action_trackers_dark</item>
 		<item name="ic_action_website">@drawable/ic_action_website_dark</item>
 		<item name="loading_progress">@drawable/loading_progress_dark</item>
+		<item name="activatable_background_transdroid">@drawable/activatable_background_transdroid</item>
 		<item name="selectable_background_transdroid">@drawable/selectable_background_transdroid</item>
 		<item name="text_bright">@color/text_bright_dark</item>
 		<item name="text_actionbar">@color/text_actionbar_dark</item>
diff --git a/core/src/fr/marvinlabs/widget/CheckableRelativeLayout.java b/core/src/fr/marvinlabs/widget/CheckableRelativeLayout.java
deleted file mode 100644
index 93009032..00000000
--- a/core/src/fr/marvinlabs/widget/CheckableRelativeLayout.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/* 
- * Public Domain
- * CheckableRelativeLayout.java by marvinlabs
- * http://www.marvinlabs.com/2010/10/29/custom-listview-ability-check-items/
- */
-package fr.marvinlabs.widget;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Checkable;
-import android.widget.RelativeLayout;
-
-/**
- * Extension of a relative layout to provide a checkable behaviour
- * 
- * @author marvinlabs
- */
-public class CheckableRelativeLayout extends RelativeLayout implements Checkable {
-
-	private boolean isChecked;
-	private List<Checkable> checkableViews;
-
-	public CheckableRelativeLayout(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-		initialise(attrs);
-	}
-
-	public CheckableRelativeLayout(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		initialise(attrs);
-	}
-
-	public CheckableRelativeLayout(Context context) {
-		super(context);
-		initialise(null);
-	}
-
-	/*
-	 * @see android.widget.Checkable#isChecked()
-	 */
-	public boolean isChecked() {
-		return isChecked;
-	}
-
-	/*
-	 * @see android.widget.Checkable#setChecked(boolean)
-	 */
-	public void setChecked(boolean isChecked) {
-		this.isChecked = isChecked;
-		for (Checkable c : checkableViews) {
-			c.setChecked(isChecked);
-		}
-	}
-
-	/*
-	 * @see android.widget.Checkable#toggle()
-	 */
-	public void toggle() {
-		this.isChecked = !this.isChecked;
-		for (Checkable c : checkableViews) {
-			c.toggle();
-		}
-	}
-
-	@Override
-	protected void onFinishInflate() {
-		super.onFinishInflate();
-
-		final int childCount = this.getChildCount();
-		for (int i = 0; i < childCount; ++i) {
-			findCheckableChildren(this.getChildAt(i));
-		}
-	}
-
-	/**
-	 * Read the custom XML attributes
-	 */
-	private void initialise(AttributeSet attrs) {
-		this.isChecked = false;
-		this.checkableViews = new ArrayList<Checkable>(5);
-	}
-
-	/**
-	 * Add to our checkable list all the children of the view that implement the
-	 * interface Checkable
-	 */
-	private void findCheckableChildren(View v) {
-		if (v instanceof Checkable) {
-			this.checkableViews.add((Checkable) v);
-		}
-
-		if (v instanceof ViewGroup) {
-			final ViewGroup vg = (ViewGroup) v;
-			final int childCount = vg.getChildCount();
-			for (int i = 0; i < childCount; ++i) {
-				findCheckableChildren(vg.getChildAt(i));
-			}
-		}
-	}
-}
diff --git a/core/src/fr/marvinlabs/widget/InertCheckBox.java b/core/src/fr/marvinlabs/widget/InertCheckBox.java
deleted file mode 100644
index b2d0db4f..00000000
--- a/core/src/fr/marvinlabs/widget/InertCheckBox.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* 
- * Public Domain
- * InertCheckBox.java by marvinlabs
- * http://www.marvinlabs.com/2010/10/29/custom-listview-ability-check-items/
- */
-package fr.marvinlabs.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.widget.CheckBox;
-
-/**
- * CheckBox that does not react to any user event in order to let the container handle them.
- */
-public class InertCheckBox extends CheckBox {
-
-	// Provide the same constructors as the superclass
-	public InertCheckBox(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-	}
-
-	// Provide the same constructors as the superclass
-	public InertCheckBox(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	// Provide the same constructors as the superclass
-	public InertCheckBox(Context context) {
-		super(context);
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		// Make the checkbox not respond to any user event
-		return false;
-	}
-
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		// Make the checkbox not respond to any user event
-		return false;
-	}
-
-	@Override
-	public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) {
-		// Make the checkbox not respond to any user event
-		return false;
-	}
-
-	@Override
-	public boolean onKeyPreIme(int keyCode, KeyEvent event) {
-		// Make the checkbox not respond to any user event
-		return false;
-	}
-
-	@Override
-	public boolean onKeyShortcut(int keyCode, KeyEvent event) {
-		// Make the checkbox not respond to any user event
-		return false;
-	}
-
-	@Override
-	public boolean onKeyUp(int keyCode, KeyEvent event) {
-		// Make the checkbox not respond to any user event
-		return false;
-	}
-
-	@Override
-	public boolean onTrackballEvent(MotionEvent event) {
-		// Make the checkbox not respond to any user event
-		return false;
-	}
-}
diff --git a/core/src/org/transdroid/core/gui/DetailsFragment.java b/core/src/org/transdroid/core/gui/DetailsFragment.java
index d934e154..d38c26d2 100644
--- a/core/src/org/transdroid/core/gui/DetailsFragment.java
+++ b/core/src/org/transdroid/core/gui/DetailsFragment.java
@@ -92,6 +92,8 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 	private ServerSetting currentServerSettings = null;
 
 	// Views
+	@ViewById(resName = "details_container")
+	protected View detailsContainer;
 	@ViewById(resName = "details_list")
 	protected SherlockListView detailsList;
 	@ViewById
@@ -106,9 +108,9 @@ public class DetailsFragment extends SherlockFragment implements OnTrackersUpdat
 		// line to separate the lists visually
 		if (!NavigationHelper_.getInstance_(getActivity()).isSmallScreen()) {
 			if (SystemSettings_.getInstance_(getActivity()).useDarkTheme()) {
-				detailsList.setBackgroundResource(R.drawable.details_list_background_dark);
+				detailsContainer.setBackgroundResource(R.drawable.details_list_background_dark);
 			} else {
-				detailsList.setBackgroundResource(R.drawable.details_list_background_light);
+				detailsContainer.setBackgroundResource(R.drawable.details_list_background_light);
 			}
 		}
 
diff --git a/core/src/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java b/core/src/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java
index 480dfdaa..c53ba957 100644
--- a/core/src/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java
+++ b/core/src/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java
@@ -24,7 +24,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.AttributeSet;
-import fr.marvinlabs.widget.CheckableRelativeLayout;
+import android.widget.RelativeLayout;
 
 /**
  * A relative layout that that is checkable (to be used in a contextual action bar) and shows a coloured bar in the far
@@ -32,7 +32,7 @@ import fr.marvinlabs.widget.CheckableRelativeLayout;
  * the file isn't downloaded at all.
  * @author Eric Kok
  */
-public class TorrentFilePriorityLayout extends CheckableRelativeLayout {
+public class TorrentFilePriorityLayout extends RelativeLayout {
 
 	private final float scale = getContext().getResources().getDisplayMetrics().density;
 	private final int WIDTH = (int) (6 * scale + 0.5f);
diff --git a/core/src/org/transdroid/core/gui/lists/TorrentStatusLayout.java b/core/src/org/transdroid/core/gui/lists/TorrentStatusLayout.java
index 7b9f6954..ea2cfedd 100644
--- a/core/src/org/transdroid/core/gui/lists/TorrentStatusLayout.java
+++ b/core/src/org/transdroid/core/gui/lists/TorrentStatusLayout.java
@@ -24,7 +24,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.AttributeSet;
-import fr.marvinlabs.widget.CheckableRelativeLayout;
+import android.widget.RelativeLayout;
 
 /**
  * A relative layout that is checkable (to be used in a contextual action bar) and shows a coloured bar in the far left
@@ -32,7 +32,7 @@ import fr.marvinlabs.widget.CheckableRelativeLayout;
  * red, etc.
  * @author Eric Kok
  */
-public class TorrentStatusLayout extends CheckableRelativeLayout {
+public class TorrentStatusLayout extends RelativeLayout {
 
 	private final float scale = getContext().getResources().getDisplayMetrics().density;
 	private final int WIDTH = (int) (6 * scale + 0.5f);
diff --git a/core/src/org/transdroid/core/gui/rss/RssitemStatusLayout.java b/core/src/org/transdroid/core/gui/rss/RssitemStatusLayout.java
index 3a548f04..453cf7de 100644
--- a/core/src/org/transdroid/core/gui/rss/RssitemStatusLayout.java
+++ b/core/src/org/transdroid/core/gui/rss/RssitemStatusLayout.java
@@ -21,14 +21,14 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.util.AttributeSet;
-import fr.marvinlabs.widget.CheckableRelativeLayout;
+import android.widget.RelativeLayout;
 
 /**
  * A relative layout that that is checkable (to be used in a contextual action bar) and shows a coloured bar in the far
  * left indicating the view status, that is, if the item is new to the user or was viewed earlier.
  * @author Eric Kok
  */
-public class RssitemStatusLayout extends CheckableRelativeLayout {
+public class RssitemStatusLayout extends RelativeLayout {
 
 	private final float scale = getContext().getResources().getDisplayMetrics().density;
 	private final int WIDTH = (int) (6 * scale + 0.5f);
diff --git a/core/src/org/transdroid/core/gui/search/SearchResultView.java b/core/src/org/transdroid/core/gui/search/SearchResultView.java
index 13f0508d..6f2a2ad1 100644
--- a/core/src/org/transdroid/core/gui/search/SearchResultView.java
+++ b/core/src/org/transdroid/core/gui/search/SearchResultView.java
@@ -23,15 +23,15 @@ import org.transdroid.core.app.search.SearchResult;
 
 import android.content.Context;
 import android.text.format.DateUtils;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
-import fr.marvinlabs.widget.CheckableRelativeLayout;
 
 /**
  * View that represents a {@link SearchResult} object from an in-app search
  * @author Eric Kok
  */
 @EViewGroup(resName = "list_item_searchresult")
-public class SearchResultView extends CheckableRelativeLayout {
+public class SearchResultView extends RelativeLayout {
 
 	// Views
 	@ViewById