More bug fixes.

New 1.1.2 release.

android/AndroidManifest.xml

@@ -18,8 +18,8 @@
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid"
-	android:versionName="1.1.1" 
-	android:versionCode="141"
+	android:versionName="1.1.12" 
+	android:versionCode="142"
 	android:installLocation="auto">
 	
 	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="13" />

android/res/layout-xlarge-v11/part_actionbar_progressitem.xml

@@ -8,6 +8,7 @@
 		android:id="@+id/progress"
 		android:layout_width="20dip"
 		android:layout_height="20dip"
+		android:paddingTop="2dip"
 		android:layout_marginLeft="22dip"
 		android:layout_marginRight="2dip"
 		android:layout_gravity="center_vertical"
@@ -22,8 +23,7 @@
 		android:layout_gravity="center_vertical"
 		android:layout_marginLeft="12dip"
 		android:layout_marginRight="17dip"
-		android:layout_marginTop="1dip"
-		android:layout_marginBottom="1dip"
+		android:paddingTop="2dip"
 		android:text="@string/refresh" 
 		style="@android:style/TextAppearance.Medium" />
 		<!--android:textColor="@color/TitleTextColor" />-->

android/res/layout/dialog_about.xml

@@ -2,11 +2,12 @@
 <ScrollView 
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent" 
-	android:layout_height="fill_parent">
+	android:layout_height="fill_parent"
+	android:fillViewport="true">
 	
 	<LinearLayout 
 		android:layout_width="fill_parent" 
-		android:layout_height="fill_parent"
+		android:layout_height="wrap_content"
 		android:orientation="vertical">
 		
 		<ImageView  

android/res/layout/list_item_rssfeed.xml

@@ -11,7 +11,6 @@
 			android:id="@+id/feed_name" 
 			android:layout_width="wrap_content" 
 			android:layout_height="wrap_content"
-			android:text="test"
             android:singleLine="true"
 			style="@style/SearchNameText" />
 		<ProgressBar

android/res/layout/part_controlbar.xml

@@ -29,7 +29,7 @@
 	<TextView 
 		android:id="@+id/taskmessage" 
 		android:layout_width="wrap_content" 
-		android:layout_height="47dip"
+		android:layout_height="46dip"
 		android:layout_gravity="center_vertical"
 		android:layout_margin="2dip"
 		android:layout_marginRight="4dip"

android/res/values-sk/strings.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<string-array name="pref_sort_types">
-<item></item>
-<item></item>
-</string-array>
-
-<string-array name="pref_uirefresh_types">
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-</string-array>
-
-<string-array name="pref_alarminterval_types">
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-</string-array>
-
-<string-array name="pref_widget_types">
-<item></item>
-<item></item>
-<item></item>
-<item></item>
-</string-array>
-</resources>

android/res/values/attrs.xml

@@ -4,12 +4,4 @@
 		<attr name="progress" format="integer" />
 		<attr name="isActive" format="boolean" />
 	</declare-styleable>
-	
-	<declare-styleable name="com.admob.android.ads.AdView">
-		<attr name="backgroundColor" format="color" />
-		<attr name="primaryTextColor" format="color" />
-		<attr name="secondaryTextColor" format="color" />
-		<attr name="keywords" format="string" />
-		<attr name="refreshInterval" format="integer" />
-	</declare-styleable>
 </resources>

android/src/org/transdroid/gui/DetailsFragment.java

@@ -98,7 +98,7 @@ public class DetailsFragment extends Fragment implements IDaemonCallback, OnSele
 	TorrentFilesSortBy sortSetting = TorrentFilesSortBy.Alphanumeric;
 	boolean sortReversed = false;
 
-	private TorrentsFragment torrentsFragment;
+	private final TorrentsFragment torrentsFragment;
 	private final int daemonNumber;
 	private Torrent torrent;
 	private TorrentDetails fineDetails = null;
@@ -109,6 +109,14 @@ public class DetailsFragment extends Fragment implements IDaemonCallback, OnSele
 	private LinearLayout prioBar;
 	private Button prioOff, prioLow, prioNormal, prioHigh;
 
+	/**
+	 * Public empty constructor for use with fragment retainment (setRetainInstance(true);)
+	 */
+	public DetailsFragment() {
+		this.torrentsFragment  = null;
+		this.daemonNumber = -1;
+	}
+	
 	public DetailsFragment(TorrentsFragment torrentsFragment, int daemonNumber, Torrent torrent, String[] existingLabels) {
 		this.torrentsFragment  = torrentsFragment;
 		this.daemonNumber = daemonNumber;

android/src/org/transdroid/gui/TorrentsFragment.java

@@ -966,7 +966,7 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 			break;
 
 		}
-		return true;
+		return super.onOptionsItemSelected(item);
 	}
 
 	private OnItemClickListener onTorrentClicked = new OnItemClickListener() {
@@ -1420,14 +1420,18 @@ public class TorrentsFragment extends Fragment implements IDaemonCallback, OnTou
 
 		if (daemon == null) {
 			// No connection possible yet: give message
-			Toast.makeText(getActivity(), R.string.no_settings_short, Toast.LENGTH_SHORT).show();
+			if (getActivity() != null) {
+				Toast.makeText(getActivity(), R.string.no_settings_short, Toast.LENGTH_SHORT).show();
+			}
 			return;
 		}
 		
 		if (!Daemon.supportsAddByFile(daemon.getType())) {
 			// The daemon type does not support .torrent file uploads/metadata sending or this is not yet implemented
-			Toast.makeText(getActivity(), R.string.no_file_uploads, Toast.LENGTH_LONG).show();
-			return;	
+			if (getActivity() != null) {
+				Toast.makeText(getActivity(), R.string.no_file_uploads, Toast.LENGTH_LONG).show();
+			}
+			return;
 		}
 		
 		queue.enqueue(AddByFileTask.create(daemon, fileUri));

android/src/org/transdroid/preferences/PreferencesRssFeed.java

@@ -22,13 +22,12 @@ import org.transdroid.R;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
-import android.preference.Preference.OnPreferenceChangeListener;
 import android.text.InputType;
 import android.view.View;
 import android.widget.ListView;
-import android.widget.Toast;
 
 public class PreferencesRssFeed extends PreferenceActivity {