diff --git a/core/res/menu/activity_torrents.xml b/core/res/menu/activity_torrents.xml
index a596e1ec..3e7d2c81 100644
--- a/core/res/menu/activity_torrents.xml
+++ b/core/res/menu/activity_torrents.xml
@@ -69,9 +69,11 @@
+
+
- Status
Date done
Date added
+ Percent downloaded
Download speed
Upload speed
Ratio
+ Size
Filter list
Settings
Help
diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java
index 3d6bd178..ba2a3924 100644
--- a/core/src/org/transdroid/core/gui/TorrentsActivity.java
+++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java
@@ -796,6 +796,11 @@ public class TorrentsActivity extends Activity implements OnNavigationListener,
fragmentTorrents.sortBy(TorrentsSortBy.DateAdded);
}
+ @OptionsItem(resName = "action_sort_percent")
+ protected void sortByPercent() {
+ fragmentTorrents.sortBy(TorrentsSortBy.Percent);
+ }
+
@OptionsItem(resName = "action_sort_downspeed")
protected void sortByDownspeed() {
fragmentTorrents.sortBy(TorrentsSortBy.DownloadSpeed);
@@ -811,6 +816,11 @@ public class TorrentsActivity extends Activity implements OnNavigationListener,
fragmentTorrents.sortBy(TorrentsSortBy.Ratio);
}
+ @OptionsItem(resName = "action_sort_size")
+ protected void sortBySize() {
+ fragmentTorrents.sortBy(TorrentsSortBy.Size);
+ }
+
@OptionsItem(resName = "action_filter")
protected void startFilterEntryDialog() {
FilterEntryDialog.startFilterEntry(this);
diff --git a/lib/src/org/transdroid/daemon/TorrentsComparator.java b/lib/src/org/transdroid/daemon/TorrentsComparator.java
index 64ea5bd6..c1682158 100644
--- a/lib/src/org/transdroid/daemon/TorrentsComparator.java
+++ b/lib/src/org/transdroid/daemon/TorrentsComparator.java
@@ -66,12 +66,16 @@ public class TorrentsComparator implements Comparator {
return tor1.getDateAdded().compareTo(tor2.getDateAdded());
case DateDone:
return tor1.getDateDone().compareTo(tor2.getDateDone());
+ case Percent:
+ return new Float(tor1.getDownloadedPercentage()).compareTo(new Float(tor2.getDownloadedPercentage()));
case DownloadSpeed:
return new Integer(tor1.getRateDownload()).compareTo(new Integer(tor2.getRateDownload()));
case UploadSpeed:
return new Integer(tor1.getRateUpload()).compareTo(new Integer(tor2.getRateUpload()));
case Ratio:
return new Double(tor1.getRatio()).compareTo(new Double(tor2.getRatio()));
+ case Size:
+ return new Double(tor1.getTotalSize()).compareTo(new Double(tor2.getTotalSize()));
default:
return alphanumComparator.compare(tor1.getName().toLowerCase(), tor2.getName().toLowerCase());
}
@@ -87,12 +91,16 @@ public class TorrentsComparator implements Comparator {
return 0 - tor1.getDateAdded().compareTo(tor2.getDateAdded());
case DateDone:
return 0 - tor1.getDateDone().compareTo(tor2.getDateDone());
+ case Percent:
+ return 0 - (new Float(tor1.getDownloadedPercentage()).compareTo(new Float(tor2.getDownloadedPercentage())));
case DownloadSpeed:
return 0 - (new Integer(tor1.getRateDownload()).compareTo(new Integer(tor2.getRateDownload())));
case UploadSpeed:
return 0 - (new Integer(tor1.getRateUpload()).compareTo(new Integer(tor2.getRateUpload())));
case Ratio:
return 0 - new Double(tor1.getRatio()).compareTo(new Double(tor2.getRatio()));
+ case Size:
+ return 0 - new Double(tor1.getTotalSize()).compareTo(new Double(tor2.getTotalSize()));
default:
return 0 - alphanumComparator.compare(tor1.getName().toLowerCase(), tor2.getName().toLowerCase());
}
diff --git a/lib/src/org/transdroid/daemon/TorrentsSortBy.java b/lib/src/org/transdroid/daemon/TorrentsSortBy.java
index c4d9a7a0..91e40d46 100644
--- a/lib/src/org/transdroid/daemon/TorrentsSortBy.java
+++ b/lib/src/org/transdroid/daemon/TorrentsSortBy.java
@@ -28,7 +28,9 @@ public enum TorrentsSortBy {
DateAdded (4),
UploadSpeed (5),
Ratio (6),
- DownloadSpeed (7);
+ DownloadSpeed (7),
+ Percent (8),
+ Size (9);
private int code;
private static final Map lookup = new HashMap();