Skip to content

Commit fb30a34

Browse files
pshpsh
committed
Merge branch 'master' into dependency-injection
2 parents 07577d7 + 078feb9 commit fb30a34

File tree

41 files changed

+339
-50
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+339
-50
lines changed

‎CHANGELOG.md

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# Wikimedia Commons for Android
22

3-
## v2.5.0 beta
3+
## v2.6.0 beta
4+
- Multiple bugfixes for location updates and list/map loading in Nearby
5+
- Multiple fixes for various crashes and memory leaks
6+
- Added several unit tests
7+
- Modified About page to include WMF disclaimer and modified Privacy Policy link to point to our individual privacy policy
8+
- Added option for users to send logs to developers (has to be manually activated by user)
9+
- Converted PNGs to WebPs
10+
- Improved login screen with new design and privacy policy link
11+
- Improved category display, if a category has an exact name entered, it will be shown first
12+
- New UI for Nearby list
13+
- Added product flavors for production and the beta-cluster Wikimedia servers
14+
- Various improvements to navigation flow and backstack
15+
16+
## v2.5.0 beta
417
- Added one-time popup for beta users to provide feedback on IEG renewal proposal
518
- Added link to Commons policies in ShareActivity
619
- Various string fixes

‎app/build.gradle

+7-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ dependencies {
5858

5959
testImplementation 'junit:junit:4.12'
6060
testImplementation 'org.robolectric:robolectric:3.4'
61+
testImplementation 'org.mockito:mockito-all:1.10.19'
6162

6263
testImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
6364
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.8.1'
@@ -82,9 +83,11 @@ android {
8283

8384
defaultConfig {
8485
applicationId 'fr.free.nrw.commons'
85-
versionCode 74
86-
versionName '2.5.0'
86+
87+
versionCode 76
88+
versionName '2.6.1'
8789
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
90+
8891
minSdkVersion project.minSdkVersion
8992
targetSdkVersion project.targetSdkVersion
9093
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -150,6 +153,8 @@ android {
150153
//FIXME: Temporary fix for https://github.com/commons-app/apps-android-commons/issues/709
151154
configurations.all {
152155
resolutionStrategy.force 'com.android.support:support-annotations:25.2.0'
156+
exclude module: 'httpclient'
157+
exclude module: 'commons-logging'
153158
}
154159
buildToolsVersion buildToolsVersion
155160
}

‎app/src/androidTest/java/fr/free/nrw/commons/NearbyActivityTest.java

-30
This file was deleted.

‎app/src/androidTest/java/fr/free/nrw/commons/upload/FileUtilsTest.java

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package fr.free.nrw.commons.upload;
2+
3+
import android.net.Uri;
4+
import android.support.test.InstrumentationRegistry;
5+
import android.support.test.runner.AndroidJUnit4;
6+
7+
import org.junit.Test;
8+
import org.junit.runner.RunWith;
9+
10+
import static org.hamcrest.CoreMatchers.is;
11+
import static org.junit.Assert.assertThat;
12+
13+
@RunWith(AndroidJUnit4.class)
14+
public class FileUtilsTest {
15+
@Test
16+
public void isSelfOwned() throws Exception {
17+
Uri uri = Uri.parse("content://fr.free.nrw.commons.provider/document/1");
18+
boolean selfOwned = FileUtils.isSelfOwned(InstrumentationRegistry.getTargetContext(), uri);
19+
assertThat(selfOwned, is(true));
20+
}
21+
22+
@Test
23+
public void isNotSelfOwned() throws Exception {
24+
Uri uri = Uri.parse("content://com.android.providers.media.documents/document/1");
25+
boolean selfOwned = FileUtils.isSelfOwned(InstrumentationRegistry.getTargetContext(), uri);
26+
assertThat(selfOwned, is(false));
27+
}
28+
}

‎app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ private void setMapFragment() {
333333
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
334334
Fragment fragment = new NearbyMapFragment();
335335
fragment.setArguments(bundle);
336-
fragmentTransaction.replace(R.id.container, fragment);
336+
fragmentTransaction.replace(R.id.container, fragment, fragment.getClass().getSimpleName());
337337
fragmentTransaction.commitAllowingStateLoss();
338338
}
339339

@@ -344,7 +344,7 @@ private void setListFragment() {
344344
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
345345
Fragment fragment = new NearbyListFragment();
346346
fragment.setArguments(bundle);
347-
fragmentTransaction.replace(R.id.container, fragment);
347+
fragmentTransaction.replace(R.id.container, fragment, fragment.getClass().getSimpleName());
348348
fragmentTransaction.commitAllowingStateLoss();
349349
}
350350

‎app/src/main/res/values-bn/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">লগ ফাইল পাঠান</string>
202202
<string name="send_log_file_description">ইমেইলের মাধ্যমে উন্নয়নকারীর কাছে লগ ফাইল পাঠান</string>
203203
<string name="login_to_your_account">আপনার অ্যাকাউন্টে প্রবেশ করুন</string>
204+
<string name="nearby_location_has_not_changed">অবস্থান পরিবর্তন হয়নি।</string>
205+
<string name="nearby_location_not_available">অবস্থান বোধগম্য নয়।</string>
204206
</resources>

‎app/src/main/res/values-da/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Send logfil</string>
202202
<string name="send_log_file_description">Send logfil til udviklerne via e-post</string>
203203
<string name="login_to_your_account">Log ind på din konto</string>
204+
<string name="nearby_location_has_not_changed">Sted er ikke ændret.</string>
205+
<string name="nearby_location_not_available">Sted ikke tilgængeligt.</string>
204206
</resources>

‎app/src/main/res/values-de/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Logdatei senden</string>
202202
<string name="send_log_file_description">Logdatei an die Entwickler per E-Mail senden</string>
203203
<string name="login_to_your_account">Bei deinem Benutzerkonto anmelden</string>
204+
<string name="nearby_location_has_not_changed">Der Standort hat sich nicht geändert.</string>
205+
<string name="nearby_location_not_available">Der Standort ist nicht verfügbar.</string>
204206
</resources>

‎app/src/main/res/values-es/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Enviar archivo de registro</string>
202202
<string name="send_log_file_description">Enviar archivo de registro a los desarrolladores por correo electrónico</string>
203203
<string name="login_to_your_account">Accede a tu cuenta</string>
204+
<string name="nearby_location_has_not_changed">La ubicación no ha cambiado.</string>
205+
<string name="nearby_location_not_available">La ubicación no está disponible.</string>
204206
</resources>

‎app/src/main/res/values-fr/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Envoyer le journal</string>
202202
<string name="send_log_file_description">Envoyer le journal aux développeurs par courriel</string>
203203
<string name="login_to_your_account">Connectez-vous à votre compte</string>
204+
<string name="nearby_location_has_not_changed">L\'emplacement n\'a pas changé.</string>
205+
<string name="nearby_location_not_available">Emplacement non disponible.</string>
204206
</resources>

‎app/src/main/res/values-gl/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Enviar ficheiro de rexistro</string>
202202
<string name="send_log_file_description">Enviar ficheiro de rexistro ós desenvolvedores por correo electrónico</string>
203203
<string name="login_to_your_account">Comezar sesión na súa conta</string>
204+
<string name="nearby_location_has_not_changed">A localización non cambiou.</string>
205+
<string name="nearby_location_not_available">A localización non está dispoñible.</string>
204206
</resources>

‎app/src/main/res/values-hu/strings.xml

+10-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<string name="login_success">Sikeres bejelentkezés</string>
1212
<string name="login_failed">A bejelentkezés nem sikerült.</string>
1313
<string name="upload_failed">A fájl nem található. Próbálkozz másik fájllal.</string>
14-
<string name="authentication_failed">Sikertelen azonosítás.</string>
15-
<string name="uploading_started">Feltöltés indul.</string>
16-
<string name="upload_completed_notification_title">%1$s feltöltve!</string>
14+
<string name="authentication_failed">Sikertelen hitelesítés.</string>
15+
<string name="uploading_started">Feltöltés elindult.</string>
16+
<string name="upload_completed_notification_title">%1$s feltöltve.</string>
1717
<string name="upload_completed_notification_text">Feltöltés megtekintése</string>
1818
<string name="upload_progress_notification_title_start">Feltöltés indul: %1$s</string>
1919
<string name="upload_progress_notification_title_in_progress">%1$s feltöltése</string>
@@ -105,7 +105,7 @@
105105
<string name="license_name_cc_by_sa_3_0_ee">CC BY-SA 3.0 (Észtország)</string>
106106
<string name="license_name_cc_by_sa_3_0_es">CC BY-SA 3.0 (Spanyolország)</string>
107107
<string name="license_name_cc_by_sa_3_0_hr">CC BY-SA 3.0 (Horvátország)</string>
108-
<string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (Luxembourg)</string>
108+
<string name="license_name_cc_by_sa_3_0_lu">CC BY-SA 3.0 (Luxemburg)</string>
109109
<string name="license_name_cc_by_sa_3_0_nl">CC BY-SA 3.0 (Hollandia)</string>
110110
<string name="license_name_cc_by_sa_3_0_no">CC BY-SA 3.0 (Norvégia)</string>
111111
<string name="license_name_cc_by_sa_3_0_pl">CC BY-SA 3.0 (Lengyelország)</string>
@@ -190,9 +190,15 @@
190190
<string name="no_description_found">nincs leírás</string>
191191
<string name="nearby_info_menu_commons_article">Commons leírólap</string>
192192
<string name="nearby_info_menu_wikidata_article">Wikidata-elem</string>
193+
<string name="error_while_cache">Hiba a képek gyorsítótárazásakor</string>
193194
<string name="title_info">Egy egyedi, leíró cím a fájlnak, ami fájlnévként fog szolgálni. Egyszerű nyelvezetet használhatsz szóközökkel. Ne tedd bele a kiterjesztést.</string>
194195
<string name="description_info">Kérlek a lehető legteljesebb módon írd le a fájlt: hol készült, mit ábrázol, mi a kontextus? Kérlek add meg az objektumokat vagy személyeket a képen, valamint a nehezen kitalálható információkat (például a kép készítésének dátumát, ha az egy tájkép). Amennyiben a média valami szokatlant ábrázol, kérlek fejtsd ki, hogy mi teszi szokatlanná.</string>
195196
<string name="give_permission">Engedély adása</string>
196197
<string name="use_external_storage">Külső tárhely használata</string>
198+
<string name="use_external_storage_summary">Az alkalmazáson belüli kamerával készült képek mentése az eszközre</string>
199+
<string name="send_log_file">Naplófájlok küldése</string>
200+
<string name="send_log_file_description">Naplófájlok küldése e-mailben a fejlesztőknek</string>
197201
<string name="login_to_your_account">Bejelentkezés a fiókodba</string>
202+
<string name="nearby_location_has_not_changed">A hely nem változott.</string>
203+
<string name="nearby_location_not_available">A hely nem érhető el.</string>
198204
</resources>

‎app/src/main/res/values-it/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,6 @@
167167
<string name="nearby_info_menu_commons_article">Pagina di Commons del file</string>
168168
<string name="nearby_info_menu_wikidata_article">Elemento Wikidata</string>
169169
<string name="login_to_your_account">Accedi alla tua utenza</string>
170+
<string name="nearby_location_has_not_changed">La posizione non è cambiata.</string>
171+
<string name="nearby_location_not_available">Posizione non disponibile.</string>
170172
</resources>

‎app/src/main/res/values-ja/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,5 @@
168168
<string name="no_description_found">説明がありません</string>
169169
<string name="nearby_info_menu_wikidata_article">ウィキデータ項目</string>
170170
<string name="use_external_storage">外部ストレージを使用</string>
171+
<string name="nearby_location_not_available">位置が無効です。</string>
171172
</resources>

‎app/src/main/res/values-ko/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,6 @@
198198
<string name="send_log_file">로그 파일 보내기</string>
199199
<string name="send_log_file_description">이메일로 개발자에게 로그 파일 보내기</string>
200200
<string name="login_to_your_account">자신의 계정으로 로그인</string>
201+
<string name="nearby_location_has_not_changed">위치가 변경되지 않았습니다.</string>
202+
<string name="nearby_location_not_available">위치를 사용할 수 없습니다.</string>
201203
</resources>

‎app/src/main/res/values-lb/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,6 @@
191191
<string name="send_log_file">Log-Fichier schécken</string>
192192
<string name="send_log_file_description">Log-Fichier per E-Mail un d\'Entwéckler schécken</string>
193193
<string name="login_to_your_account">An Äre Benotzerkont aloggen</string>
194+
<string name="nearby_location_has_not_changed">De Plaz huet net geännert.</string>
195+
<string name="nearby_location_not_available">Plaz ass net disponibel.</string>
194196
</resources>

‎app/src/main/res/values-mk/strings.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<string name="upload_completed_notification_text">Допрете за да го погледате подигањето</string>
1818
<string name="upload_progress_notification_title_start">Почнувам со подигањето на „%1$s“</string>
1919
<string name="upload_progress_notification_title_in_progress">Подигање на „%1$s“</string>
20-
<string name="upload_progress_notification_title_finishing">Заврпувам со подигање на „%1$s“</string>
20+
<string name="upload_progress_notification_title_finishing">Завршувам со подигање на „%1$s“</string>
2121
<string name="upload_failed_notification_title">Подигањето на „%1$s“ не успеа</string>
2222
<string name="upload_failed_notification_subtitle">Допрете за да погледате</string>
2323
<plurals name="uploads_pending_notification_indicator">
@@ -73,7 +73,7 @@
7373
<string name="title_activity_settings">Нагодувања</string>
7474
<string name="title_activity_signup">Регистрација</string>
7575
<string name="menu_about">За извршникот</string>
76-
<string name="about_license">Прилогот на Ризницата има отворен код. Негови творци и оддржувачи се примателите на наменските средства од Викимедиината заедница како и членовите на заедницата. Фондацијата Викимедија нема учество во нејзиното создавање, разработка и одржување.</string>
76+
<string name="about_license">Прилогот на Ризницата има отворен код. Негови творци и одржувачи се примателите на наменските средства од Викимедиината заедница како и членовите на заедницата. Фондацијата Викимедија нема учество во нејзиното создавање, разработка и одржување.</string>
7777
<string name="about_improve">&lt;a href=\"https://github.com/commons-app/apps-android-commons\"&gt;Извор&lt;/a&gt; и &lt;a href=\"https://commons-app.github.io/\"&gt;мреж. место&lt;/a&gt; на GitHub&lt;/a&gt;. Создајте нов &lt;a href=\"https://github.com/commons-app/apps-android-commons/issues\"&gt;случај на GitHub&lt;/a&gt; за пријавување грешки и давање предлози.</string>
7878
<string name="about_privacy_policy">&lt;a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\"&gt;Заштита на личните податоци&lt;/a&gt;</string>
7979
<string name="about_credits">&lt;a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\"&gt;Заслуги&lt;/a&gt;</string>
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Испрати дневничка податотека</string>
202202
<string name="send_log_file_description">Испрати дневничка податотека на разработувачите по е-пошта</string>
203203
<string name="login_to_your_account">Најавете се со вашата сметка</string>
204+
<string name="nearby_location_has_not_changed">Местоположбата не е сменета.</string>
205+
<string name="nearby_location_not_available">Местоположбата е недостапна.</string>
204206
</resources>

‎app/src/main/res/values-nb/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Send loggfil</string>
202202
<string name="send_log_file_description">Send loggfil til utviklerne via epost</string>
203203
<string name="login_to_your_account">Logg inn med kontoen din</string>
204+
<string name="nearby_location_has_not_changed">Stedet har ikke blitt endret.</string>
205+
<string name="nearby_location_not_available">Sted ikke tilgjengelig.</string>
204206
</resources>

‎app/src/main/res/values-pms/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Mandé l\'archivi d\'argistr</string>
202202
<string name="send_log_file_description">Mandé l\'archivi d\'argistr ai dësvlupator për pòsta eletrònica</string>
203203
<string name="login_to_your_account">Ch\'as colega a sò cont</string>
204+
<string name="nearby_location_has_not_changed">Ël leu a l\'é nen cangià.</string>
205+
<string name="nearby_location_not_available">Leu nen disponìbil.</string>
204206
</resources>

‎app/src/main/res/values-pt-rBR/strings.xml

+2
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,6 @@
201201
<string name="send_log_file">Enviar arquivo de registro</string>
202202
<string name="send_log_file_description">Enviar arquivo de log para desenvolvedores por e-mail</string>
203203
<string name="login_to_your_account">Faça login na sua conta</string>
204+
<string name="nearby_location_has_not_changed">O local não mudou.</string>
205+
<string name="nearby_location_not_available">Localização não disponível.</string>
204206
</resources>

0 commit comments

Comments
 (0)