From 5838483bfdb2a2ba2f52ab88bc15897422f05524 Mon Sep 17 00:00:00 2001 From: junkiattan Date: Mon, 5 Feb 2018 21:41:10 +0800 Subject: [PATCH 01/14] Resolved xml errors in string tags by inserting false formatted attribute --- app/src/main/res/values-bn/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-is/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-mk/strings.xml | 2 +- app/src/main/res/values-pms/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- build.gradle | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 545cbbf73..6af522d50 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -212,5 +212,5 @@ উইকিমিডিয়া কমন্সে স্বাগতম, %s! আপনাকে এখানে পেয়ে আমরা আনন্দিত। %s আপনার আলাপ পাতায় একটি বার্তা দিয়েছেন একটি সম্পাদনা করার জন্য আপনাকে ধন্যবাদ - %s আপনাকে %s-এ উল্লেখ করেছেন। + %s আপনাকে %s-এ উল্লেখ করেছেন। diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 5109eed55..ef7c15efa 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -178,5 +178,5 @@ COM ANAR-HI LLEGIU L’ARTICLE Gràcies per fer una modificació - %s us ha mencionat a %s. + %s us ha mencionat a %s. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0318473ff..2542f5d38 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -213,5 +213,5 @@ Willkommen auf Wikimedia Commons, %s! Wir sind froh, dass du hier bist. %s hinterließ eine Nachricht auf deiner Diskussionsseite Vielen Dank für deine Bearbeitung - %s erwähnte dich auf %s. + %s erwähnte dich auf %s. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 87713802f..665077d5e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -213,5 +213,5 @@ Καλωσήρθατε στο Wikimedia Commons, %s! Είμαστε χαρούμενοι που είστε εδώ. Ο %s άφησε ένα μήνυμα στην σελίδα συζήτησής σας Ευχαριστούμε που κάνατε μια επεξεργασία - Ο %s σας ανέφερε στο %s. + Ο %s σας ανέφερε στο %s. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b5accc246..3c5eab2a5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -213,5 +213,5 @@ ¡Te damos la bienvenida a Wikimedia Commons, %s! Qué bueno que estés aquí. %s dejó un mensaje en tu página de discusión Gracias por realizar una edición - %s te ha mencionado en %s. + %s te ha mencionado en %s. diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index ee9cd0a67..6ed2c5981 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -213,5 +213,5 @@ %s، به ویکی‌انبار خوش آمدید! خوشحالیم که اینجا هستید. %s در صفحهٔ بحث شما پیامی گذاشته‌است برای ویرایش ممنون - %s در %s به شما اشاره کرده‌است. + %s در %s به شما اشاره کرده‌است. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0666be16b..e7408e25e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -213,5 +213,5 @@ Bienvenue sur Wikimedia Commons, %s! Nous sommes heureux que vous soyez venu. %s a laissé un message sur votre page de discussion Merci de faire une modification - %s vous a mentionné sur %s . + %s vous a mentionné sur %s . diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 8e4f3cd12..96d94dec9 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -213,5 +213,5 @@ Benvido a Wikimedia Commons, %s! Alegrámonos de que estea aquí. %s deixoulle unha mensaxe na súa páxina de conversa Grazas por realizar unha edición - %s mencionouno en %s. + %s mencionouno en %s. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 288ea8f00..718121ceb 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -212,5 +212,5 @@ विकिमीडिया कॉमन्स पर आपका स्वागत है, %s! हमें हर्ष है कि आप यहाँ हैं। %s ने आपके वार्ता पृष्ठ पर सन्देश छोड़ा है सम्पादन करने के लिए धन्यवाद - %s ने %s में आपका उल्लेख किया है + %s ने %s में आपका उल्लेख किया है diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index a3e397117..f0b280f77 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -213,5 +213,5 @@ Velkomin á Wikimedia Commons, %s! Við erum ánægð með að þú skulir vera hérna. %s skildi eftir skilaboð á spjallsíðunni þinni Takk fyrir að hafa gert breytingar - %s minntist á þig á %s. + %s minntist á þig á %s. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9e24b8de4..05e462fe4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -184,5 +184,5 @@ Benvenuto in Wikimedia Commons, %s! Siamo contenti che tu sia qui. %s ti ha lasciato un messaggio nella tua pagina di discussione Grazie per aver fatto una modifica - %s ti ha menzionato su %s. + %s ti ha menzionato su %s. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 3633e5169..e35407a63 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -213,5 +213,5 @@ Добре дојдовте на Ризницата, %s! Драго ни е што сте тука. %s ви остави порака на разговорната страница Ви благодариме за уредувањето - %s ве спомна на %s. + %s ве спомна на %s. diff --git a/app/src/main/res/values-pms/strings.xml b/app/src/main/res/values-pms/strings.xml index 5d627dea4..e869921c1 100644 --- a/app/src/main/res/values-pms/strings.xml +++ b/app/src/main/res/values-pms/strings.xml @@ -213,5 +213,5 @@ Bin-ëvnù an Wikimedia Commons, %s! I soma content ëd vëdd-lo sì. %s a l\'ha lassà un mëssagi su soa pàgina ëd ciaciarade Mersì d\'avèj fàit na modìfica - %s a l\'ha massionalo su %s . + %s a l\'ha massionalo su %s . diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a2c679c3c..be9036d40 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -213,5 +213,5 @@ Bem-vindo ao Wikimedia Commons, %s! É um prazer tê-lo aqui. %s deixou uma mensagem na sua página de discussão Obrigado por ter realizado uma edição - %s fez menção a você em %s. + %s fez menção a você em %s. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index a3ac9c1d5..be96d27f1 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -213,5 +213,5 @@ Bem-vindo ao Wikimedia Commons, %s! É um prazer tê-lo aqui. %s deixou uma mensagem na sua página de discussão Obrigado por ter realizado uma edição - %s fez menção a si em %s. + %s fez menção a si em %s. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 387090d7f..c41602c77 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -217,5 +217,5 @@ Добро пожаловать в Wikimedia Commons, %s! Рады вас здесь видеть :-) %s оставил сообщение на вашей странице обсуждения Спасибо за правку - %s упомянул вас на %s. + %s упомянул вас на %s. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2b781a1c5..c73542aa8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -213,5 +213,5 @@ Välkommen till Wikimedia Commons, %s! Vi är glada att du är här. %s lämnade ett meddelande på din diskussionssida Tack för att du gjorde en redigering - %s nämnde dig på %s. + %s nämnde dig på %s. diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4ef5363a4..846fc02dd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -213,5 +213,5 @@ %s，歡迎來到維基共享資源！我們很高興您來到這裡。 %s 留了訊息在您的對話頁 感謝您所做的編輯 - %s 在 %s 提到了您。 + %s 在 %s 提到了您。 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 9b42cdbf0..11f1963b0 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -213,5 +213,5 @@ 欢迎来到维基共享资源，%s！我们很高兴您来这里。 %s在您的讨论页上留下了一条消息 感谢您做出编辑 - %s在%s提到了您。 + %s在%s提到了您。 diff --git a/build.gradle b/build.gradle index 6b7e5dc00..b0e8b6718 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath "com.android.tools.build:gradle:${project.gradleVersion}" + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" From 8e61be4fbee7ae02f29dd7b9e6313c053cd337d9 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Wed, 7 Feb 2018 15:40:57 +0530 Subject: [PATCH 02/14] Issue #171 - Removed warning Unused namespace - removed namespaces from within the xml where it is already present at the top of the xml. --- app/src/main/res/layout/activity_contributions.xml | 4 +--- app/src/main/res/layout/activity_multiple_uploads.xml | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/activity_contributions.xml b/app/src/main/res/layout/activity_contributions.xml index 9065618f2..51a48f0a5 100644 --- a/app/src/main/res/layout/activity_contributions.xml +++ b/app/src/main/res/layout/activity_contributions.xml @@ -15,9 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - - Date: Mon, 12 Feb 2018 17:40:18 +0800 Subject: [PATCH 03/14] added relevant filtering to containsYear method of CategorizationFragment.java --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java index 76a70c0b3..51376c7fe 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java @@ -298,8 +298,10 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment { //Check if item contains a 4-digit word anywhere within the string (.* is wildcard) //And that item does not equal the current year or previous year //And if it is an irrelevant category such as Media_needing_categories_as_of_16_June_2017(Issue #750) + //Check if the year in the form of XX(X)0s is relevant, i.e. in the 2000s or 2010s as stated in Issue #1029 return ((item.matches(".*(19|20)\\d{2}.*") && !item.contains(yearInString) && !item.contains(prevYearInString)) - || item.matches("(.*)needing(.*)") || item.matches("(.*)taken on(.*)")); + || item.matches("(.*)needing(.*)") || item.matches("(.*)taken on(.*)") + || (item.matches(".*0s.*") && !item.matches(".*(200|201)0s.*"))); } private void updateCategoryCount(CategoryItem item) { From 9152bf9ee40c96a1d701c6938e13b049b00b9206 Mon Sep 17 00:00:00 2001 From: Moseco Date: Mon, 12 Feb 2018 13:34:47 +0100 Subject: [PATCH 04/14] Issue 1135. Changed values-ko-kp to values-ko-rkp to follow Android doc --- app/src/main/res/{values-ko-kp => values-ko-rkp}/strings.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/src/main/res/{values-ko-kp => values-ko-rkp}/strings.xml (100%) diff --git a/app/src/main/res/values-ko-kp/strings.xml b/app/src/main/res/values-ko-rkp/strings.xml similarity index 100% rename from app/src/main/res/values-ko-kp/strings.xml rename to app/src/main/res/values-ko-rkp/strings.xml From 34a00660fc6b7b48115fbad1dfab26bd77732056 Mon Sep 17 00:00:00 2001 From: junkiattan Date: Tue, 13 Feb 2018 22:43:11 +0800 Subject: [PATCH 05/14] Removed hardcoded class path in build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0e8b6718..6b7e5dc00 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath "com.android.tools.build:gradle:${project.gradleVersion}" classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.7.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" From a6295ebd7a539c9e3465544eb5978253ad521839 Mon Sep 17 00:00:00 2001 From: Ujjwal Agrawal Date: Wed, 14 Feb 2018 05:15:06 +0530 Subject: [PATCH 06/14] added ISSUE_TEMPLATE.md for new issue creation --- ISSUE_TEMPLATE.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md new file mode 100644 index 000000000..4c5b9fac9 --- /dev/null +++ b/ISSUE_TEMPLATE.md @@ -0,0 +1,30 @@ +**Summary:** + +Summarize your issue in one sentence (what goes wrong, what did you expect to happen) + +**Steps to reproduce:** + +How can we reproduce the issue? + +**Add System logs:** + +Add logcat files here(If you are able to add). + +**Expected behavior:** + +What did you expect the App to do? + +**Observed behavior:** + +What did you see instead? Describe your issue in detail here. + +**Device and Android version:** + +What make and model device (e.g., Samsung J7) did you encounter this on? What Android +version (e.g., Android 4.0 Ice Cream Sandwich or Android 6.0 Marshmallow) are you running? Is it + the stock +version from the manufacturer or a custom ROM ? + +**Screen-shots:** + +Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher. From 3abe99b5c8499135162fd493c4b009156c802022 Mon Sep 17 00:00:00 2001 From: Ujjwal Agrawal Date: Wed, 14 Feb 2018 06:22:55 +0530 Subject: [PATCH 07/14] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 4c5b9fac9..3768f2f37 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -24,7 +24,7 @@ What make and model device (e.g., Samsung J7) did you encounter this on? What A version (e.g., Android 4.0 Ice Cream Sandwich or Android 6.0 Marshmallow) are you running? Is it the stock version from the manufacturer or a custom ROM ? - +What version of Commons app are you running? **Screen-shots:** Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher. From 5133dbaed018505460f49d4d7f86f3cb078d3538 Mon Sep 17 00:00:00 2001 From: Shradheya Thakre Date: Wed, 14 Feb 2018 13:56:23 +0800 Subject: [PATCH 08/14] 1130-g solved --- .../fr/free/nrw/commons/settings/SettingsFragment.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java index 2a017c854..4a290f232 100644 --- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java @@ -71,7 +71,12 @@ public class SettingsFragment extends PreferenceFragment { uploadLimit.setText(uploads + ""); uploadLimit.setSummary(uploads + ""); uploadLimit.setOnPreferenceChangeListener((preference, newValue) -> { - int value = Integer.parseInt(newValue.toString()); + int value; + try { + value = Integer.parseInt(newValue.toString()); + } catch(Exception e) { + value = 100; //Default number + } final SharedPreferences.Editor editor = prefs.edit(); if (value > 500) { new AlertDialog.Builder(getActivity()) @@ -85,7 +90,7 @@ public class SettingsFragment extends PreferenceFragment { uploadLimit.setSummary(500 + ""); uploadLimit.setText(500 + ""); } else { - editor.putInt(Prefs.UPLOADS_SHOWING, Integer.parseInt(newValue.toString())); + editor.putInt(Prefs.UPLOADS_SHOWING, value); editor.putBoolean(Prefs.IS_CONTRIBUTION_COUNT_CHANGED,true); uploadLimit.setSummary(newValue.toString()); } From 9dd01b91702f66be0f2fef28ed5129e9b92a7bbd Mon Sep 17 00:00:00 2001 From: Shradheya Thakre Date: Wed, 14 Feb 2018 14:16:41 +0800 Subject: [PATCH 09/14] Improve code quality --- .../fr/free/nrw/commons/CommonsApplication.java | 8 ++++---- .../java/fr/free/nrw/commons/location/LatLng.java | 15 +++++++-------- .../fr/free/nrw/commons/upload/FileUtils.java | 8 ++------ .../fr/free/nrw/commons/utils/ExecutorUtils.java | 4 +++- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java index a6cf2d65d..ab156bab7 100644 --- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java +++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java @@ -57,7 +57,6 @@ public class CommonsApplication extends Application { public static final String FEEDBACK_EMAIL_SUBJECT = "Commons Android App (%s) Feedback"; - private CommonsApplicationComponent component; private RefWatcher refWatcher; @@ -136,9 +135,10 @@ public class CommonsApplication extends Application { .subscribe(() -> { Timber.d("All accounts have been removed"); //TODO: fix preference manager - defaultPrefs.edit().clear().commit(); - applicationPrefs.edit().clear().commit(); - applicationPrefs.edit().putBoolean("firstrun", false).apply();otherPrefs.edit().clear().commit(); + defaultPrefs.edit().clear().apply(); + applicationPrefs.edit().clear().apply(); + applicationPrefs.edit().putBoolean("firstrun", false).apply(); + otherPrefs.edit().clear().apply(); updateAllDatabases(); logoutListener.onLogoutComplete(); diff --git a/app/src/main/java/fr/free/nrw/commons/location/LatLng.java b/app/src/main/java/fr/free/nrw/commons/location/LatLng.java index d587b88e3..494cce077 100644 --- a/app/src/main/java/fr/free/nrw/commons/location/LatLng.java +++ b/app/src/main/java/fr/free/nrw/commons/location/LatLng.java @@ -38,7 +38,7 @@ public class LatLng { /** * gets the latitude and longitude of a given non-null location * @param location the non-null location of the user - * @return + * @return LatLng the Latitude and Longitude of a given location */ public static LatLng from(@NonNull Location location) { return new LatLng(location.getLatitude(), location.getLongitude(), location.getAccuracy()); @@ -48,13 +48,12 @@ public class LatLng { * creates a hash code for the longitude and longitude */ public int hashCode() { - boolean var1 = true; - byte var2 = 1; - long var3 = Double.doubleToLongBits(this.latitude); - int var5 = 31 * var2 + (int)(var3 ^ var3 >>> 32); - var3 = Double.doubleToLongBits(this.longitude); - var5 = 31 * var5 + (int)(var3 ^ var3 >>> 32); - return var5; + byte var1 = 1; + long var2 = Double.doubleToLongBits(this.latitude); + int var3 = 31 * var1 + (int)(var2 ^ var2 >>> 32); + var2 = Double.doubleToLongBits(this.longitude); + var3 = 31 * var3 + (int)(var2 ^ var2 >>> 32); + return var3; } /** diff --git a/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java b/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java index 2cf18e7d7..0026a6ce0 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java @@ -49,18 +49,14 @@ public class FileUtils { if ("primary".equalsIgnoreCase(type)) { return Environment.getExternalStorageDirectory() + "/" + split[1]; } - } - // DownloadsProvider - else if (isDownloadsDocument(uri)) { + } else if (isDownloadsDocument(uri)) { // DownloadsProvider final String id = DocumentsContract.getDocumentId(uri); final Uri contentUri = ContentUris.withAppendedId( Uri.parse("content://downloads/public_downloads"), Long.valueOf(id)); return getDataColumn(context, contentUri, null, null); - } - // MediaProvider - else if (isMediaDocument(uri)) { + } else if (isMediaDocument(uri)) { // MediaProvider final String docId = DocumentsContract.getDocumentId(uri); final String[] split = docId.split(":"); final String type = split[0]; diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ExecutorUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/ExecutorUtils.java index 15f18ee5e..57ed86eeb 100644 --- a/app/src/main/java/fr/free/nrw/commons/utils/ExecutorUtils.java +++ b/app/src/main/java/fr/free/nrw/commons/utils/ExecutorUtils.java @@ -15,6 +15,8 @@ public class ExecutorUtils { } }; - public static Executor uiExecutor() { return uiExecutor; } + public static Executor uiExecutor() { + return uiExecutor; + } } From fde82b466079595065fb385dc54bf185fb57ddd5 Mon Sep 17 00:00:00 2001 From: Ujjwal Agrawal Date: Wed, 14 Feb 2018 22:10:40 +0530 Subject: [PATCH 10/14] Update ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 3768f2f37..8758be596 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -8,7 +8,7 @@ How can we reproduce the issue? **Add System logs:** -Add logcat files here(If you are able to add). +Add logcat files here (if possible). **Expected behavior:** @@ -22,9 +22,12 @@ What did you see instead? Describe your issue in detail here. What make and model device (e.g., Samsung J7) did you encounter this on? What Android version (e.g., Android 4.0 Ice Cream Sandwich or Android 6.0 Marshmallow) are you running? Is it - the stock -version from the manufacturer or a custom ROM ? -What version of Commons app are you running? + the stock version from the manufacturer or a custom ROM ? + + **Commons app version:** + +You can find this information by going to the navigation drawer in the app and tapping 'About' + **Screen-shots:** Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher. From dfe08cea66f6198003a4a97df346585f152935c9 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 15 Feb 2018 09:42:57 +0100 Subject: [PATCH 11/14] Localisation updates from https://translatewiki.net. --- app/src/main/res/{values-ko-rkp => values-ko-rKP}/strings.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/src/main/res/{values-ko-rkp => values-ko-rKP}/strings.xml (100%) diff --git a/app/src/main/res/values-ko-rkp/strings.xml b/app/src/main/res/values-ko-rKP/strings.xml similarity index 100% rename from app/src/main/res/values-ko-rkp/strings.xml rename to app/src/main/res/values-ko-rKP/strings.xml From ab76cc6d3a5755f7b5d9170eafd8cbc9c90a1384 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 15 Feb 2018 09:46:27 +0100 Subject: [PATCH 12/14] Localisation updates from https://translatewiki.net. --- app/src/main/res/values-bn/strings.xml | 3 ++- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-kum/error.xml | 6 ++++++ app/src/main/res/values-ne/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 5 ++++- 5 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/values-kum/error.xml diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 6333a81eb..d8e927712 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -121,7 +121,7 @@ দয়া করে আপলোড করবেন না: u2022 আপনার বন্ধুর সেলফি বা ছবি \nu2022 ইন্টারনেট থেকে ডাউনলোড করা ছবি \nu2022 মালিকানাযুক্ত অ্যাপসমূহের স্ক্রীনশট আপলোডের উদাহরণ: - u2022 শিরোনাম: সিডনি অপেরা হাউস \nu2022 বিবরণ: উপসাগর থেকে দেখা সিডনি অপেরা হাউস\nu2022 বিষয়শ্রেণী: সিডনি অপেরা হাউস, পশ্চিম দিক থেকে সিডনি অপেরা হাউস, সিডনি অপেরা হাউসের দূরবর্তী দৃশ্য + - শিরোনাম: সিডনি অপেরা হাউস \n- বিবরণ: উপসাগর থেকে দেখা সিডনি অপেরা হাউস\n- বিষয়শ্রেণী: সিডনি অপেরা হাউস, পশ্চিম দিক থেকে সিডনি অপেরা হাউস, সিডনি অপেরা হাউসের দূরবর্তী দৃশ্য আপনার ছবি দিয়ে অবদান রাখুন। উইকিপিডিয়ার নিবন্ধগুলিকে নতুন রূপ দিতে সাহায্য করুন! উইকিপিডিয়াতে চিত্র উইকিমিডিয়া কমন্স থেকে এসেছে। আপনার ছবি সারা বিশ্বের শিক্ষিত মানুষকে সাহায্য করবে। @@ -191,6 +191,7 @@ প্রতিক্রিয়া প্রস্থান ভূমিকা + বিজ্ঞপ্তি অবস্থানের অনুমতি ছাড়া কাছাকাছি জায়গাগুলি প্রদর্শন করা যাবে না কোন বিবরণ পাওয়া যায়নি কমন্সে ফাইলের পাতা diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 39c5af4cf..77fdac33c 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -55,7 +55,7 @@ Spustit GPS Žádné nahrané soubory - Žádné soubory + \@string/contributions_subtitle_zero 1 soubor %1$d souborů diff --git a/app/src/main/res/values-kum/error.xml b/app/src/main/res/values-kum/error.xml new file mode 100644 index 000000000..706bdae51 --- /dev/null +++ b/app/src/main/res/values-kum/error.xml @@ -0,0 +1,6 @@ + + + Вагь. Бир зат чы терс гетди! + Этгенигизни язып бизге электрон почгъа йибери. О масъаланы чечме кёмек этежек! + Савбол! + diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index f2cab024b..10be9f8f8 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -90,4 +90,5 @@ वर्णन छैन अज्ञान अनुमतिपत्र ताजागर्ने + टगल दृश्य diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 2b3c68a2d..21eeb12f1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -52,7 +52,10 @@ เปิดใช้งาน GPS ยังไม่มีการอัปโหลด การอัปโหลด %1$d รายการ - กำลังเริ่มการอัปโหลด %1$d รายการ + + กำลังเริ่มอัปโหลด %1$d รายการ + กำลังเริ่มอัปโหลด %1$d รายการ + การอัปโหลด %1$d รายการ การอัปโหลด %1$d รายการ From c8e3b52b10c1eb2d1844916c25464e4aee3ca8a5 Mon Sep 17 00:00:00 2001 From: Shradheya Thakre Date: Thu, 15 Feb 2018 21:15:59 +0800 Subject: [PATCH 13/14] Fixed error --- .../java/fr/free/nrw/commons/settings/SettingsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java index 4a290f232..7dfba7a64 100644 --- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsFragment.java @@ -92,7 +92,7 @@ public class SettingsFragment extends PreferenceFragment { } else { editor.putInt(Prefs.UPLOADS_SHOWING, value); editor.putBoolean(Prefs.IS_CONTRIBUTION_COUNT_CHANGED,true); - uploadLimit.setSummary(newValue.toString()); + uploadLimit.setSummary(String.valueOf(value)); } editor.apply(); return true; From 63cdd9a5b2e6c6d9c91521f3d261816f79f39e53 Mon Sep 17 00:00:00 2001 From: Josephine Lim Date: Fri, 16 Feb 2018 01:10:40 +1000 Subject: [PATCH 14/14] Add search instructions to issue_template.md --- ISSUE_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 8758be596..d8ef17752 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,3 +1,5 @@ +_Before creating an issue, please search the existing issues to see if a similar one has already been created. You can search issues by specific labels (e.g. `label:nearby `) or just by typing keywords into the search filter._ + **Summary:** Summarize your issue in one sentence (what goes wrong, what did you expect to happen)