Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d9dabb3b4c
1 changed files with 3 additions and 2 deletions
|
@ -51,7 +51,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
|
||||||
if (downloadListIndexThread == null) {
|
if (downloadListIndexThread == null) {
|
||||||
downloadListIndexThread = new DownloadIndexesThread(this);
|
downloadListIndexThread = new DownloadIndexesThread(this);
|
||||||
}
|
}
|
||||||
prepareDownloadDirectory();
|
// prepareDownloadDirectory();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateDownloads() {
|
public void updateDownloads() {
|
||||||
|
@ -60,6 +60,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
|
||||||
} else {
|
} else {
|
||||||
downloadListIndexThread.runReloadIndexFiles();
|
downloadListIndexThread.runReloadIndexFiles();
|
||||||
}
|
}
|
||||||
|
prepareDownloadDirectory();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -221,7 +222,7 @@ public class BaseDownloadActivity extends SherlockFragmentActivity {
|
||||||
private void prepareDownloadDirectory() {
|
private void prepareDownloadDirectory() {
|
||||||
if (getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) {
|
if (getMyApplication().getResourceManager().getIndexFileNames().isEmpty()) {
|
||||||
boolean showedDialog = false;
|
boolean showedDialog = false;
|
||||||
if ((Build.VERSION.SDK_INT < OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) && settings.getExternalStorageDirectory().getAbsolutePath().isEmpty()) {
|
if (Build.VERSION.SDK_INT < OsmandSettings.VERSION_DEFAULTLOCATION_CHANGED) {
|
||||||
SuggestExternalDirectoryDialog.showDialog(this, null, null);
|
SuggestExternalDirectoryDialog.showDialog(this, null, null);
|
||||||
}
|
}
|
||||||
if (!showedDialog) {
|
if (!showedDialog) {
|
||||||
|
|
Loading…
Reference in a new issue