aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChumva <faiver.unknown@gmail.com>2019-10-23 09:26:16 +0300
committerChumva <faiver.unknown@gmail.com>2019-10-23 09:26:16 +0300
commit2b4f56da488471e168e4dea62152879d72c6ffe7 (patch)
tree81b5b2325682e9daed8f480ea8abaa606859c3b2
parent50b486405d27bfcdc0ff8599a37206496a939287 (diff)
parent52d5627e1526fb6e4c2e5083942df45b090e2c17 (diff)
downloadOsmand-2b4f56da488471e168e4dea62152879d72c6ffe7.tar.gz
Merge branch 'master' of ssh://github.com/osmandapp/Osmand into general_preferences_fixes
-rw-r--r--OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java b/OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java
index 31831e3794..802db74758 100644
--- a/OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java
@@ -500,6 +500,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
private long copiedSize;
private int failedCount;
private long failedSize;
+ private String exceptionMessage;
public MoveFilesToDifferentDirectory(OsmandActionBarActivity activity, File from, File to) {
this.activity = new WeakReference<>(activity);
@@ -561,7 +562,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
if (result.booleanValue() && runOnSuccess != null) {
runOnSuccess.run();
} else if (!result.booleanValue()) {
- Toast.makeText(ctx, R.string.shared_string_io_error, Toast.LENGTH_LONG).show();
+ Toast.makeText(ctx, ctx.getString(R.string.shared_string_io_error) + ": " + exceptionMessage, Toast.LENGTH_LONG).show();
}
}
try {
@@ -633,6 +634,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
try {
movingFiles(from, to, 0);
} catch (IOException e) {
+ exceptionMessage = e.getMessage();
return false;
}
return true;