Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Map picker workaround for private folder #440

Merged
merged 1 commit into from
Jun 12, 2023
Merged

Map picker workaround for private folder #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/menion/android/whereyougo/maps/mapsforge/filepicker/FilePicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ public class FilePicker extends Activity implements AdapterView.OnItemClickListe
*/
public static final String SELECTED_FILE = "selectedFile";

private static final String CURRENT_DIRECTORY = "currentDirectory";
public static final String CURRENT_DIRECTORY = "currentDirectory";
private static final String DEFAULT_DIRECTORY = "/";
private static final int DIALOG_FILE_INVALID = 0;
private static final int DIALOG_FILE_SELECT = 1;
private static final String PREFERENCES_FILE = "FilePicker";
public static final String PREFERENCES_FILE = "FilePicker";
private static Comparator<File> fileComparator = getDefaultFileComparator();
private static FileFilter fileDisplayFilter;
private static ValidFileFilter fileSelectFilter;
Expand Down
36 changes: 36 additions & 0 deletions src/main/java/menion/android/whereyougo/maps/mapsforge/preferences/EditPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@
package menion.android.whereyougo.maps.mapsforge.preferences;

import menion.android.whereyougo.R;
import menion.android.whereyougo.maps.mapsforge.filepicker.FilePicker;

import android.app.AlertDialog;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import android.view.WindowManager;
import android.widget.Toast;

/**
* Activity to edit the application preferences.
Expand All @@ -29,6 +34,37 @@ public class EditPreferences extends PreferenceActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.mapsforge_preferences);

Preference resetCurrentDirectoryPrivate = findPreference("resetCurrentDirectoryPrivate");
if (resetCurrentDirectoryPrivate != null) {
resetCurrentDirectoryPrivate.setOnPreferenceClickListener(preference -> resetCurrentDirectory(true));
}

Preference resetCurrentDirectoryRoot = findPreference("resetCurrentDirectoryRoot");
if (resetCurrentDirectoryRoot != null) {
resetCurrentDirectoryRoot.setOnPreferenceClickListener(preference -> resetCurrentDirectory(false));
}

}

private boolean resetCurrentDirectory(final boolean toPrivateFolder) {
new AlertDialog.Builder(this)
.setTitle(R.string.reset_map_settings_confirmation_title)
.setMessage(R.string.reset_map_settings_confirmation_message)
.setPositiveButton(android.R.string.ok, ((dialogInterface, i) -> {
SharedPreferences.Editor editor = getSharedPreferences(FilePicker.PREFERENCES_FILE, MODE_PRIVATE).edit();
editor.putString(FilePicker.CURRENT_DIRECTORY, toPrivateFolder ? getExternalFilesDir(null).getAbsolutePath() : "/");
editor.commit();

SharedPreferences.Editor editor2 = getSharedPreferences("MapActivity", MODE_PRIVATE).edit();
editor2.remove("mapFile");
editor2.commit();

Toast.makeText(this, R.string.reset_current_directory_info, Toast.LENGTH_SHORT).show();
}))
.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> {})
.show();
return true;
}

@Override
Expand Down
10 changes: 10 additions & 0 deletions src/main/res/values/strings_mapsforge.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,14 @@
<string name="receivemapfile_success">Mapfile set</string>
<string name="receivemapfile_error">Error setting mapfile</string>
<string name="receivemapfile_notset">No mapfile set in c:geo</string>

<!-- Reset map source (and default folder) settings -->
<string name="reset_current_directory_private_title">Reset to private</string>
<string name="reset_current_directory_private_summary">Reset current directory to private directory (use this on Android 11 or newer)</string>
<string name="reset_current_directory_root_title">Reset to root</string>
<string name="reset_current_directory_root_summary">Reset current directory to root directory (use this on Android 10 or older</string>
<string name="reset_current_directory_info">Current directory reset</string>

<string name="reset_map_settings_confirmation_title">Reset map source settings</string>
<string name="reset_map_settings_confirmation_message">This will reset your map source setting and your current map base folder.\n\nYou will need to restart WhereYouGo and select a new map source.</string>
</resources>
11 changes: 10 additions & 1 deletion src/main/res/xml/mapsforge_preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,14 @@
android:key="highlightWaterTiles"
android:summary="@string/preferences_show_water_tiles_desc"
android:title="@string/preferences_show_water_tiles" />
<Preference
android:key="resetCurrentDirectoryPrivate"
android:summary="@string/reset_current_directory_private_summary"
android:title="@string/reset_current_directory_private_title" />
<Preference
android:key="resetCurrentDirectoryRoot"
android:summary="@string/reset_current_directory_root_summary"
android:title="@string/reset_current_directory_root_title" />

</PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>