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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-04-12 14:27:24 +02:00
commit 30479e7107
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -23,6 +23,7 @@ import android.support.v7.app.AlertDialog;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.Toast;
import net.osmand.IProgress;
import net.osmand.IndexConstants;
import net.osmand.osm.io.NetworkUtils;
@ -334,7 +335,12 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
private void showAppDirDialogV19() {
AlertDialog.Builder bld = new AlertDialog.Builder(this);
ChooseAppDirFragment frg = new DashChooseAppDirFragment.ChooseAppDirFragment(this, (Dialog) null);
ChooseAppDirFragment frg = new DashChooseAppDirFragment.ChooseAppDirFragment(this, (Dialog) null) {
@Override
protected void successCallback() {
updateApplicationDirTextAndSummary();
}
};
bld.setView(frg.initView(getLayoutInflater(), null, null));
AlertDialog dlg = bld.show();
frg.setDialog(dlg);

4
OsmAnd/src/net/osmand/plus/dashboard/DashChooseAppDirFragment.java
View file

@ -316,6 +316,7 @@ public class DashChooseAppDirFragment {
boolean changed = !currentAppFile.getAbsolutePath().equals(selectedFile.getAbsolutePath());
getMyApplication().setExternalStorageDirectory(type, selectedFile.getAbsolutePath());
if (changed) {
successCallback();
reloadData();
}
if (fragment != null && activity instanceof FragmentActivity) {
@ -333,6 +334,9 @@ public class DashChooseAppDirFragment {
};
}
// To be implemented by subclass
protected void successCallback() {}
protected void reloadData() {
new ReloadData(activity, getMyApplication()).execute((Void) null);
}