Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand into general_preferences_fixes

Browse source
This commit is contained in:
Chumva 2019-10-23 09:26:16 +03:00
commit 2b4f56da48
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/settings/DataStorageFragment.java
View file

@ -500,6 +500,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
private long copiedSize; private long copiedSize;
private int failedCount; private int failedCount;
private long failedSize; private long failedSize;
private String exceptionMessage;
public MoveFilesToDifferentDirectory(OsmandActionBarActivity activity, File from, File to) { public MoveFilesToDifferentDirectory(OsmandActionBarActivity activity, File from, File to) {
this.activity = new WeakReference<>(activity); this.activity = new WeakReference<>(activity);
@ -561,7 +562,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
if (result.booleanValue() && runOnSuccess != null) { if (result.booleanValue() && runOnSuccess != null) {
runOnSuccess.run(); runOnSuccess.run();
} else if (!result.booleanValue()) { } 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 { try {
@ -633,6 +634,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto
try { try {
movingFiles(from, to, 0); movingFiles(from, to, 0);
} catch (IOException e) { } catch (IOException e) {
exceptionMessage = e.getMessage();
return false; return false;
} }
return true; return true;