Browse Source

Fixes some small potential crashes when user input is incorrect.

pull/148/merge
Eric Kok 10 years ago
parent
commit
44c7de515a
  1. 10
      core/src/org/transdroid/core/app/settings/ApplicationSettings.java
  2. 5
      core/src/org/transdroid/core/gui/DetailsFragment.java

10
core/src/org/transdroid/core/app/settings/ApplicationSettings.java

@ -148,6 +148,16 @@ public class ApplicationSettings { @@ -148,6 +148,16 @@ public class ApplicationSettings {
String localPort = prefs.getString("server_localport_" + order, "");
if (localPort.equals(""))
localPort = port; // Default to the normal (non-local) port
try {
Integer.parseInt(port);
} catch (NumberFormatException e) {
port = Integer.toString(Daemon.getDefaultPortNumber(type, ssl));
}
try {
Integer.parseInt(localPort);
} catch (NumberFormatException e) {
localPort = port;
}
return new ServerSetting(order,
prefs.getString("server_name_" + order, null),

5
core/src/org/transdroid/core/gui/DetailsFragment.java

@ -444,12 +444,15 @@ public class DetailsFragment extends Fragment implements OnTrackersUpdatedListen @@ -444,12 +444,15 @@ public class DetailsFragment extends Fragment implements OnTrackersUpdatedListen
andftpStart.putExtra("local_folder", "/sdcard/Download");
for (int f = 0; f < checked.size(); f++) {
String file = checked.get(f).getRelativePath();
// If the file is directly in the root, AndFTP fails if we supply the proper path (like /file.pdf)
if (file != null) {
// If the file is directly in the root, AndFTP fails if we supply the proper path (like
// /file.pdf)
// Work around this bug by removing the leading / if no further directories are used in the path
if (file.startsWith("/") && file.indexOf("/", 1) < 0)
file = file.substring(1);
andftpStart.putExtra("remote_file" + (f + 1), file);
}
}
if (andftpStart.resolveActivity(getActivity().getPackageManager()) != null) {
startActivity(andftpStart);
mode.finish();

Loading…
Cancel
Save