Browse Source

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

pull/90/head v2.1.2
Eric Kok 11 years ago
parent
commit
5aa1d8d4f2
  1. 4
      core/src/org/transdroid/core/gui/TorrentsActivity.java
  2. 2
      lib/build.xml

4
core/src/org/transdroid/core/gui/TorrentsActivity.java

@ -214,7 +214,9 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi @@ -214,7 +214,9 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
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

2
lib/build.xml

@ -15,10 +15,12 @@ @@ -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"

Loading…
Cancel
Save