diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml
index 84e2540e..c5092423 100644
--- a/core/res/values/strings.xml
+++ b/core/res/values/strings.xml
@@ -78,7 +78,8 @@
RATIO %1$s
%1$s OF %2$s PEERS
↑ %1$s
- %1$s ↓
+ ↓ %1$s
+ %1$s ↓
Downloading
Seeding
Paused
diff --git a/core/src/org/transdroid/core/gui/lists/TorrentDetailsView.java b/core/src/org/transdroid/core/gui/lists/TorrentDetailsView.java
index 8323f31d..e187c029 100644
--- a/core/src/org/transdroid/core/gui/lists/TorrentDetailsView.java
+++ b/core/src/org/transdroid/core/gui/lists/TorrentDetailsView.java
@@ -84,7 +84,7 @@ public class TorrentDetailsView extends RelativeLayout {
downloadedunitText.setText(FileSizeConverter.getSizeUnit(torrent.getDownloadedEver()).toString());
uploadedText.setText(FileSizeConverter.getSize(torrent.getUploadedEver(), false));
uploadedunitText.setText(FileSizeConverter.getSizeUnit(torrent.getUploadedEver()).toString());
- downspeedText.setText(getResources().getString(R.string.status_speed_down,
+ downspeedText.setText(getResources().getString(R.string.status_speed_down_details,
FileSizeConverter.getSize(torrent.getRateDownload()) + "/s"));
upspeedText.setText(getResources().getString(R.string.status_speed_up,
FileSizeConverter.getSize(torrent.getRateUpload()) + "/s"));
diff --git a/lib/src/org/transdroid/daemon/TorrentFilesComparator.java b/lib/src/org/transdroid/daemon/TorrentFilesComparator.java
index 4a3848d9..de6a5b09 100644
--- a/lib/src/org/transdroid/daemon/TorrentFilesComparator.java
+++ b/lib/src/org/transdroid/daemon/TorrentFilesComparator.java
@@ -28,8 +28,9 @@ import java.util.Comparator;
*/
public class TorrentFilesComparator implements Comparator {
- TorrentFilesSortBy sortBy;
- boolean reversed;
+ private TorrentFilesSortBy sortBy;
+ private boolean reversed;
+ private Comparator alphanumComparator = new AlphanumComparator();
/**
* Instantiate a torrent files comparator.
@@ -50,7 +51,7 @@ public class TorrentFilesComparator implements Comparator {
case TotalSize:
return new Long(file1.getTotalSize()).compareTo(file2.getTotalSize());
default:
- return file1.getName().toLowerCase().compareTo(file2.getName().toLowerCase());
+ return alphanumComparator.compare(file1.getName().toLowerCase(), file2.getName().toLowerCase());
}
} else {
switch (sortBy) {
@@ -59,7 +60,7 @@ public class TorrentFilesComparator implements Comparator {
case TotalSize:
return 0 - new Long(file1.getTotalSize()).compareTo(file2.getTotalSize());
default:
- return 0 - file1.getName().toLowerCase().compareTo(file2.getName().toLowerCase());
+ return 0 - alphanumComparator.compare(file1.getName().toLowerCase(), file2.getName().toLowerCase());
}
}
}
diff --git a/lib/src/org/transdroid/daemon/TorrentsComparator.java b/lib/src/org/transdroid/daemon/TorrentsComparator.java
index 59aa0ffe..b2ccc812 100644
--- a/lib/src/org/transdroid/daemon/TorrentsComparator.java
+++ b/lib/src/org/transdroid/daemon/TorrentsComparator.java
@@ -67,7 +67,7 @@ public class TorrentsComparator implements Comparator {
case Ratio:
return new Double(tor1.getRatio()).compareTo(new Double(tor2.getRatio()));
default:
- return alphanumComparator.compare(tor1.getName(), tor2.getName());
+ return alphanumComparator.compare(tor1.getName().toLowerCase(), tor2.getName().toLowerCase());
}
} else {
switch (sortBy) {
@@ -82,7 +82,7 @@ public class TorrentsComparator implements Comparator {
case Ratio:
return 0 - new Double(tor1.getRatio()).compareTo(new Double(tor2.getRatio()));
default:
- return 0 - alphanumComparator.compare(tor1.getName(), tor2.getName());
+ return 0 - alphanumComparator.compare(tor1.getName().toLowerCase(), tor2.getName().toLowerCase());
}
}
}