Skip to content

Commit 32715d9

Browse files
VitalyVPinchukmisaochan
authored andcommitted
Set defaults to ON for all EXIF tags (commons-app#3068)
1 parent 31b5179 commit 32715d9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package fr.free.nrw.commons.settings;
22

33
import android.Manifest;
4-
import android.content.SharedPreferences;
54
import android.net.Uri;
65
import android.os.Bundle;
76
import android.preference.EditTextPreference;
8-
import android.preference.MultiSelectListPreference;
97
import android.preference.ListPreference;
108
import android.preference.Preference;
119
import android.preference.PreferenceFragment;
12-
import android.preference.PreferenceManager;
1310
import android.preference.SwitchPreference;
1411
import android.text.Editable;
1512
import android.text.TextWatcher;
@@ -31,6 +28,7 @@
3128
import fr.free.nrw.commons.di.ApplicationlessInjection;
3229
import fr.free.nrw.commons.kvstore.JsonKvStore;
3330
import fr.free.nrw.commons.logging.CommonsLogSender;
31+
import fr.free.nrw.commons.ui.LongTitlePreferences.LongTitleMultiSelectListPreference;
3432
import fr.free.nrw.commons.utils.PermissionUtils;
3533
import fr.free.nrw.commons.utils.ViewUtil;
3634
import fr.free.nrw.commons.upload.Language;
@@ -70,8 +68,9 @@ public void onCreate(Bundle savedInstanceState) {
7068
return true;
7169
});
7270

73-
MultiSelectListPreference multiSelectListPref = (MultiSelectListPreference) findPreference("manageExifTags");
71+
LongTitleMultiSelectListPreference multiSelectListPref = (LongTitleMultiSelectListPreference) findPreference("manageExifTags");
7472
if (multiSelectListPref != null) {
73+
defaultKvStore.putJson(Prefs.MANAGED_EXIF_TAGS, multiSelectListPref.getValues());
7574
multiSelectListPref.setOnPreferenceChangeListener((preference, newValue) -> {
7675
defaultKvStore.putJson(Prefs.MANAGED_EXIF_TAGS, newValue);
7776
return true;

app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ GPSExtractor processFileCoordinates(SimilarImageInterface similarImageInterface,
105105
*/
106106
private Set<String> getExifTagsToRedact(Context context) {
107107
Type setType = new TypeToken<Set<String>>() {}.getType();
108-
Set<String> prefManageEXIFTags = defaultKvStore.getJson(Prefs.MANAGED_EXIF_TAGS, setType);
108+
Set<String> selectedExifTags = defaultKvStore.getJson(Prefs.MANAGED_EXIF_TAGS, setType);
109109

110110
Set<String> redactTags = new HashSet<>(Arrays.asList(
111111
context.getResources().getStringArray(R.array.pref_exifTag_values)));
112-
Timber.d(redactTags.toString());
113112

114-
if (prefManageEXIFTags != null) redactTags.removeAll(prefManageEXIFTags);
113+
if (selectedExifTags != null) redactTags.removeAll(selectedExifTags);
114+
else redactTags.clear();
115115

116116
return redactTags;
117117
}

app/src/main/res/xml/preferences.xml

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
<fr.free.nrw.commons.ui.LongTitlePreferences.LongTitleMultiSelectListPreference
7171
android:entries="@array/pref_exifTag_entries"
7272
android:entryValues="@array/pref_exifTag_values"
73+
android:defaultValue="@array/pref_exifTag_values"
7374
android:key="manageExifTags"
7475
android:title="@string/manage_exif_tags"
7576
android:summary="@string/manage_exif_tags_summary"/>

0 commit comments

Comments
 (0)