mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #509 from whym/compatibility

Browse source 
Keep obsolete license values to prevent crashe after upgrade
This commit is contained in:
Josephine Lim 2017-04-16 23:54:44 +10:00 • committed by GitHub
commit 15e23a5c43
3 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/Utils.java
View file

@ -214,6 +214,10 @@ public class Utils {
return "{{self|cc-by-sa-4.0}}"; return "{{self|cc-by-sa-4.0}}";
} else if (license.equals(Prefs.Licenses.CC0)) { } else if (license.equals(Prefs.Licenses.CC0)) {
return "{{self|cc-zero}}"; return "{{self|cc-zero}}";
} else if (license.equals(Prefs.Licenses.CC_BY)) {
return "{{self|cc-by-3.0}}";
} else if (license.equals(Prefs.Licenses.CC_BY_SA)) {
return "{{self|cc-by-sa-3.0}}";
} }
throw new RuntimeException("Unrecognized license value"); throw new RuntimeException("Unrecognized license value");
} }
@ -229,6 +233,10 @@ public class Utils {
return R.string.license_name_cc_by_sa_four; return R.string.license_name_cc_by_sa_four;
} else if (license.equals(Prefs.Licenses.CC0)) { } else if (license.equals(Prefs.Licenses.CC0)) {
return R.string.license_name_cc0; return R.string.license_name_cc0;
} else if (license.equals(Prefs.Licenses.CC_BY)) { // for backward compatibility to v2.1
return R.string.license_name_cc_by_3_0;
} else if (license.equals(Prefs.Licenses.CC_BY_SA)) { // for backward compatibility to v2.1
return R.string.license_name_cc_by_sa_3_0;
} }
throw new RuntimeException("Unrecognized license value"); throw new RuntimeException("Unrecognized license value");
} }

4
app/src/main/java/fr/free/nrw/commons/settings/Prefs.java
View file

@ -12,5 +12,9 @@ public class Prefs {
public static final String CC_BY_SA_4 = "CC BY-SA 4.0"; public static final String CC_BY_SA_4 = "CC BY-SA 4.0";
public static final String CC_BY_4 = "CC BY 4.0"; public static final String CC_BY_4 = "CC BY 4.0";
public static final String CC0 = "CC0"; public static final String CC0 = "CC0";
// kept for backward compatibility to v2.1
@Deprecated public static final String CC_BY = "CC BY";
@Deprecated public static final String CC_BY_SA = "CC BY-SA";
} }
} }

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

@ -19,6 +19,22 @@ public class SettingsFragment extends PreferenceFragment {
// Update spinner to show selected value as summary // Update spinner to show selected value as summary
ListPreference licensePreference = (ListPreference) findPreference(Prefs.DEFAULT_LICENSE); ListPreference licensePreference = (ListPreference) findPreference(Prefs.DEFAULT_LICENSE);
// WARNING: ORDERING NEEDS TO MATCH FOR THE LICENSE NAMES AND DISPLAY VALUES
licensePreference.setEntries(new String[]{
getString(R.string.license_name_cc0),
getString(R.string.license_name_cc_by_3_0),
getString(R.string.license_name_cc_by_4_0),
getString(R.string.license_name_cc_by_sa_3_0),
getString(R.string.license_name_cc_by_sa_4_0)
});
licensePreference.setEntryValues(new String[]{
Prefs.Licenses.CC0,
Prefs.Licenses.CC_BY_3,
Prefs.Licenses.CC_BY_4,
Prefs.Licenses.CC_BY_SA_3,
Prefs.Licenses.CC_BY_SA_4
});
licensePreference.setSummary(getString(Utils.licenseNameFor(licensePreference.getValue()))); licensePreference.setSummary(getString(Utils.licenseNameFor(licensePreference.getValue())));
licensePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { licensePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override @Override