Merge branch 'master' of github.com:ooni/probe-android into issues/2591

ooni · Nov 4, 2023 · 8c1ab25 · 8c1ab25
2 parents c4d1e68 + 7deb8bf
commit 8c1ab25
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 125 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'org.openobservatory.ooniprobe'
         minSdk libs.versions.minSdk.get().toInteger()
         targetSdk libs.versions.targetSdk.get().toInteger()
-        versionName '3.8.3'
-        versionCode 102
+        versionName '3.8.4'
+        versionCode 106
 		testInstrumentationRunner "org.openobservatory.ooniprobe.TestAndroidJUnitRunner"
 		buildConfigField 'String', 'OONI_API_BASE_URL', '"https://api.ooni.io/"'
 		buildConfigField 'String', 'NOTIFICATION_SERVER', '"https://countly.ooni.io"'

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/OoniRunActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/OoniRunActivity.java
@@ -108,7 +108,7 @@ private void loadScreen(String mv, String tn, String ta){
 			if (versionCompare.compare(version_name, mv) >= 0) {
 				try {
 					Attribute attribute = gson.fromJson(ta, Attribute.class);
-					List<String> urls = (attribute!=null && attribute.urls != null) ? attribute.urls : Collections.emptyList();
+					List<String> urls = (attribute!=null && attribute.urls != null) ? attribute.urls : null;
 					AbstractSuite suite = getSuite.get(tn, urls);
 					if (suite != null) {
 						loadSuite(suite, urls);

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuite.java b/app/src/main/java/org/openobservatory/ooniprobe/test/suite/CircumventionSuite.java
@@ -8,7 +8,6 @@
 import org.openobservatory.ooniprobe.common.PreferenceManager;
 import org.openobservatory.ooniprobe.test.test.AbstractTest;
 import org.openobservatory.ooniprobe.test.test.Psiphon;
-import org.openobservatory.ooniprobe.test.test.RiseupVPN;
 import org.openobservatory.ooniprobe.test.test.Tor;
 
 import java.util.ArrayList;

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -72,7 +72,7 @@
   <string name="Dashboard_Experimental_Card_Description">Εκτέλεση νέων πειραματικών δοκιμών</string>
   <string name="Dashboard_Experimental_Overview_Paragraph">Εκτέλεσε τις παρακάτω νέες πειραματικές δοκιμές που αναπτύχθηκαν από την ομάδα του OONI:\n%1$s\n\nΤα αποτελέσματά σου θα δημοσιευθούν στο [OONI Explorer](https://explorer.ooni.org/) και στο [OONI API](https://api.ooni.io/).</string>
   <string name="Dashboard_Experimental_Overview_Paragraph_AutomatedTesting">Οι παρακάτω δοκιμές θα εκτελούνται μόνο ως μέρος των αυτοματοποιημένων δοκιμών:</string>
-  <string name="Dashboard_DisabledTests_Label">Disabled Tests</string>
+  <string name="Dashboard_DisabledTests_Label">Απενεργοποιημένες δοκιμές</string>
   <string name="TestResults_Gbps">Gbit/s</string>
   <string name="TestResults_Mbps">Mbit/s</string>
   <string name="TestResults_Kbps">kbit/s</string>
@@ -377,8 +377,8 @@
   <string name="Settings_Sharing_Footer">Δημοσιεύοντας αποτελέσματα, αυξάνεις τη διαφάνεια για τυχόν παρεμβολές στο Διαδικτύο, και υποστηρίζεις την κοινότητα του OONI.\n\nΓια την αναγνώριση των παρόχων δικτύου, απαιτούνται πληροφορίες δικτύου (όπως ο Αριθμός Αυτόνομου Συστήματος ASN).</string>
   <string name="Settings_TestOptions_Label">Επιλογές δοκιμής</string>
   <string name="Settings_TestOptions_Footer">Οι παραμετροποιήσεις που κάνετε μέσω των παραπάνω ρυθμίσεων δοκιμών (π.χ. απενεργοποίηση της δοκιμής WhatsApp) θα εφαρμόζονται τόσο σε δοκιμές που εκτελούνται χειροκίνητα, όσο και σε δοκιμές που εκτελούνται αυτόματα (όταν έχετε ενεργοποιημένες τις αυτοματοποιημένες δοκιμές).</string>
-  <string name="Settings_TestOptions_LongRunningTest">Long running test</string>
-  <string name="Settings_TestOptions_RunLongRunningTests">Run long running tests in foreground?</string>
+  <string name="Settings_TestOptions_LongRunningTest">Δοκιμή μεγάλης διάρκειας</string>
+  <string name="Settings_TestOptions_RunLongRunningTests">Να εκτελούνται οι δοκιμές μεγάλης διάρκειας στο προσκήνιο;</string>
   <string name="Settings_Privacy_Label">Απόρρητο</string>
   <string name="Settings_Privacy_SendCrashReports">Αποστολή αναφορών σφαλμάτων</string>
   <string name="Settings_Advanced_Label">Ρυθμίσεις για προχωρημένους/ες</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -160,7 +160,7 @@
   <string name="TestResults_Details_CopyExplorerURL">Copier l’URL de l’explorateur</string>
   <string name="TestResults_Details_ShareExplorerURL">Partager l’URL de l’explorateur</string>
   <string name="TestResults_Details_CopyToClipboard">Copier dans le presse-papiers</string>
-  <string name="TestResults_Details_ShowInExplorer">Afficher dans l’Explorateur OONI</string>
+  <string name="TestResults_Details_ShowInExplorer"> Dans l’Explorateur OONI</string>
   <string name="TestResults_Details_Failed_Title">Échec</string>
   <string name="TestResults_Details_Failed_Paragraph">Vous pouvez essayer de relancer ce test</string>
   <string name="TestResults_Details_Failed_TryAgain">Réessayer</string>

diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
@@ -377,32 +377,32 @@
   <string name="Settings_Sharing_Footer">Dengan mempublikasikan hasil, Anda meningkatkan transpaansi intervensi jaringan dan mendukung komunitas OONI.\n\nInformasi  jaringan (yaitu, Nomor Sistem Otonom) dibutuhkan untuk mengidentifikasi Penyedia Layanan Internet.</string>
   <string name="Settings_TestOptions_Label">Pilihan Tes</string>
   <string name="Settings_TestOptions_Footer">What you configure through the above test settings (e.g. disabling the WhatsApp test) will apply to tests run manually, as well as to tests run automatically (when automated testing is enabled).</string>
-  <string name="Settings_TestOptions_LongRunningTest">Long running test</string>
-  <string name="Settings_TestOptions_RunLongRunningTests">Run long running tests in foreground?</string>
+  <string name="Settings_TestOptions_LongRunningTest">Uji yang berjalan lama</string>
+  <string name="Settings_TestOptions_RunLongRunningTests">Jalankan uji yang berlangsung lama di latar depan?</string>
   <string name="Settings_Privacy_Label">Kerahasiaan pribadi</string>
   <string name="Settings_Privacy_SendCrashReports">Kirim laporan tabrakan</string>
   <string name="Settings_Advanced_Label">Advanced </string>
   <string name="Settings_DarkMode_Label">Mode Gelap</string>
   <string name="Settings_Advanced_DebugLogs">Log Debug</string>
-  <string name="Settings_Advanced_RecentLogs">See recent logs</string>
+  <string name="Settings_Advanced_RecentLogs">Lihat log baru-baru ini</string>
   <string name="Settings_Advanced_LanguageSettings_Title">Pengaturan Bahasa</string>
   <string name="Settings_Advanced_LanguageSettings_PopUp">Pilih Bahasa</string>
-  <string name="Settings_Advanced_UseDomainFronting">Always use domain fronting</string>
-  <string name="Settings_Proxy_Label">OONI backend proxy</string>
+  <string name="Settings_Advanced_UseDomainFronting">Selalu memakai domain fronting</string>
+  <string name="Settings_Proxy_Label">Proksi back end OONI</string>
   <string name="Settings_Proxy_Enabled">Proksi</string>
   <string name="Settings_Proxy_None">Tidak ada</string>
   <string name="Settings_Proxy_Psiphon">Psiphon</string>
-  <string name="Settings_Proxy_Custom">Custom Proxy</string>
-  <string name="Settings_Proxy_Custom_Value">Custom Proxy URL</string>
-  <string name="Settings_Proxy_Custom_Protocol">Custom proxy protocol</string>
+  <string name="Settings_Proxy_Custom">Proxy Custom</string>
+  <string name="Settings_Proxy_Custom_Value">URL Proxy Custom</string>
+  <string name="Settings_Proxy_Custom_Protocol">Protokol Proxy Custom</string>
   <string name="Settings_Proxy_Custom_Connection">Koneksi</string>
   <string name="Settings_Proxy_Custom_Hostname">Nama host</string>
   <string name="Settings_Proxy_Custom_Port">Port</string>
-  <string name="Settings_Proxy_Custom_Credentials">Credentials (optional)</string>
+  <string name="Settings_Proxy_Custom_Credentials">Kredensial (opsional)</string>
   <string name="Settings_Proxy_Custom_Username">Nama pengguna</string>
   <string name="Settings_Proxy_Custom_Password">Kata sandi</string>
-  <string name="Settings_Proxy_Psiphon_Over_Custom">Use Psiphon over custom proxy</string>
-  <string name="Settings_Proxy_Footer">Are you unable to use OONI Probe? Try enabling [Psiphon](https://psiphon.ca/) to circumvent potential OONI Probe blocking. Alternatively, you can use a custom proxy.</string>
+  <string name="Settings_Proxy_Psiphon_Over_Custom">Gunakan Psiphon melalui proxy khusus</string>
+  <string name="Settings_Proxy_Footer">Apakah anda tidak dapat menggunakan OONI Probe? Coba nyalakan [Psiphon](https://psiphon.ca/) untuk mengelabuhi pemblokiran OONI Probe. Anda juga dapat menggunakan proxy khusus untuk mengelabuhi.</string>
   <string name="Settings_Websites_MaxRuntimeEnabled">Batas durasi tes</string>
   <string name="Settings_Websites_MaxRuntime">Durasi tes</string>
   <string name="Settings_Websites_Categories_Label">Kategori laman yang akan dites</string>
@@ -420,7 +420,7 @@
   <string name="Settings_Websites_CustomURL_NoURLEntered">URL belum dimasukkan</string>
   <string name="Settings_Websites_CustomURL_Run">Jalankan</string>
   <string name="Settings_Websites_CustomURL_Add">Tambah laman</string>
-  <string name="Settings_Websites_CustomURL_LoadFromTemplate">Load from template</string>
+  <string name="Settings_Websites_CustomURL_LoadFromTemplate">Muat dari templat</string>
   <string name="Settings_Websites_TestCount">Jumlah laman yang sudah dites (0 artinya semua)</string>
   <string name="Settings_InstantMessaging_TestWhatsApp">Tes WhatsApp</string>
   <string name="Settings_InstantMessaging_TestTelegram">Tes Telegram</string>
@@ -439,7 +439,7 @@
   <string name="Settings_Circumvention_TestPsiphon">Tes Psiphon</string>
   <string name="Settings_Circumvention_TestTor">Tes Tor</string>
   <string name="Settings_Circumvention_TestRiseupVPN">Tes RiseupVPN</string>
-  <string name="Settings_WarmVPNInUse_Label">Warn when VPN is in use</string>
+  <string name="Settings_WarmVPNInUse_Label">Peringatkan ketika VPN sedang dipakai</string>
   <string name="Settings_SendEmail_Label">Kirim surel ke pendukung</string>
   <string name="Settings_SendEmail_Message">Silakan deskripsikan masalah yang Anda alami:</string>
   <string name="Settings_SendEmail_Error">Silakan kirim surel ke bugs@openobservatory.org dengan informasi aplikasi dan versi iOS. Ketuk \"Salin ke clipboard\" di bawah untuk salin alamat surel kami.</string>
@@ -449,7 +449,7 @@
   <string name="Settings_Storage_Usage_Label">Penyimpanan yang digunakan</string>
   <string name="Settings_Storage_Delete">Hapus</string>
   <string name="Settings_Storage_Clear">Bersihkan</string>
-  <string name="Settings_Storage_Confirmation_Paragraph">You are about to delete all OONI measurements from your device. If uploaded, they will still be available on [OONI Explorer](https://explorer.ooni.org)</string>
+  <string name="Settings_Storage_Confirmation_Paragraph">Anda akan menghapus semua pengukuran OONI dari perangkat Anda. Bila diunggah, mereka akan masih tersedia pada [OONI Explorer](https://explorer.ooni.org)</string>
   <string name="Notification_FinishedRunning">Selesai dijalani</string>
   <string name="Notification_StopTest">Hentikan tes</string>
   <string name="OONIBrowser_TryMirror">Coba mirror</string>
@@ -520,7 +520,7 @@
   <string name="CategoryCode_HACK_Description">Peralatan keamanan komputer dan berita</string>
   <string name="CategoryCode_COMT_Description">Peralatan komunikasi individual dan grup termasuk VoIP, messaging dan webmail</string>
   <string name="CategoryCode_MMED_Description">Pembagian video, audio dan foto</string>
-  <string name="CategoryCode_HOST_Description">Web hosting, blogging and other online publishing</string>
+  <string name="CategoryCode_HOST_Description">Hosting web, blogging, dan publikasi daring lain.</string>
   <string name="CategoryCode_SRCH_Description">Mesin pencari dan portal</string>
   <string name="CategoryCode_GAME_Description">Permainan online dan platform permainan (tidak termasuk situs perjudian)</string>
   <string name="CategoryCode_CULTR_Description">Hiburan termasuk sejarah, literatur, musik, satir dan humor</string>