diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java index f4e17543e..38749d559 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java @@ -74,8 +74,8 @@ public class UploadModel { FileProcessor fileProcessor) { this.licenses = licenses; this.prefs = prefs; + this.license = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); this.bitmapRegionDecoderWrapper = bitmapRegionDecoderWrapper; - this.license = Prefs.Licenses.CC_BY_SA_3; this.licensesByName = licensesByName; this.context = context; this.mwApi = mwApi; diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 781c158bd..c66ce21bd 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -1,6 +1,7 @@ package fr.free.nrw.commons.upload; import android.annotation.SuppressLint; +import android.content.SharedPreferences; import android.net.Uri; import android.util.Log; @@ -10,12 +11,14 @@ import java.util.Collections; import java.util.List; import javax.inject.Inject; +import javax.inject.Named; import javax.inject.Singleton; import fr.free.nrw.commons.R; import fr.free.nrw.commons.category.CategoriesModel; import fr.free.nrw.commons.contributions.Contribution; import fr.free.nrw.commons.mwapi.MediaWikiApi; +import fr.free.nrw.commons.settings.Prefs; import fr.free.nrw.commons.utils.ImageUtils; import io.reactivex.Completable; import io.reactivex.Observable; @@ -50,6 +53,7 @@ public class UploadPresenter { @UploadView.UploadPage private int currentPage = UploadView.PLEASE_WAIT; + @Inject @Named("default_preferences")SharedPreferences prefs; @Inject UploadPresenter(UploadModel uploadModel, @@ -355,7 +359,7 @@ public class UploadPresenter { * Sets the list of licences and the default license. */ private void updateLicenses() { - String selectedLicense = uploadModel.getSelectedLicense(); + String selectedLicense = prefs.getString(Prefs.DEFAULT_LICENSE, Prefs.Licenses.CC_BY_SA_3); view.updateLicenses(uploadModel.getLicenses(), selectedLicense); view.updateLicenseSummary(selectedLicense, uploadModel.getCount()); }