From 2c376da46ea0e2de9f63f42588e84b419b0181b7 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 4 Mar 2024 13:02:19 +0100 Subject: [PATCH 1/4] Localisation updates from https://translatewiki.net. --- app/src/main/res/values-ar/strings.xml | 21 ++++++++++++++++++++- app/src/main/res/values-fi/strings.xml | 4 ++++ app/src/main/res/values-io/strings.xml | 1 + app/src/main/res/values-lb/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 4 ++++ app/src/main/res/values-se/strings.xml | 5 +++++ 6 files changed, 35 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 47c34eed6..63d006be8 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -19,6 +19,7 @@ * NancyMilad * OsamaK * Tala Ali +* أيوب * أَحمد * ترجمان05 * ديفيد @@ -130,6 +131,7 @@ الملف غير موجود. فضلا اختر ملفا آخر. تم الوصول إلى الحد الأقصى لإعادة المحاولة! يرجى إلغاء التحميل والمحاولة مرة أخرى هل تريد إيقاف تشغيل تحسين البطارية؟ + يعمل رفع أكثر من 3 صور بشكل أكثر موثوقية عند إيقاف تشغيل تحسين البطارية. يرجى إيقاف تشغيل تحسين البطارية لتطبيق كومنز من الإعدادات للحصول على تجربة تحميل سلسة. \n\nالخطوات الممكنة لإيقاف تشغيل تحسين البطارية:\n\nالخطوة 1: اضغط على زر \'الإعدادات\' أدناه.\n\nالخطوة 2: التبديل من \'غير محسّن\" إلى \'الكل التطبيقات\'.\n\nالخطوة 3: ابحث عن \'كومنز\' أو \'fr.free.nrw.commons\'.\n\nالخطوة 4: اضغط عليها وحدد \'عدم التحسين\'.\n\nالخطوة 5: اضغط على \'تم\'. فشلت المصادقة; الرجاء تسجيل الدخول مرة أخرى بدأ الرفع! تحميل في قائمة الانتظار (وضع الاتصال المحدود ممكّن) @@ -244,8 +246,11 @@ صلاحية مطلوبة: قراءة وحدة التخزين الخارجية، لا يمكن للتطبيق الوصول إلى معرض الصور الخاص بك بدونها. صلاحية مطلوبة: اكتب وحدة التخزين الخارجية، لا يمكن للتطبيق الوصول إلى معرض الصور/الكاميرا الخاصة بك بدونها. جارٍ طلب إذن الموقع + سجل الموقع للقطات داخل التطبيق + قم بتمكين هذا لتسجيل الموقع باستخدام لقطات داخل التطبيق في حالة عدم قيام كاميرا الجهاز بتسجيله موافق تحذير + عُثِرَ على اسم ملف مكرر رفع نعم لا @@ -321,6 +326,7 @@ انسخ نص الويكي إلى الكليب بورد نص الويكي تم نسخه إلى الكليب بورد قد لا تعمل الأجهزة المجاورة بشكل صحيح، الموقع غير متوفر. + رُفض الوصول إلى الموقع. يرجى ضبط موقعك يدويًا لاستخدام هذه الميزة. صلاحية مطلوبة لعرض قائمة بالأماكن القريبة الاتجاهات ويكي بيانات @@ -388,7 +394,9 @@ إجابة خاطئة هل هذه الصورة موافقة للرفع؟ شارك التطبيق + تدوير خطأ في جلب الأماكن المجاورة. + لا توجد صور في هذه المنطقة لا توجد أماكن قريبة بالجوار خطأ في جلب المعالم القريبة. لا توجد عمليات بحث حديثة @@ -468,7 +476,15 @@ ينتهي في: عرض الحملات انظر الحملات الجارية - يرجى التأكد من أن منتقي أندرويد الجديد هذا لا يزيل الموقع من صورك. + اسمح للتطبيق بجلب الموقع في حالة عدم تسجيله بالكاميرا. بعض كاميرات الأجهزة لا تسجل الموقع. في مثل هذه الحالات، فإن السماح للتطبيق بجلب الموقع وإرفاقه به يجعل مساهمتك أكثر فائدة. يمكنك تغيير هذا في أي وقت من خلال الإعدادات + السماح + رفض + يرجى تشغيل الوصول إلى الموقع من الإعدادات والمحاولة مرة أخرى. \n\nملاحظة: قد لا يكون للتحميل موقع إذا كان التطبيق غير قادر على استرداد الموقع من الجهاز خلال فترة زمنية قصيرة. + تحتاج الكاميرا داخل التطبيق إلى إذن تحديد الموقع لإرفاقها بصورك في حالة عدم توفر الموقع في EXIF. يرجى السماح للتطبيق بالوصول إلى موقعك والمحاولة مرة أخرى.\n\nملاحظة: قد لا يكون للتحميل موقع إذا كان التطبيق غير قادر على استرداد الموقع من الجهاز خلال فترة زمنية قصيرة. + لن يسجل التطبيق الموقع مع اللقطات بسبب عدم وجود إذن بالموقع + لن يسجل التطبيق الموقع مع اللقطات أثناء إيقاف تشغيل نظام تحديد المواقع (GPS). + يخاطر منتقي الصور الجديد لنظام Android بفقدان معلومات الموقع. قم بالتمكين إذا بدا أنك تستخدمه. + قد يؤدي إيقاف تشغيل هذا إلى تشغيل منتقي صور Android الجديد. ويخاطر بفقدان معلومات الموقع.\n\nاضغط على \"اقرأ المزيد\" لمزيد من المعلومات. لن ترى الحملات بعد الآن، ومع ذلك، يمكنك إعادة تمكين هذا الإشعار في الإعدادات إذا كنت ترغب. تتطلب هذه الوظيفة الاتصال بالشبكة; يُرجَى التحقق من إعدادات اتصالك. حدث خطأ أثناء معالجة الصورة. رجاءً حاول مرة أخرى! @@ -530,6 +546,7 @@ طراز العدسة الأرقام التسلسلية برمجية + رفض الوصول إلى موقع الوسائط ارفع الصور لويكيميديا ​​كومنز مباشرة من هاتفك. قم بتنزيل تطبيق كومنز الآن: %1$s مشاركة التطبيق عبر... معلومات الصورة @@ -766,4 +783,6 @@ رُفض إذن التخزين تعذر مشاركة هذا العنصر الإذن مطلوب لهذه الوظيفة + اشكر المؤلف + حدث خطأ أثناء إرسال الشكر للمؤلف. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 27e15f7cb..8f7cdc59b 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -659,4 +659,8 @@ Muokkaa kuvaa Muokkaa sijaintia Kiitä tekijää + + %d kuva valittu + %d kuvaa valittu + diff --git a/app/src/main/res/values-io/strings.xml b/app/src/main/res/values-io/strings.xml index ac7f60af4..ac9b2ff42 100644 --- a/app/src/main/res/values-io/strings.xml +++ b/app/src/main/res/values-io/strings.xml @@ -250,6 +250,7 @@ Atencez pri nur sendar imaji quin vu propra facis. Ne sendez imaji quin vu descharjis de Interreto. Sendez arkivo \'\'log\'\' Propozar efaco + Ca imajo indikesis por efaco. Videz retpagino por detali Saltar Kopiez Wiki-texto a \'clipboard\' diff --git a/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml index fa5e0373b..a76e8a349 100644 --- a/app/src/main/res/values-lb/strings.xml +++ b/app/src/main/res/values-lb/strings.xml @@ -277,6 +277,7 @@ Falsch Äntwert App deelen Dréinen + Keng Biller an dëser Géigend Nominéiere fir ze Läschen Läschen Realisatiounen diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 059d84736..4eecdf7d6 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -7,6 +7,7 @@ * MSClaudiu * Minisarm * Popetedenis +* Rapiteanu * Strainu * WebSourceContentRO --> @@ -313,6 +314,7 @@ Elemente Recomandate Încărcat de pe telefon + Hartă Imaginea adăugată la %1$s pe Wikidata! Nu s-a actualizat entitatea corespunzătoare Wikidata! Setează ca Imagine de fundal @@ -583,4 +585,6 @@ În apropiere Utilizat Rank-ul meu + Citiți mai multe + Modifică locația diff --git a/app/src/main/res/values-se/strings.xml b/app/src/main/res/values-se/strings.xml index b3b280ad6..c3ec10883 100644 --- a/app/src/main/res/values-se/strings.xml +++ b/app/src/main/res/values-se/strings.xml @@ -173,6 +173,8 @@ Šatta betageahččaleaddji Áiggutgo don duođaid čálihit olggos? Mediagovva ii lihkostuvvan + Ii oktage vuollekategoriija gávdnon + Ii oktage badjekategoriija gávdnon Gaskkalduhte Raba Gidde @@ -183,6 +185,7 @@ Čálit olggos Almmuhusat Árvvoštala + govvádus ii gávdnon Commons-fiilasiidu Wikipedia-artihkal Čálit sisa du dovddaldahkii @@ -195,6 +198,7 @@ Jorgal Gielat Gaskkalduhte + Ii oktage govva gávdnon! Beaivvi govva Oza Ohcan @@ -218,6 +222,7 @@ Vuoigŋadahkki Sadji Govvadieđut + Ii oktage kategoriija gávdnon Fiilla vurkema gaskkalduhtton Ii lihkostuvvan Logo From 28ea11127cbb3064873ec984da9a76e5c8edc821 Mon Sep 17 00:00:00 2001 From: Neel Doshi <60827173+neeldoshii@users.noreply.github.com> Date: Wed, 6 Mar 2024 20:05:50 +0530 Subject: [PATCH 2/4] Refactor : API calls moved out of the LoginActivity (#5599) * Refactor :API calls separated from activity added to LoginClient * getLoginToken() modifier set to private * Code Cleanup : removed non-null from twofactor and Locale import * Indentation fix --- .../free/nrw/commons/auth/LoginActivity.java | 105 +++++++----------- .../nrw/commons/auth/login/LoginClient.kt | 29 ++++- app/src/main/res/values-yue-hant/error.xml | 9 -- 3 files changed, 71 insertions(+), 72 deletions(-) delete mode 100644 app/src/main/res/values-yue-hant/error.xml diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java index 7bb60fbd0..1e3f99be2 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java @@ -30,9 +30,9 @@ import fr.free.nrw.commons.auth.login.LoginResult; import fr.free.nrw.commons.databinding.ActivityLoginBinding; import fr.free.nrw.commons.utils.ActivityUtils; import java.util.Locale; -import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse; import fr.free.nrw.commons.auth.login.LoginCallback; +import java.util.Objects; import javax.inject.Inject; import javax.inject.Named; @@ -46,9 +46,6 @@ import fr.free.nrw.commons.utils.ConfigUtils; import fr.free.nrw.commons.utils.SystemThemeUtils; import fr.free.nrw.commons.utils.ViewUtil; import io.reactivex.disposables.CompositeDisposable; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; import timber.log.Timber; import static android.view.KeyEvent.KEYCODE_ENTER; @@ -75,7 +72,6 @@ public class LoginActivity extends AccountAuthenticatorActivity { private AppCompatDelegate delegate; private LoginTextWatcher textWatcher = new LoginTextWatcher(); private CompositeDisposable compositeDisposable = new CompositeDisposable(); - private Call loginToken; final String saveProgressDailog="ProgressDailog_state"; final String saveErrorMessage ="errorMessage"; final String saveUsername="username"; @@ -116,7 +112,7 @@ public class LoginActivity extends AccountAuthenticatorActivity { binding.loginCredentials.setVisibility(View.GONE); } } - /** + /** * Hides the keyboard if the user's focus is not on the password (hasFocus is false). * @param view The keyboard * @param hasFocus Set to true if the keyboard has focus @@ -212,63 +208,52 @@ public class LoginActivity extends AccountAuthenticatorActivity { public void performLogin() { Timber.d("Login to start!"); - final String username = binding.loginUsername.getText().toString(); - final String rawUsername = binding.loginUsername.getText().toString().trim(); - final String password = binding.loginPassword.getText().toString(); - String twoFactorCode = binding.loginTwoFactor.getText().toString(); + final String username = Objects.requireNonNull(binding.loginUsername.getText()).toString(); + final String password = Objects.requireNonNull(binding.loginPassword.getText()).toString(); + final String twoFactorCode = Objects.requireNonNull(binding.loginTwoFactor.getText()).toString(); showLoggingProgressBar(); - doLogin(username, password, twoFactorCode); + loginClient.doLogin(username, password, twoFactorCode, Locale.getDefault().getLanguage(), + new LoginCallback() { + @Override + public void success(@NonNull LoginResult loginResult) { + runOnUiThread(()->{ + Timber.d("Login Success"); + hideProgress(); + onLoginSuccess(loginResult); + }); + } + + @Override + public void twoFactorPrompt(@NonNull Throwable caught, @Nullable String token) { + runOnUiThread(()->{ + Timber.d("Requesting 2FA prompt"); + hideProgress(); + askUserForTwoFactorAuth(); + }); + } + + @Override + public void passwordResetPrompt(@Nullable String token) { + runOnUiThread(()->{ + Timber.d("Showing password reset prompt"); + hideProgress(); + showPasswordResetPrompt(); + }); + } + + @Override + public void error(@NonNull Throwable caught) { + runOnUiThread(()->{ + Timber.e(caught); + hideProgress(); + showMessageAndCancelDialog(caught.getLocalizedMessage()); + }); + } + }); } - private void doLogin(String username, String password, String twoFactorCode) { - progressDialog.show(); - loginToken = loginClient.getLoginToken(); - loginToken.enqueue( - new Callback() { - @Override - public void onResponse(Call call, - Response response) { - loginClient.login(username, password, null, twoFactorCode, - response.body().query().loginToken(), Locale.getDefault().getLanguage(), new LoginCallback() { - @Override - public void success(@NonNull LoginResult result) { - Timber.d("Login Success"); - onLoginSuccess(result); - } - @Override - public void twoFactorPrompt(@NonNull Throwable caught, - @Nullable String token) { - Timber.d("Requesting 2FA prompt"); - hideProgress(); - askUserForTwoFactorAuth(); - } - - @Override - public void passwordResetPrompt(@Nullable String token) { - Timber.d("Showing password reset prompt"); - hideProgress(); - showPasswordResetPrompt(); - } - - @Override - public void error(@NonNull Throwable caught) { - Timber.e(caught); - hideProgress(); - showMessageAndCancelDialog(caught.getLocalizedMessage()); - } - }); - } - - @Override - public void onFailure(Call call, Throwable t) { - Timber.e(t); - showMessageAndCancelDialog(t.getLocalizedMessage()); - } - }); - - } private void hideProgress() { progressDialog.dismiss(); @@ -299,10 +284,6 @@ public class LoginActivity extends AccountAuthenticatorActivity { } private void onLoginSuccess(LoginResult loginResult) { - if (!progressDialog.isShowing()) { - // no longer attached to activity! - return; - } compositeDisposable.clear(); sessionManager.setUserLoggedIn(true); sessionManager.updateAccount(loginResult); diff --git a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt index aa24e34d7..44bb68448 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt +++ b/app/src/main/java/fr/free/nrw/commons/auth/login/LoginClient.kt @@ -28,7 +28,7 @@ class LoginClient(private val loginInterface: LoginInterface) { */ private var userLanguage = "" - fun getLoginToken() = loginInterface.getLoginToken() + private fun getLoginToken() = loginInterface.getLoginToken() fun request(userName: String, password: String, cb: LoginCallback) { cancel() @@ -106,6 +106,33 @@ class LoginClient(private val loginInterface: LoginInterface) { }) } + fun doLogin( + username: String, + password: String, + twoFactorCode: String, + userLanguage: String, + loginCallback: LoginCallback + ) { + getLoginToken().enqueue(object :Callback{ + override fun onResponse( + call: Call, + response: Response + ) = if (response.isSuccessful){ + val loginToken = response.body()?.query()?.loginToken() + loginToken?.let { + login(username, password, null, twoFactorCode, it, userLanguage, loginCallback) + } ?: run { + loginCallback.error(IOException("Failed to retrieve login token")) + } + } else { + loginCallback.error(IOException("Failed to retrieve login token")) + } + + override fun onFailure(call: Call, t: Throwable) { + loginCallback.error(t) + } + }) + } @Throws(Throwable::class) fun loginBlocking(userName: String, password: String, twoFactorCode: String?) { val tokenResponse = getLoginToken().execute() diff --git a/app/src/main/res/values-yue-hant/error.xml b/app/src/main/res/values-yue-hant/error.xml deleted file mode 100644 index 68579e4a0..000000000 --- a/app/src/main/res/values-yue-hant/error.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - 同享壞咗 - 哎呀。出咗錯！ - 多謝你！ - From b5ce7c735ddf2e1873af3d4a8b62151f0a1e78da Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 7 Mar 2024 13:02:16 +0100 Subject: [PATCH 3/4] Localisation updates from https://translatewiki.net. --- app/src/main/res/values-io/strings.xml | 27 ++++++++++++++++++++++ app/src/main/res/values-yue-hant/error.xml | 9 ++++++++ 2 files changed, 36 insertions(+) create mode 100644 app/src/main/res/values-yue-hant/error.xml diff --git a/app/src/main/res/values-io/strings.xml b/app/src/main/res/values-io/strings.xml index ac9b2ff42..e6b772438 100644 --- a/app/src/main/res/values-io/strings.xml +++ b/app/src/main/res/values-io/strings.xml @@ -192,6 +192,7 @@ Demandita permiso: Skribar en extera konservilo. La programo \'\'app\'\' ne povas acesar vua kamero/galerio sen to. Demandanta permiso pri lokizo Enrejistras la lokizo por imaji kaptita uzanta la programo (\'\'app\'\') + Kapabligez ca funciono por enrejistrar la lokizo di la fotografuri facita per \'\'app\'\', se la fotografilo qua uzesis ne enrejistris ta informo O.K. Averto Trovesis duopligita nomo di arkivo @@ -239,22 +240,33 @@ Arkivo de Wikidata Artiklo di Wikipedio Voluntez deskriptar l\'artiklo tante kam posiblaː Ube vu obtenis ol? Qual esis la kuntexto? Deskriptez objekti o personi. Skribez informi qui povos esar facile verifikata, exemple la horo di la dio, se ol esas peizajo. Se l\'imajo montros ula diferanta kozo, explikez quo esas diferanta. + Skribez kurta deskripto pri ca imajo. L\'unesma subtexto uzesos kom titulo por l\'imajo. Limito: 255 literi. + Posibla problemi kun ta imajo: L\'imajo esas multe obskura. L\'imajo esas nebuloza. L\'imajo ja existas che Commons. Ca imajo facesis en diferanta loko. + Voluntez sendar nur imaji quin vu propra facis. Ne sendez imaji quin vu trovis en Facebook, che konti di altra personi. Ka vu ankore deziras sendar l\'arkivo? Eroro pri konekto Por sendar arkivi l\'Interreto mustas esar konektata. Voluntez verifikar vua Interreto-konekto. Trovesis problemo en l\'imajo Atencez pri nur sendar imaji quin vu propra facis. Ne sendez imaji quin vu descharjis de Interreto. + Enirez en vua konto Sendez arkivo \'\'log\'\' + Eroro! URL ne trovita Propozar efaco Ca imajo indikesis por efaco. Videz retpagino por detali Saltar + Enirar + Ka vu deziras ne enirar? + Vu mustus facar \'\'log in\'\' por sendor imaji future. + Voluntez enirar por uzar ca utensilo Kopiez Wiki-texto a \'clipboard\' Wiki-texto kopiesis a \'clipboard\' + Proximeso povas ne funcionar korekte, nam Lokizo ne esas disponebla. + Aceso a lokizo ne permisita. Voluntez informar manuale vua lokizo por uzar ca resurso*. Quale arivar Wikidata Wikipedio @@ -264,8 +276,10 @@ Guidolibro por l\'uzero Saltez instrukti Interreto ne funcionas + Nula avizi trovita Tradukar Lingui + Selektez l\'idiomo quan vu deziros sendar tradukuri Durigar Nuligar Probar itere @@ -306,12 +320,22 @@ \'\'Selfie\'\'-imaji ne havas multa valoro che enciklopedio. Voluntez ne sendar imajo pri vu propra, ecepte se existas artiklo che Wikipedio pri vu. Imaji pri monumenti ed extera peizaji esas libera por sendar en la maxim multa landi. Savez ke tempal arto-instaluri facita en libera aero freque protektesas per autoroyuro. Do, li ne povas sendesar. Fotografuri de reto-pagini judikesas derivita verki, ed esas submisita a la sama autoroyuro kam la propra pagino. Ca imaji povas uzesar se l\'autoro permisas. Sen ca permiso, irga imajo quan vu kreos uzanta l\'imajo di la reto-pagino judikesas kom senlicenca kopiuro dil originala pagino. + Un ek la skopi di Commons esas asemblar imaji kun qualeso. Do, imaji nedicernebla ne devas sendesar. Probez fotografar sempre kun bona lumizo. + Fotografuri pri teknologio o kultural aspekti esas sempre bonvenanta che Commons. + Vu respondis korekte %1$s de la questioni. Gratuli! + Selektez un ek la du opcioni por respondar la questiono + Sesiono di \'\'log in\'\' finis, voluntez enirar itere. + Partigez vua quizo kun vua amiki! Durigez Korekta respondo Nekorekta respondo Ka ica skreno-kopiuro esas \'OK\' por sendar? Partigez \'\'app\'\' Rotacar + Eroro adportanta informi pri loki proxima. + Nula pikturi en ca areo + Nula loki proxima trovesis + Eroro adportanta informi pri monumenti proxima. Nula recenta serchado Ka tu fakte deziras efacar la historio-listo pri tua serchadi? Ka vu fakte deziras interuptar ca sendajo? @@ -329,6 +353,7 @@ Imaji sendita Imaji ne reversionita Imaji uzita + Partigez vua sucesi kun vua amiki! minima quanto bezonata: Quanto di imaji quin vu sendis a Commons, uzanta irga softwaro* por sendar li La procento di imaji quin vu sendis a Commons, qui ne efacesis pose @@ -342,6 +367,8 @@ Avizi Avizi (lektita) Listo + Permiso pri enmagazinigo + Etapo %1$d de %2$d: %3$s Sequanta Antea Arkivo kun la nomo %1$s ja existas. Ka vu deziras durigar?\n\nNoto: Sufixo adequata adjuntesos automatale a la nomo dil imajo. diff --git a/app/src/main/res/values-yue-hant/error.xml b/app/src/main/res/values-yue-hant/error.xml new file mode 100644 index 000000000..68579e4a0 --- /dev/null +++ b/app/src/main/res/values-yue-hant/error.xml @@ -0,0 +1,9 @@ + + + + 同享壞咗 + 哎呀。出咗錯！ + 多謝你！ + From dbe739e7559be6d8c55570a172deba1838b81084 Mon Sep 17 00:00:00 2001 From: Neel Doshi <60827173+neeldoshii@users.noreply.github.com> Date: Fri, 8 Mar 2024 19:51:27 +0530 Subject: [PATCH 4/4] CodeCleanup : Removed Unused Import from packages. (#5609) * CodeCleanup : Removed Unused Import from packages. * Removed : value-yue-hant directory. --- .../LocationPicker/LocationPickerConstants.java | 2 -- app/src/main/java/fr/free/nrw/commons/Utils.java | 4 ---- .../fr/free/nrw/commons/WelcomePagerAdapter.java | 1 - .../nrw/commons/bookmarks/BookmarksPagerAdapter.java | 1 - .../nrw/commons/category/CategoryEditHelper.java | 1 - .../contributions/ContributionController.java | 1 - .../nrw/commons/contributions/ContributionDao.java | 1 - .../contributions/ContributionsListContract.java | 1 - .../contributions/ContributionsListFragment.java | 4 ---- .../nrw/commons/di/CommonsApplicationComponent.java | 1 - .../nrw/commons/explore/map/ExploreMapContract.java | 2 -- .../nrw/commons/explore/map/ExploreMapPresenter.java | 4 ---- .../fr/free/nrw/commons/feedback/FeedbackDialog.java | 2 -- .../commons/location/LocationPermissionsHelper.java | 1 - .../free/nrw/commons/media/MediaDetailFragment.java | 4 ---- .../nrw/commons/media/MediaDetailPagerFragment.java | 3 --- .../free/nrw/commons/mwapi/OkHttpJsonApiClient.java | 1 - .../fr/free/nrw/commons/nearby/NearbyController.java | 3 --- .../NearbyFilterSearchRecyclerViewAdapter.java | 4 ---- .../main/java/fr/free/nrw/commons/nearby/Place.java | 1 - .../profile/achievements/AchievementsFragment.java | 9 --------- .../profile/leaderboard/LeaderboardListAdapter.java | 1 - .../fr/free/nrw/commons/quiz/QuizResultActivity.java | 3 --- .../fr/free/nrw/commons/review/ReviewActivity.java | 1 - .../free/nrw/commons/review/ReviewImageFragment.java | 1 - .../commons/ui/PasteSensitiveTextInputEditText.java | 2 -- .../fr/free/nrw/commons/upload/FileUtilsWrapper.java | 1 - .../fr/free/nrw/commons/upload/UploadActivity.java | 4 ---- .../free/nrw/commons/upload/UploadBaseFragment.java | 1 - .../fr/free/nrw/commons/upload/UploadController.java | 12 ------------ .../java/fr/free/nrw/commons/upload/UploadModel.java | 1 - .../commons/upload/license/MediaLicenseFragment.java | 9 --------- .../java/fr/free/nrw/commons/utils/ViewUtil.java | 2 -- .../commons/wikidata/model/page/PageProperties.java | 2 -- .../nrw/commons/wikidata/mwapi/ListUserResponse.java | 2 -- app/src/main/res/values-yue-hant/error.xml | 9 --------- 36 files changed, 102 deletions(-) delete mode 100644 app/src/main/res/values-yue-hant/error.xml diff --git a/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerConstants.java b/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerConstants.java index 0cd152fe8..eb27e496c 100644 --- a/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerConstants.java +++ b/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerConstants.java @@ -1,7 +1,5 @@ package fr.free.nrw.commons.LocationPicker; -import com.mapbox.mapboxsdk.maps.Style; - /** * Constants need for location picking */ diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java index f6cc73cb6..cd9c6eed5 100644 --- a/app/src/main/java/fr/free/nrw/commons/Utils.java +++ b/app/src/main/java/fr/free/nrw/commons/Utils.java @@ -16,7 +16,6 @@ import androidx.browser.customtabs.CustomTabColorSchemeParams; import androidx.browser.customtabs.CustomTabsIntent; import androidx.core.content.ContextCompat; -import fr.free.nrw.commons.kvstore.JsonKvStore; import java.util.Calendar; import java.util.Date; import fr.free.nrw.commons.wikidata.model.WikiSite; @@ -30,9 +29,6 @@ import fr.free.nrw.commons.settings.Prefs; import fr.free.nrw.commons.utils.ViewUtil; import timber.log.Timber; -import static android.widget.Toast.LENGTH_SHORT; -import static fr.free.nrw.commons.campaigns.CampaignView.CAMPAIGNS_DEFAULT_PREFERENCE; - public class Utils { public static PageTitle getPageTitle(@NonNull String title) { diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java index 7017c028b..8fd3fc704 100644 --- a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java @@ -1,7 +1,6 @@ package fr.free.nrw.commons; import android.net.Uri; -import android.text.Html; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java index 6ef2f1732..ea3a9a453 100644 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/BookmarksPagerAdapter.java @@ -12,7 +12,6 @@ import androidx.fragment.app.FragmentPagerAdapter; import java.util.ArrayList; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsFragment; import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesFragment; public class BookmarksPagerAdapter extends FragmentPagerAdapter { diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryEditHelper.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryEditHelper.java index a497e4882..393a8dba4 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategoryEditHelper.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryEditHelper.java @@ -5,7 +5,6 @@ import static fr.free.nrw.commons.notification.NotificationHelper.NOTIFICATION_E import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.util.Log; import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.Media; import fr.free.nrw.commons.R; diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java index 66aff1325..140c7d67d 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java @@ -2,7 +2,6 @@ package fr.free.nrw.commons.contributions; import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT; -import android.Manifest; import android.Manifest.permission; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java index e7af6bcd6..b4889b6a2 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java @@ -12,7 +12,6 @@ import androidx.room.Update; import io.reactivex.Completable; import io.reactivex.Single; import java.util.Calendar; -import java.util.Date; import java.util.List; @Dao diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java index ed671b9e5..e3ec66b73 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListContract.java @@ -1,7 +1,6 @@ package fr.free.nrw.commons.contributions; import fr.free.nrw.commons.BasePresenter; -import java.util.List; /** * The contract for Contributions list View & Presenter diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index ecc3b7fb9..fb48c3c65 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -17,15 +17,12 @@ import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.LinearLayout; -import android.widget.ProgressBar; -import android.widget.TextView; import androidx.activity.result.ActivityResultCallback; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import androidx.appcompat.widget.AppCompatTextView; import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -33,7 +30,6 @@ import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; import androidx.recyclerview.widget.RecyclerView.ItemAnimator; import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener; import androidx.recyclerview.widget.SimpleItemAnimator; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.Media; import fr.free.nrw.commons.R; diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java index 33896f768..cbbf1f0c5 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java @@ -5,7 +5,6 @@ import com.google.gson.Gson; import fr.free.nrw.commons.explore.categories.CategoriesModule; import fr.free.nrw.commons.navtab.MoreBottomSheetFragment; import fr.free.nrw.commons.navtab.MoreBottomSheetLoggedOutFragment; -import fr.free.nrw.commons.navtab.NavTabLayout; import fr.free.nrw.commons.upload.worker.UploadWorker; import javax.inject.Singleton; diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapContract.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapContract.java index 92ca2494d..b6feda208 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapContract.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapContract.java @@ -2,12 +2,10 @@ package fr.free.nrw.commons.explore.map; import android.content.Context; import com.mapbox.mapboxsdk.annotations.Marker; -import com.mapbox.mapboxsdk.camera.CameraUpdate; import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.location.LocationServiceManager; import fr.free.nrw.commons.nearby.NearbyBaseMarker; -import fr.free.nrw.commons.nearby.Place; import java.util.List; public class ExploreMapContract { diff --git a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapPresenter.java b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapPresenter.java index 7bf0a8f41..b47810c46 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapPresenter.java @@ -1,15 +1,12 @@ package fr.free.nrw.commons.explore.map; import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.LOCATION_SIGNIFICANTLY_CHANGED; -import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.MAP_UPDATED; import static fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType.SEARCH_CUSTOM_AREA; import android.location.Location; import android.view.View; import com.mapbox.mapboxsdk.annotations.Marker; -import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; -import com.mapbox.mapboxsdk.geometry.LatLngBounds; import fr.free.nrw.commons.MapController; import fr.free.nrw.commons.MapController.ExplorePlacesInfo; import fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsDao; @@ -18,7 +15,6 @@ import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.location.LocationServiceManager.LocationChangeType; import fr.free.nrw.commons.nearby.NearbyBaseMarker; -import fr.free.nrw.commons.utils.LocationUtils; import io.reactivex.Observable; import java.lang.reflect.Proxy; import java.util.List; diff --git a/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.java b/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.java index fb4893ea3..05efbe50d 100644 --- a/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.java +++ b/app/src/main/java/fr/free/nrw/commons/feedback/FeedbackDialog.java @@ -4,8 +4,6 @@ import android.app.Dialog; import android.content.Context; import android.os.Bundle; import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Toast; import fr.free.nrw.commons.R; import fr.free.nrw.commons.databinding.DialogFeedbackBinding; import fr.free.nrw.commons.feedback.model.Feedback; diff --git a/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.java b/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.java index f2be79c67..d72cb0832 100644 --- a/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.java +++ b/app/src/main/java/fr/free/nrw/commons/location/LocationPermissionsHelper.java @@ -7,7 +7,6 @@ import android.content.pm.PackageManager; import android.provider.Settings; import androidx.core.app.ActivityCompat; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.filepicker.Constants; import fr.free.nrw.commons.filepicker.Constants.RequestCodes; import fr.free.nrw.commons.utils.DialogUtil; import fr.free.nrw.commons.utils.PermissionUtils; diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index ee485fcf1..44d3f0908 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -76,14 +76,11 @@ import fr.free.nrw.commons.delete.DeleteHelper; import fr.free.nrw.commons.delete.ReasonBuilder; import fr.free.nrw.commons.description.DescriptionEditActivity; import fr.free.nrw.commons.description.DescriptionEditHelper; -import fr.free.nrw.commons.di.ApplicationlessInjection; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.explore.depictions.WikidataItemDetailsActivity; import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.location.LocationServiceManager; -import fr.free.nrw.commons.media.ZoomableActivity.ZoomableActivityConstants; import fr.free.nrw.commons.profile.ProfileActivity; -import fr.free.nrw.commons.review.ReviewController; import fr.free.nrw.commons.review.ReviewHelper; import fr.free.nrw.commons.settings.Prefs; import fr.free.nrw.commons.ui.widget.HtmlTextView; @@ -98,7 +95,6 @@ import io.reactivex.Observable; import io.reactivex.ObservableSource; import io.reactivex.Single; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index d0773279b..d756b753d 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -2,7 +2,6 @@ package fr.free.nrw.commons.media; import static fr.free.nrw.commons.Utils.handleWebUrl; -import android.annotation.SuppressLint; import android.content.ActivityNotFoundException; import android.content.Intent; import android.graphics.Bitmap; @@ -48,9 +47,7 @@ import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; -import java.net.MalformedURLException; import java.net.URL; -import java.net.URLConnection; import java.util.ArrayList; import java.util.Objects; import java.util.concurrent.Callable; diff --git a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java index 27f7b96a2..f2b253dae 100644 --- a/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java +++ b/app/src/main/java/fr/free/nrw/commons/mwapi/OkHttpJsonApiClient.java @@ -7,7 +7,6 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.google.gson.Gson; -import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.campaigns.CampaignResponseDTO; import fr.free.nrw.commons.explore.depictions.DepictsClient; import fr.free.nrw.commons.location.LatLng; diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java index edacd5d8c..c55f07be2 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyController.java @@ -1,8 +1,5 @@ package fr.free.nrw.commons.nearby; -import static fr.free.nrw.commons.utils.LengthUtils.computeDistanceBetween; -import static fr.free.nrw.commons.utils.LengthUtils.formatDistanceBetween; - import android.content.Context; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java index 29295cdfc..5d480f4f7 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java @@ -1,7 +1,6 @@ package fr.free.nrw.commons.nearby; import android.content.Context; -import android.graphics.Color; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,15 +11,12 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearSmoothScroller; import androidx.recyclerview.widget.RecyclerView; import java.util.ArrayList; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.nearby.presenter.NearbyParentFragmentPresenter; -import java.util.Collections; public class NearbyFilterSearchRecyclerViewAdapter extends RecyclerView.Adapter diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java index 8972d505e..fdd836390 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/Place.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/Place.java @@ -4,7 +4,6 @@ import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.text.TextUtils; import androidx.annotation.Nullable; import org.apache.commons.lang3.StringUtils; diff --git a/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java b/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java index 7b8568007..9456fe8fa 100644 --- a/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java @@ -6,22 +6,13 @@ import android.net.Uri; import android.os.Bundle; import android.util.DisplayMetrics; import android.view.LayoutInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.ProgressBar; -import android.widget.RelativeLayout; -import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.view.ContextThemeWrapper; -import androidx.appcompat.widget.AppCompatTextView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; -import com.dinuscxj.progressbar.CircleProgressBar; import fr.free.nrw.commons.R; import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.auth.SessionManager; diff --git a/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardListAdapter.java b/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardListAdapter.java index 4931def7a..9af24159a 100644 --- a/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardListAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardListAdapter.java @@ -13,7 +13,6 @@ import androidx.paging.PagedListAdapter; import androidx.recyclerview.widget.RecyclerView; import com.facebook.drawee.view.SimpleDraweeView; import fr.free.nrw.commons.R; -import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.profile.ProfileActivity; /** diff --git a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java index a832cb223..0b267a0fe 100644 --- a/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java @@ -14,9 +14,6 @@ import android.widget.TextView; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.dinuscxj.progressbar.CircleProgressBar; import fr.free.nrw.commons.databinding.ActivityQuizResultBinding; import java.io.File; diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java index a5ea2dbf4..9b01f7357 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java index 35c5aeace..29552e375 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java @@ -21,7 +21,6 @@ import fr.free.nrw.commons.R; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import java.util.ArrayList; import java.util.List; -import java.util.Objects; public class ReviewImageFragment extends CommonsDaggerSupportFragment { diff --git a/app/src/main/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditText.java b/app/src/main/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditText.java index bde665632..0b82baf64 100644 --- a/app/src/main/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditText.java +++ b/app/src/main/java/fr/free/nrw/commons/ui/PasteSensitiveTextInputEditText.java @@ -2,10 +2,8 @@ package fr.free.nrw.commons.ui; import android.content.Context; import android.content.res.TypedArray; -import android.os.Build; import android.os.Build.VERSION; import android.util.AttributeSet; -import android.util.Log; import com.google.android.material.textfield.TextInputEditText; import fr.free.nrw.commons.R; diff --git a/app/src/main/java/fr/free/nrw/commons/upload/FileUtilsWrapper.java b/app/src/main/java/fr/free/nrw/commons/upload/FileUtilsWrapper.java index a08a486e3..a35eeebe9 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/FileUtilsWrapper.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/FileUtilsWrapper.java @@ -3,7 +3,6 @@ package fr.free.nrw.commons.upload; import android.content.Context; import android.net.Uri; import fr.free.nrw.commons.location.LatLng; -import io.reactivex.Observable; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 3b3b03992..323bb4183 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -18,8 +18,6 @@ import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import android.os.Parcel; -import android.os.Parcelable; import android.provider.Settings; import android.util.DisplayMetrics; import android.view.View; @@ -45,7 +43,6 @@ import fr.free.nrw.commons.R; import fr.free.nrw.commons.auth.LoginActivity; import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.contributions.ContributionController; -import fr.free.nrw.commons.contributions.MainActivity; import fr.free.nrw.commons.filepicker.Constants.RequestCodes; import fr.free.nrw.commons.filepicker.UploadableFile; import fr.free.nrw.commons.kvstore.BasicKvStore; @@ -71,7 +68,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.schedulers.Schedulers; import java.io.File; -import java.security.Permission; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadBaseFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadBaseFragment.java index fdc757531..845f7fbb4 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadBaseFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadBaseFragment.java @@ -2,7 +2,6 @@ package fr.free.nrw.commons.upload; import android.os.Bundle; -import android.os.Parcelable; import androidx.annotation.Nullable; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; 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 569985e3a..d4f8ad62c 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 @@ -2,32 +2,20 @@ package fr.free.nrw.commons.upload; import android.accounts.Account; import android.annotation.SuppressLint; -import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; import android.content.res.AssetFileDescriptor; import android.database.Cursor; import android.net.Uri; -import android.os.IBinder; import android.provider.MediaStore; import android.text.TextUtils; -import androidx.work.OneTimeWorkRequest; -import androidx.work.WorkManager; import fr.free.nrw.commons.Media; import fr.free.nrw.commons.R; import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.contributions.Contribution; -import fr.free.nrw.commons.contributions.ContributionDao; import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.settings.Prefs; -import fr.free.nrw.commons.upload.worker.UploadWorker; import fr.free.nrw.commons.utils.ViewUtil; -import io.reactivex.Single; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; import java.io.BufferedInputStream; import java.io.File; import java.io.IOException; 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 9617e95c7..bb447cf6d 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 @@ -10,7 +10,6 @@ import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.nearby.Place; import fr.free.nrw.commons.settings.Prefs; -import fr.free.nrw.commons.upload.depicts.DepictsFragment; import fr.free.nrw.commons.upload.structure.depictions.DepictedItem; import io.reactivex.Observable; import io.reactivex.Single; diff --git a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java index da2aaac36..8204aeb0e 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.java @@ -10,14 +10,10 @@ import android.text.style.ClickableSpan; import android.text.style.URLSpan; import android.view.LayoutInflater; import android.view.View; -import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.Spinner; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -25,12 +21,7 @@ import androidx.annotation.Nullable; import fr.free.nrw.commons.databinding.FragmentMediaLicenseBinding; import fr.free.nrw.commons.upload.UploadActivity; import fr.free.nrw.commons.utils.DialogUtil; -import java.util.List; -import javax.inject.Inject; -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.OnClick; import fr.free.nrw.commons.R; import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.upload.UploadBaseFragment; diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java index 1e0117da5..1272dc4f1 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/ViewUtil.java @@ -1,7 +1,5 @@ package fr.free.nrw.commons.utils; -import static java.security.AccessController.getContext; - import android.app.Activity; import android.content.Context; import android.graphics.Color; diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/model/page/PageProperties.java b/app/src/main/java/fr/free/nrw/commons/wikidata/model/page/PageProperties.java index 57a3c03b5..8b32252d8 100644 --- a/app/src/main/java/fr/free/nrw/commons/wikidata/model/page/PageProperties.java +++ b/app/src/main/java/fr/free/nrw/commons/wikidata/model/page/PageProperties.java @@ -10,8 +10,6 @@ import androidx.annotation.Nullable; import java.util.Date; -import static org.apache.commons.lang3.StringUtils.defaultString; - /** * Immutable class that contains metadata associated with a PageTitle. */ diff --git a/app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/ListUserResponse.java b/app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/ListUserResponse.java index b817b0d53..a71e910c3 100644 --- a/app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/ListUserResponse.java +++ b/app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/ListUserResponse.java @@ -6,8 +6,6 @@ import androidx.collection.ArraySet; import com.google.gson.annotations.SerializedName; -import org.apache.commons.lang3.StringUtils; - import java.util.Collections; import java.util.List; import java.util.Set; diff --git a/app/src/main/res/values-yue-hant/error.xml b/app/src/main/res/values-yue-hant/error.xml deleted file mode 100644 index 68579e4a0..000000000 --- a/app/src/main/res/values-yue-hant/error.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - 同享壞咗 - 哎呀。出咗錯！ - 多謝你！ -