From 3926b2165dab6adacb2b64fcdb673c472eb7105d Mon Sep 17 00:00:00 2001 From: veyndan Date: Fri, 31 Mar 2017 03:59:25 +0100 Subject: [PATCH 1/2] Don't have default values when obtaining item from spinner --- .../fr/free/nrw/commons/upload/SingleUploadFragment.java | 6 ++++-- .../java/fr/free/nrw/commons/upload/UploadController.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index 7b4c4631e..97742796f 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -101,7 +101,7 @@ public class SingleUploadFragment extends Fragment { licenseItems.add(getString(R.string.license_name_cc_by_sa_four)); prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); - license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); + license = prefs.getString(Prefs.DEFAULT_LICENSE, null); Log.d("Single Upload fragment", license); @@ -152,7 +152,7 @@ public class SingleUploadFragment extends Fragment { selectedText.setBackgroundColor(Color.TRANSPARENT); } - String license = Prefs.Licenses.CC_BY_SA_3; // default value + String license; if(getString(R.string.license_name_cc0).equals(licenseName)) { license = Prefs.Licenses.CC0; } else if(getString(R.string.license_name_cc_by).equals(licenseName)) { @@ -163,6 +163,8 @@ public class SingleUploadFragment extends Fragment { license = Prefs.Licenses.CC_BY_4; } else if(getString(R.string.license_name_cc_by_sa_four).equals(licenseName)) { license = Prefs.Licenses.CC_BY_SA_4; + } else { + throw new IllegalStateException("Unknown licenseName: " + licenseName); } setLicenseSummary(license); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index daa68f989..5b10e29ef 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -93,7 +93,7 @@ public class UploadController { contribution.setDescription(""); } - String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); + String license = prefs.getString(Prefs.DEFAULT_LICENSE, null); contribution.setLicense(license); //FIXME: Add permission request here. Only executeAsyncTask if permission has been granted From d20bc5f1ce538530438ab04a552c2a3b8758f833 Mon Sep 17 00:00:00 2001 From: veyndan Date: Sat, 1 Apr 2017 21:38:17 +0100 Subject: [PATCH 2/2] Revert ommitting default value from Prefs.DEFAULT_LICENSE --- .../java/fr/free/nrw/commons/upload/SingleUploadFragment.java | 2 +- .../main/java/fr/free/nrw/commons/upload/UploadController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java index 97742796f..6a07ba107 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java @@ -101,7 +101,7 @@ public class SingleUploadFragment extends Fragment { licenseItems.add(getString(R.string.license_name_cc_by_sa_four)); prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); - license = prefs.getString(Prefs.DEFAULT_LICENSE, null); + license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); Log.d("Single Upload fragment", license); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 5b10e29ef..daa68f989 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -93,7 +93,7 @@ public class UploadController { contribution.setDescription(""); } - String license = prefs.getString(Prefs.DEFAULT_LICENSE, null); + String license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); contribution.setLicense(license); //FIXME: Add permission request here. Only executeAsyncTask if permission has been granted