Merge branch 'master' into dev to merge pull requests accepted in mas…

…ter.
erickok · Dec 18, 2013 · 5aa1d8d · 5aa1d8d
2 parents 0274234 + ce982a3
commit 5aa1d8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java
@@ -214,7 +214,9 @@ protected void init() {
 			navigationSpinnerAdapter.updateLabels(new ArrayList<Label>());
 		}
 		// Now that all items (or at least their adapters) have been added
-		currentFilter = StatusType.getShowAllType(this);
+		if (currentFilter == null) {
+			currentFilter = StatusType.getShowAllType(this);
+		}
 		getSupportActionBar().setListNavigationCallbacks(navigationSpinnerAdapter, this);
 
 		// Log messages from the server daemons using our singleton logger

diff --git a/lib/build.xml b/lib/build.xml
@@ -15,10 +15,12 @@
   </target>
 
   <target name="transdroid.jar" depends="check-android-exists" >
+    <mkdir dir="build/" />
     <javac
 	srcdir="src/"
 	destdir="build/"
 	bootclasspath="${sdk-location}/platforms/${android.version}/android.jar"
+	target="6"
 	/>
     <jar
 	destfile="../core/libs/transdroid.jar"