From 982bf42a4be3f871f6638c0e874c5e71a5eb9217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 28 Feb 2016 14:04:15 +0000 Subject: [PATCH 1/5] Remove unused resources from old search screen We didn't remove the search results class until after reworking the feature, which is probably why this was kept around. --- F-Droid/res/layout/searchresults.xml | 23 ----------------------- F-Droid/res/values-ar/strings.xml | 3 --- F-Droid/res/values-ast/strings.xml | 3 --- F-Droid/res/values-bg/strings.xml | 3 --- F-Droid/res/values-ca/strings.xml | 3 --- F-Droid/res/values-cs/strings.xml | 3 --- F-Droid/res/values-da/strings.xml | 3 --- F-Droid/res/values-de/strings.xml | 3 --- F-Droid/res/values-el/strings.xml | 3 --- F-Droid/res/values-eo/strings.xml | 3 --- F-Droid/res/values-es/strings.xml | 3 --- F-Droid/res/values-eu/strings.xml | 3 --- F-Droid/res/values-fa/strings.xml | 3 --- F-Droid/res/values-fi/strings.xml | 3 --- F-Droid/res/values-fr/strings.xml | 3 --- F-Droid/res/values-gl/strings.xml | 3 --- F-Droid/res/values-he/strings.xml | 3 --- F-Droid/res/values-hu/strings.xml | 3 --- F-Droid/res/values-id/strings.xml | 3 --- F-Droid/res/values-it/strings.xml | 3 --- F-Droid/res/values-ja/strings.xml | 3 --- F-Droid/res/values-ko/strings.xml | 3 --- F-Droid/res/values-nb/strings.xml | 3 --- F-Droid/res/values-nl/strings.xml | 3 --- F-Droid/res/values-pl/strings.xml | 3 --- F-Droid/res/values-pt-rBR/strings.xml | 3 --- F-Droid/res/values-pt-rPT/strings.xml | 3 --- F-Droid/res/values-ro/strings.xml | 3 --- F-Droid/res/values-ru/strings.xml | 3 --- F-Droid/res/values-sc/strings.xml | 3 --- F-Droid/res/values-sk/strings.xml | 3 --- F-Droid/res/values-sl/strings.xml | 3 --- F-Droid/res/values-sq/strings.xml | 3 --- F-Droid/res/values-sr/strings.xml | 3 --- F-Droid/res/values-sv/strings.xml | 3 --- F-Droid/res/values-tr/strings.xml | 3 --- F-Droid/res/values-ug/strings.xml | 3 --- F-Droid/res/values-uk/strings.xml | 3 --- F-Droid/res/values-vi/strings.xml | 3 --- F-Droid/res/values-zh-rCN/strings.xml | 3 --- F-Droid/res/values-zh-rHK/strings.xml | 3 --- F-Droid/res/values-zh-rTW/strings.xml | 3 --- F-Droid/res/values/strings.xml | 3 --- 43 files changed, 149 deletions(-) delete mode 100644 F-Droid/res/layout/searchresults.xml diff --git a/F-Droid/res/layout/searchresults.xml b/F-Droid/res/layout/searchresults.xml deleted file mode 100644 index dd8198a9d..000000000 --- a/F-Droid/res/layout/searchresults.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/F-Droid/res/values-ar/strings.xml b/F-Droid/res/values-ar/strings.xml index acccb8275..10c611437 100644 --- a/F-Droid/res/values-ar/strings.xml +++ b/F-Droid/res/values-ar/strings.xml @@ -1,7 +1,5 @@ - عثر على تطبيق واحد يوافق \'%s\': - لم يعثر على أي تطبيق يوافق \'%s\' الإصدار حذف التحديثات @@ -67,7 +65,6 @@ النظام F-Droid - العثور على%1$d من التطبيقات مطابقة \'%2$s\': توقيع الإصدار الجديد مع مفتاح مختلفة إلى واحدة من العمر. لتثبيت الإصدار الجديد، القديم يجب أن يتم إلغاء تثبيت أولا. يرجى القيام بذلك وحاول مرة أخرى. (لاحظ أن ذلك إلغاء تثبيت محو أي بيانات داخلية تخزينها من قبل التطبيق) يبدو مثل هذه الحزمة غير متوافق مع جهازك. هل ترغب في محاولة لتثبيته على أي حال؟ diff --git a/F-Droid/res/values-ast/strings.xml b/F-Droid/res/values-ast/strings.xml index 9441b89bb..1da15f084 100644 --- a/F-Droid/res/values-ast/strings.xml +++ b/F-Droid/res/values-ast/strings.xml @@ -1,8 +1,5 @@ - Alcontráronse %1$d aplicaciones que concasen con «%2$s»: - Alcontróse una aplicación que concasa con «%s»: - Nun s\'alcontraron aplicaciones que concasen con «%s» La versión nueva ta roblada con una clave diferente. Pa instalar la versión nueva, tien de desinstalase primero la vieya. Por favor, failo ya inténtalo de nueves. (Decátate que la desinstalación desaniciará cualesquier datu internu atroxáu pola aplicación) Paez qu\'esti paquete nun ye compatible col to preséu. ¿Quies intentar instalalu de toes toes? Tas intentando baxar de versión esta aplicación. Eso quiciabes faiga que l\'aplicación furrule mal o incluso, pierdas los tos datos. ¿Quies intentalo y baxala de versión de toes toes? diff --git a/F-Droid/res/values-bg/strings.xml b/F-Droid/res/values-bg/strings.xml index 659d79d04..93438791a 100644 --- a/F-Droid/res/values-bg/strings.xml +++ b/F-Droid/res/values-bg/strings.xml @@ -1,8 +1,5 @@ - Намерени са %1$d приложения съвпадащи с \"%2$s\": - Намерено е едно приложение съвпадащо с \"%s\": - Не са намерени приложения съвпадащи с \"%s\" Новата версия е подписана с различен ключ. За да бъде инсталирана първо трябва да деинсталирате старата версия. (Забележка: деинсталирането ще доведе до изтриване на данни съхранявани от старата версия.) Изглежда пакетът не е съвместим с вашето устройство. Да бъде направен опит за инсталиране въпреки това? Опитвате се да инсталирате по-стара версия на приложението. Това действие може да предизвика нестабилност и дори загуба на данни. Наистина ли желаете да продължите? diff --git a/F-Droid/res/values-ca/strings.xml b/F-Droid/res/values-ca/strings.xml index 0b36fffe5..50ff4d9d8 100644 --- a/F-Droid/res/values-ca/strings.xml +++ b/F-Droid/res/values-ca/strings.xml @@ -1,8 +1,5 @@ - S\'ha trobat %1$d aplicacions coincidents amb \'%2$s\': - S\'ha trobat una aplicació coincident amb \'%s\': - No hi ha aplicacions coincidents amb \'%s\' La nova versió està signada amb una clau diferent de la vella. Per a instal·lar la nova versió, cal desinstaŀlar primer la vella. Si us plau feu-ho i proveu altre cop. (Sapigueu que desintal·lar-la suprimirà qualsevol dada interna que l\'aplicació hagi desat) Sembla que aquest paquet no és compatible amb el vostre dispositiu. Voleu provar a instaŀlar-lo de totes maneres? Aneu a desactualitzar aquesta aplicació. Això podria fer que l\'aplicació no funcionés o inclús es perdessin les vostres dades. Esteu segur que ho voleu fer? diff --git a/F-Droid/res/values-cs/strings.xml b/F-Droid/res/values-cs/strings.xml index 16e673efd..9459186f9 100644 --- a/F-Droid/res/values-cs/strings.xml +++ b/F-Droid/res/values-cs/strings.xml @@ -1,7 +1,5 @@ - Nalezena jedna aplikace odpovídající \'%s\': - Nenalezeny žádné aplikace odpovídající \'%s\' Nová verze je podepsána jiným klíčem, než ta stará. Před instalací nové verze je nutné starou odinstalovat. Poté zopakujte instalaci. (Nezapomeňte, že při odinstalování aplikace budou všechna její data v interním úložišti smazána.) Zdá se, že balíček není kompatibilní s tímto zařízením. Chcete ho přesto zkusit nainstalovat? Pokoušíte se instalovat starší verzi než je nyní nainstalována. To nemusí fungovat a může to vést i ke ztrátě dat. Opravdu chcete starší verzi nainstalovat? @@ -143,7 +141,6 @@ Otevřít čtečku QR kódů Vítejte v aplikaci F-Droid! Chceš nyní stáhnout aplikace z %1$s? -Nalezeno %1$d aplikací odpovídajících \"%2$s\": Aktualizovat/odinstalovat privilegovaná rozšíření Otevřít obrazovku detailů privilegovaných rozšíření pro aktualizaci/deinstalaci Zdrojový kód diff --git a/F-Droid/res/values-da/strings.xml b/F-Droid/res/values-da/strings.xml index 579de4471..bcd3e0160 100644 --- a/F-Droid/res/values-da/strings.xml +++ b/F-Droid/res/values-da/strings.xml @@ -1,9 +1,6 @@ F-Droid - Fandt %1$d programmer som matcher \'%2$s\': - Fandt et program som matcher \'%s\': - Fandt ingen programmer som matcher \'%s\' Den nye version er signeret med en nøgle som er forskellig fra den gamle nøgle. Den gamle version skal afinstalleres, før den nye version kan installeres. Gør venligst det, og prøv igen. (Bemærk at afinstallation sletter al data programmet har lagret internt) Det ser ud til at denne pakke er inkompatibel med din enhed. Vil du forsøge at installere den alligevel? Du forsøger at nedgradere dette program. Gøres dette vil programmet måske blive defekt og endda tabe dine data. Vil du alligevel forsøge at nedgradere programmet? diff --git a/F-Droid/res/values-de/strings.xml b/F-Droid/res/values-de/strings.xml index 0890661d0..d448375c3 100644 --- a/F-Droid/res/values-de/strings.xml +++ b/F-Droid/res/values-de/strings.xml @@ -1,8 +1,5 @@ - %1$d Anwendungen mit »%2$s« gefunden: - Eine Anwendung mit »%s« gefunden: - Keine Anwendung mit »%s« gefunden Die neue Version wurde mit einem anderen Schlüssel signiert als die alte. Um die neue Version zu installieren, muss zunächst die alte entfernt werden. Versuchen Sie es bitte danach nochmal. (Hinweis: Beim Entfernen werden alle intern gespeicherten Daten dieser Anwendung gelöscht.) Es sieht so aus, als sei dieses Paket mit Ihrem Gerät nicht kompatibel. Möchten Sie trotzdem versuchen, es zu installieren? Sie versuchen, eine vorherige Version einer bereits installierten Anwendung zu installieren. Dies kann zu Fehlverhalten der Anwendung und gegebenenfalls zu Datenverlust führen. Möchten Sie dennoch fortfahren? diff --git a/F-Droid/res/values-el/strings.xml b/F-Droid/res/values-el/strings.xml index 2ff4c1466..a58e5a48b 100644 --- a/F-Droid/res/values-el/strings.xml +++ b/F-Droid/res/values-el/strings.xml @@ -1,8 +1,5 @@ - Βρέθηκαν %1$d εφαρμογές που συσχετίζονται με \'%2$s\': - Βρέθηκε μια εφαρμογή που συσχετίζεται με \'%s\': - Δε βρέθηκαν εφαρμογές που να συσχετίζονται με το \'%s\' Η καινούργια έκδοση είναι υπογεγραμμένη με διαφορετικό κλειδί από την παλιά. Για να γίνει η εγκατάσταση της καινούργιας έκδοσης, πρέπει να γίνει πρώτα η απεγκατάσταση της παλιάς έκδοσης. Παρακαλώ όπως το κάνετε αυτό και προσπαθήστε ξανά. (Σημειώστε ότι η απεγκατάσταση θα διαγράψει οποιαδήποτε εσωτερικά δεδομένα που αποθηκεύονται από την εφαρμογή) Φαίνεται ότι αυτό το πακέτο δεν είναι συμβατό με τη συσκευή σας. Θα θέλατε να δοκιμάσετε να το εγκαταστήσετε ούτως ή άλλως; Προσπαθείτε να υποβαθμίσετε αυτήν την εφαρμογή. Αν το κάνετε αυτό, μπορεί να προκληθούν προβλήματα στην εφαρμογή ή ακόμα και να χάσετε τα δεδομένα σας. Θέλετε να δοκιμάσετε να την υποβαθμίσετε ούτως ή άλλως; diff --git a/F-Droid/res/values-eo/strings.xml b/F-Droid/res/values-eo/strings.xml index 73f538952..7e318f993 100644 --- a/F-Droid/res/values-eo/strings.xml +++ b/F-Droid/res/values-eo/strings.xml @@ -116,10 +116,7 @@ Nestabilaj ĝisdatigoj Intervalo de aŭtomata ĝisdatigo Vi klopodas malpromocii ĉi tiun aplikaĵon. Fari tion eble malfunkciigos ĝin kaj eĉ perdigos viajn datumojn. Ĉu vi volas klopodi malpromocii ĝin ĉiaokaze? - Trovitaj %1$d aplikaĵojn kongruante \'%2$s\': - Trovita unu aplikaĵon kongruante \'%s\': La nova versio estas subskribita per diferenca ŝlosilo. Por instali la novan version, la malnova devas esti malinstalita unue. Bonvolu fari tion ĉi kaj reprovi. (Rigardu ke malinstalado forigos ĉiujn internan datumon konservitan de la aplikaĵo) - Neniu aplikaĵo trovita kongruante \'%s\' de Aktivigi sendadon tra NFC… Kaŝmemorigi pakaĵojn diff --git a/F-Droid/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml index a6cf2f191..73051f54f 100644 --- a/F-Droid/res/values-es/strings.xml +++ b/F-Droid/res/values-es/strings.xml @@ -1,8 +1,5 @@ - Se encontraron %1$d aplicaciones con \'%2$s\': - Se encontró una aplicación con \'%s\': - No se encontró ninguna aplicación con \'%s\' La nueva versión está firmada con una clave diferente a la antigua. Para instalar la nueva versión, la antigua debe de ser desinstalada primero. Por favor, hazlo y prueba de nuevo. (Ten en cuenta que la desinstalación borrará cualquier dato interno guardado por la aplicación) Parece que este paquete no es compatible con el dispositivo. ¿Quieres probar e instalarlo de todos modos? Estás intentando instalar una versión inferior de esta aplicación. Hacerlo puede derivar en mal funcionamiento o incluso pérdida de datos. ¿Quieres intentarlo de todos modos? diff --git a/F-Droid/res/values-eu/strings.xml b/F-Droid/res/values-eu/strings.xml index b007c1738..a47f02d19 100644 --- a/F-Droid/res/values-eu/strings.xml +++ b/F-Droid/res/values-eu/strings.xml @@ -1,8 +1,5 @@ - \'%2$s\'-rekin bat datozen %1$d aplikazio aurkitu dira: - \'%s\'-rekin bat datorren aplikazio bat aurkitu da: - \'%s\'-rekin bat datorren aplikaziorik ez da aurkitu Bertsio berria zaharraren desberdina den gako batekin sinatuta dago. Bertsio berria instalatzeko, aurretik zaharra desinstalatu beharra dago. Mesedez, egizu eta saiatu berriro. (Kontutan izan desinstalatzean aplikazioak gordetako barne datuak ezabatuko direla) Bertsioa Ezabatu diff --git a/F-Droid/res/values-fa/strings.xml b/F-Droid/res/values-fa/strings.xml index 328fcedde..e85b0e868 100644 --- a/F-Droid/res/values-fa/strings.xml +++ b/F-Droid/res/values-fa/strings.xml @@ -75,9 +75,6 @@ نیاز دارد: %1$s اف‌دروید - %1$d کارهٔ مطابق با «%2$s» پیدا شد: - یک کارهٔ مطابق با «%s» پیدا شد: - هیچ کارهٔ مطابق با «%s» پیدا نشد نگارش جدید با کلیدی متفاوت با قبلی امضا شده است. برای نصب نگارش جدید، باید نخست نگارش قدیمی را حذف کرد. لطفاً این کار را انجام داده و دوباره تلاش کنید. (به خاطر داشته باشید حذف نصب، تمام داده‌های درونی دخیره شدهٔ کاره را پاک می‌کند) نگارش فعّال کردن ارسال NFC… diff --git a/F-Droid/res/values-fi/strings.xml b/F-Droid/res/values-fi/strings.xml index 7780b8583..17e93b7f2 100644 --- a/F-Droid/res/values-fi/strings.xml +++ b/F-Droid/res/values-fi/strings.xml @@ -1,8 +1,5 @@ - Löydettiin %1$d sovellusta, jotka täsmäävät \'%2$s\': - Löydettiin yksi sovellus, joka täsmää \'%s\': - Sovelluksia, jotka täsmäävät \'%s\' ei löytynyt Uusi versio on allekirjoitettu eri avaimella kuin vanha. Asentaaksesi uuden version, vanha täytyy poistaa ensin. Tee tämä ja yritä uudelleen. (Huomaa, että poistaminen poistaa kaiken sovelluksen sisäisen datan) Tämä paketti ei näytä olevan yhteensopiva laitteesi kanssa. Haluatko silti asentaa sen? Sovellusta päivitetään vanhempaan versioon. Sovellus voi toimia väärin tai kadottaa tietojasi. Haluatko päivittää vanhempaan versioon? diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml index fc93f34e8..bde6957a8 100644 --- a/F-Droid/res/values-fr/strings.xml +++ b/F-Droid/res/values-fr/strings.xml @@ -1,8 +1,5 @@ - %1$d applications contenant \"%2$s\" ont été trouvées : - Une application contenant \"%s\" a été trouvée : - Aucune application contenant \"%s\" n\'a été trouvée La nouvelle version est signée avec une clé différente de l\'ancienne. Pour installer la nouvelle version, l\'ancienne doit d\'abord être désinstallée. Essayez de nouveau après avoir désinstallé l\'ancienne application. (Veuillez noter que la désinstallation effacera les données stockées par l\'application) Il semble que ce paquet ne soit pas compatible avec votre appareil. Voulez-vous quand même essayer de l\'installer ? Vous essayez de revenir à une ancienne version de cette application. Cela peut causer des problèmes de fonctionnement ou des pertes de données. Voulez-vous tout de même essayer de désinstaller les mises à jour ? diff --git a/F-Droid/res/values-gl/strings.xml b/F-Droid/res/values-gl/strings.xml index 2160d93c8..61f7721af 100644 --- a/F-Droid/res/values-gl/strings.xml +++ b/F-Droid/res/values-gl/strings.xml @@ -1,8 +1,5 @@ - Atopáronse %1$d aplicativos que cadran con \'%2$s\': - Atopouse un aplicativo que cadra con \'%s\': - Non se atoparon aplicativos que cadren con \'%s\' A nova versión está asinada cunha clave diferente da antiga. Para instalar a nova versión, antes débese desinstalar a anterior. Por favor, fágao e téntao de novo. (Ao desinstalar borrarase calquera dato interno gardado pola aplicación) Parece que este paquete non é compatíbel co seu dispositivo. Quere facer a proba e instalalo aínda así? Está tentando instalar unha versión anterior. Isto pode supoñer un mal funcionamento ou perda de datos. Quere tentalo de todas maneiras? diff --git a/F-Droid/res/values-he/strings.xml b/F-Droid/res/values-he/strings.xml index 35ce1027f..0cf37b3dd 100644 --- a/F-Droid/res/values-he/strings.xml +++ b/F-Droid/res/values-he/strings.xml @@ -1,8 +1,5 @@ - נמצאו %1$d אפליקציות תואמות \'%2$s\': - נמצאה אפליקציה אחת תואמת \'%s\': - לא נמצאו אפליקציות תואמות את \'%s\' נראה כי חבילה זו אינה תואמת את מכשירך. האם ברצונך להתקין אותה בכל מקרה? הינך מנסה להנמיך את אפליקציה זו. פעולה שכזו עלולה לגרום לתפקוד לקוי ואף לאיבוד מידע. האם ברצונך לנסות להנמיך בכל מקרה? גרסה diff --git a/F-Droid/res/values-hu/strings.xml b/F-Droid/res/values-hu/strings.xml index 5f5447329..d7159c619 100644 --- a/F-Droid/res/values-hu/strings.xml +++ b/F-Droid/res/values-hu/strings.xml @@ -1,8 +1,5 @@ - %1$d alkalmazástalálat ehhez: \'%2$s\': - Egy alkalmazástalálat ehhez: \'%s\': - \"Nincs ezzel \'%s\' egyező alkalmazás\" Az új verzió a régitől eltérő kulccsal van aláírva. Az új verzió telepítéséhez először el kell távolítani a régit. Kérem tegye meg ezt és próbálja újra. (Megjegyzendő, hogy az eltávolítás törli az alkalmazás minden tárolt adatát) Úgy tűnik, ez a csomag nem kompatibilis a készülékkel. Ennek ellenére is megpróbálja telepíteni? Ön megpróbálta régebbivel felülírni az alkalmazást. Ez hibás működést és az adatok elvesztését okozhatja. Ennek ellenére is megpróbálja telepíteni? diff --git a/F-Droid/res/values-id/strings.xml b/F-Droid/res/values-id/strings.xml index f3d1f529f..951c3cb86 100644 --- a/F-Droid/res/values-id/strings.xml +++ b/F-Droid/res/values-id/strings.xml @@ -1,9 +1,6 @@ F-Droid - Menemukan %1$d aplikasi yang cocok dengan \'%2$s\': - Menemukan satu aplikasi yang cocok dengan \'%s\': - Tidak ada aplikasi yang cocok dengan \'%s\' Sepertinya versi paket ini tidak kompatibel dengan perangkat Anda. Apakah Anda tetap ingin memasang dan mencobanya? Anda mencoba untuk memasang versi yang lebih rendah dari aplikasi ini. Tetap memasangnya mungkin dapat meyebabkan aplikasi tidak bekerja dengan baik. Apakah Anda tetap ingin memasang dan mencobanya? Versi diff --git a/F-Droid/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml index 533030185..f6f7794be 100644 --- a/F-Droid/res/values-it/strings.xml +++ b/F-Droid/res/values-it/strings.xml @@ -1,8 +1,5 @@ - Trovate %1$d applicazioni corrispondenti a \'%2$s\': - Trovata un\'applicazione corrispondente a \'%s\': - Non è stata trovata nessuna applicazione corrispondente a \'%s\' La nuova versione è firmata con una chiave differente rispetto alla vecchia. Per installare la nuova versione occorre prima disinstallare la precedente. Riprovare dopo averla disinstallata (Attenzione! La disinstallazione cancellerà qualsiasi dato salvato dall\'applicazione) Sembra che questo pacchetto non sia compatibile con il tuo dispositivo. Vuoi provare comunque ad installarlo? Stai provando a passare ad una versione precedente di questa applicazione. Potresti avere malfunzionamenti e perdite di dati. Vuoi installarla comunque? diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml index a435f3367..dd3220882 100644 --- a/F-Droid/res/values-ja/strings.xml +++ b/F-Droid/res/values-ja/strings.xml @@ -1,8 +1,5 @@ - \'%2$s\' に適合する %1$d ｱﾌﾟﾘｹｰｼｮﾝが見つかりました: - \'%s\' に適合する 1 ｱﾌﾟﾘｹｰｼｮﾝが見つかりました: - \'%s\' に適合するｱﾌﾟﾘｹｰｼｮﾝは見つかりませんでした 新しいﾊﾞｰｼﾞｮﾝは､以前のものと異なる暗号鍵で署名されています｡新しいﾊﾞｰｼﾞｮﾝをｲﾝｽﾄｰﾙするには､まず以前のﾊﾞｰｼﾞｮﾝをｱﾝｲﾝｽﾄｰﾙする必要があります｡その後で再度実行してください｡(ｱﾌﾟﾘｹｰｼｮﾝをｱﾝｲﾝｽﾄｰﾙすると保存したﾃﾞｰﾀｰが消えることに注意してください) このﾊﾟｯｹｰｼﾞはあなたの端末と互換性がないようです｡それでもｲﾝｽﾄｰﾙを続行しますか? このｱﾌﾟﾘｹｰｼｮﾝをﾀﾞｳﾝｸﾞﾚｰﾄﾞしようとしています｡これにより不具合を発生させたりﾃﾞｰﾀを失ったりする場合があります｡それでもﾀﾞｳﾝｸﾞﾚｰﾄﾞを続行しますか? diff --git a/F-Droid/res/values-ko/strings.xml b/F-Droid/res/values-ko/strings.xml index 382417bf4..3f5aa672d 100644 --- a/F-Droid/res/values-ko/strings.xml +++ b/F-Droid/res/values-ko/strings.xml @@ -1,8 +1,5 @@ - \'%2$s\' 검색결과 (%1$d개) - \'%s\' 검색결과: - \'%s\' 와 일치하는 응용프로그램을 찾을 수 없습니다. 새 버전은 기존 버전과 다른 키로 서명되어 있습니다. 새 버전을 설치하려면 기존 버전을 반드시 먼저 삭제해야 합니다. 그 다음에 다시 시도하세요. (참고로, 삭제를 할 경우 앱이 저장한 모든 내부 자료도 같이 삭제됩니다) 이 패키지가 기기와 호환되지 않는 것 같습니다. 계속 설치를 진행할까요? 이 응용 프로그램의 다운그레이드 하려고 합니다. 이전 버전을 설치할 경우, 응용 프로그램에 데이터가 손상되거나 오작동이 발생할 수 있습니다. 정말로 다운그레이드하시겠습니까? diff --git a/F-Droid/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml index 503ef115d..aad7940b9 100644 --- a/F-Droid/res/values-nb/strings.xml +++ b/F-Droid/res/values-nb/strings.xml @@ -1,8 +1,5 @@ - Fant %1$d programmer som samsvarer med \'%2$s\': - Fant ett program som samsvarer med \'%s\': - Fant ingen program som samsvarer med \'%s\' Den nye versjonen er signert med en annen nøkkel enn den gamle. For å installere en ny versjon må du først avinstallere den gamle. (Avinstallering vil medfører sletting av all intern data lagret av programmet) Det ser ut til at denne pakken ikke er kompatibel med ditt utstyr. Vil du prøve å installere det likevel? Du prøver å nedgradere denne applikasjonen. Dette kan føre til at programmet henger, og du kan til og med miste dataene dine. Nedgradere uansett ? diff --git a/F-Droid/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml index 3b53c342e..652d9b75e 100644 --- a/F-Droid/res/values-nl/strings.xml +++ b/F-Droid/res/values-nl/strings.xml @@ -1,8 +1,5 @@ - %1$d applicaties gevonden die voldoen aan \'%2$s\': - Eén applicatie gevonden die voldoet aan \'%s\': - Geen applicaties gevonden die voldoen aan \'%s\' De nieuwe versie is met een andere sleutel ondertekend dan de oude versie. Om de nieuwe versie te installeren, moet de oude eerst verwijderd worden. Probeer het daarna opnieuw. (Let op dat bij het verwijderen de data van de applicatie ook verwijderd wordt) Dit pakket is niet compatibel met uw apparaat. Wilt u het alsnog proberen te installeren? U probeert deze app te downgraden naar een oudere versie. Als u dit doet, functioneert de app mogelijk niet goed meer en kunt u zelfs uw data verliezen. Wilt u het alsnog proberen en de app downgraden? diff --git a/F-Droid/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml index 6c483dfc5..3c357cf39 100644 --- a/F-Droid/res/values-pl/strings.xml +++ b/F-Droid/res/values-pl/strings.xml @@ -140,9 +140,6 @@ Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.Czy wymienić aplikacje z %1$s? F-Droid - Znaleziono %1$d wyników pasujących do zapytania \'%2$s\': - Znaleziono jedną aplikację pasującą do zapytania \'%s\': - Nie znaleziono żadnych wyników dla zapytania \'%s\' Nowa wersja jest podpisana cyfrowo z innym kluczem niż obecna wersja. Aby zainstalować nową wersję, obecna musi zostać najpierw odinstalowana (odinstalowanie aplikacji spowoduje usunięcie jej danych i ustawień) Próbujesz zainstalować starszą wersję tej aplikacji. Wykonanie tej operacji może powodować błędy w jej działaniu lub utratę danych. Czy chcesz kontynuować? Trzymaj pobrane pliki .apk na urządzeniu by móc ich potem używać w trybie offline diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml index fb5bcb5ac..a998aeca1 100644 --- a/F-Droid/res/values-pt-rBR/strings.xml +++ b/F-Droid/res/values-pt-rBR/strings.xml @@ -1,8 +1,5 @@ - Encontramos %1$d aplicativos correspondentes a \'%2$s\': - Encontramos um aplicativo correspondente a \'%s\': - Não foram encontrados aplicativos correspondentes a \'%s\' A nova versão é assinada com uma chave diferente da antiga. Para instalar a nova versão, desinstale primeiro a antiga. Por favor, faça isso e tente novamente. (Note que a desinstalação apaga todos os dados internos armazenados pelo aplicativo) Aparentemente este pacote não é compatível com o seu dispositivo. Quer tentar instalá-lo mesmo assim? Você está tentando desatualizar este aplicativo. Isso pode causar mal funcionamento e eventualmente perda de dados. Você quer tentar desatualizá-lo mesmo assim? diff --git a/F-Droid/res/values-pt-rPT/strings.xml b/F-Droid/res/values-pt-rPT/strings.xml index be7e600c2..ea1aac640 100644 --- a/F-Droid/res/values-pt-rPT/strings.xml +++ b/F-Droid/res/values-pt-rPT/strings.xml @@ -1,9 +1,6 @@ F-Droid - Encontradas %1$d aplicações coincidentes com \'%2$s\': - Encontrada uma aplicação coincidente com \'%s\': - Não foram encontradas aplicações correspondentes a \'%s\' A nova versão está assinada com uma chave diferente da antiga. Para instalar a nova versão, tem que desinstalar a antiga. Remova a aplicação e tente novamente. (Tenha em atenção que irá apagar todos os dados guardados pela aplicação) Parece que este pacote não é compatível com o seu dispositivo. Deseja tentar a instalação? Está a tentar desatualizar esta aplicação. Se o fizer pode perder os seus dados e provocar um funcionamento errático. Tem a certeza de que o deseja fazer? diff --git a/F-Droid/res/values-ro/strings.xml b/F-Droid/res/values-ro/strings.xml index b8608a356..0c341d06d 100644 --- a/F-Droid/res/values-ro/strings.xml +++ b/F-Droid/res/values-ro/strings.xml @@ -1,8 +1,5 @@ - S-au gasit %1$d aplicatii ce se potrivesc cu \'%2$s\': - S-a gasit o aplicatie ce se potriveste cu \'%s\': - Nici o aplicatie nu se potriveste cu \'%s\' Versiune Sterge Pastreaza pachete diff --git a/F-Droid/res/values-ru/strings.xml b/F-Droid/res/values-ru/strings.xml index 028bc2d4c..8c88e5e41 100644 --- a/F-Droid/res/values-ru/strings.xml +++ b/F-Droid/res/values-ru/strings.xml @@ -1,8 +1,5 @@ - По запросу \'%2$s\' найдено %1$d приложений: - Найдено одно приложение по запросу \'%s\': - По запросу \'%s\' ничего не найдено Новая версия подписана ключом, отличным от старого. Перед установкой новой версии необходимо удалить старую. Сделайте это и попробуйте ещё раз. (При удалении приложения все его данные будут потеряны) Похоже, этот пакет несовместим с вашим устройством. Всё равно установить? Вы пытаетесь установить более старую версию приложения. Это может привести к его некорректной работе и даже потере данных. Вы уверены, что хотите продолжить? diff --git a/F-Droid/res/values-sc/strings.xml b/F-Droid/res/values-sc/strings.xml index 19a84a41d..500a4ceec 100644 --- a/F-Droid/res/values-sc/strings.xml +++ b/F-Droid/res/values-sc/strings.xml @@ -1,8 +1,5 @@ - Agatadas %1$d aplicatziones currispondentes cun \'%2$s\': - Agatada una aplicatzione currispondente cun \'%s\': - Non sunt istadas agatadas aplicatziones currispondentes cun \'%s\' Sa versione noa est firmada cun una crae diferente dae sa bècia. Pro la installare, sa bècia depet èssere istada disinstallada in antis. Pro piaghere fàghe·lu e torra a proare. (Sa disinstallatzione as a burrare totu sos datos sarbados in s\'aplicatzione) Paret chi custu pachete non siat cumpatìbile cun su dispositivu tuo. Boles a proare a lu installare su matessi? Ses chirchende de torrare a una versione prus bècia de custa aplicatzione. Dias pòdere tènnere problemas e fintzas pèrdere sos datos tuos. Seguru ses de bòlere proare a lu fàghere? diff --git a/F-Droid/res/values-sk/strings.xml b/F-Droid/res/values-sk/strings.xml index 3be72be70..2ee97e656 100644 --- a/F-Droid/res/values-sk/strings.xml +++ b/F-Droid/res/values-sk/strings.xml @@ -1,8 +1,5 @@ - Nájdených %1$d zodpovedajúcich \'%2$s\': - Nájdená jedna aplikácia zodpovedajúca \'%s\': - Žiadna aplikácia nezodpovedá \'%s\' Nová verzia je podpísaná iným kľúčom ako tá stará. Pred inštaláciou novej verzie je nutné starú odinštalovať. Urobte to a skúste znovu. (Pozor! Odinštalovanie zmaže všetky interné dáta uložené aplikáciou) Zdá sa, že tento balíček nie je kompatibilný s vašim zariadením. Chcete ho napriek tomu nainštalovať? Pokúšate sa prejsť na staršiu verziu aplikácie. Môže to spôsobiť poruchy a dokonca aj stratu údajov. Naozaj chcete skúsiť prejsť na staršiu verziu? diff --git a/F-Droid/res/values-sl/strings.xml b/F-Droid/res/values-sl/strings.xml index 77d556285..60d024e09 100644 --- a/F-Droid/res/values-sl/strings.xml +++ b/F-Droid/res/values-sl/strings.xml @@ -1,8 +1,5 @@ - Najdenih %1$d applikacij, ki ustrezajo \'%2$s\': - Najdena ena aplikacija, ki ustreza \'%s\': - Nobena aplikacija ne ustreza \'%s\' Nova različica je overovljena z drugim ključem kot starejša. V primeru, da želite namestiti novejšo različico morate najprej odstraniti staro. Poskusite ponovno, ko ste to naredili. (Bodite pozorni na dejstvo, da bodo zaradi odstranitve izbrisani vsi notranji podatki shranjeni v aplikaciji) Različica Predpomnilnik naloženih aplikacij diff --git a/F-Droid/res/values-sq/strings.xml b/F-Droid/res/values-sq/strings.xml index 1f732035a..0146cc76a 100644 --- a/F-Droid/res/values-sq/strings.xml +++ b/F-Droid/res/values-sq/strings.xml @@ -1,9 +1,6 @@ F-Droid - U gjetën %1$d aplikacione që përputhem me \'%2$s\': - U gjet një aplikacion që përputhet me \'%s\': - Nuk u gjetën aplikacione që përputhen me \'%s\' Versioni i ri është i nënshkruar me një çelës të ndryshëm nga ai i vjetri. Për të instaluar versionin e ri, së pari duhet të çinstalohet versioni i vjetër. Ju lutem provojeni dhe provoni përsëri.\n(Vini re që çinstalimi do të fshijë çdo të dhënë të brendshme të ruajtur nga aplikacioni) Mesa duket kjo paketë nuk përputhet me pajisjen tuaj. Dëshironi të provoni ta instaloni sidoqoftë? Versioni diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml index 40d26c545..6676f40ce 100644 --- a/F-Droid/res/values-sr/strings.xml +++ b/F-Droid/res/values-sr/strings.xml @@ -1,8 +1,5 @@ - Нађено је %1$d апликација који садрже „%2$s“: - Једна апликација садржи „%s“: - Ниједна апликација не садржи „%s“ Ново издање је потписано другачијим кључем од старог. Да бисте инсталирали ново издање, најпре уклоните старо. (Имајте на уму да уклањањем такође бришете унутрашње податке апликације.) Изгледа да овај пакет не одговара вашем уређају. Желите ли свеједно да га инсталирате? Покушавате да инсталирате старије издање ове апликације. То може довести до отказа и губитка података. Желите ли заиста да инсталирате старије издање? diff --git a/F-Droid/res/values-sv/strings.xml b/F-Droid/res/values-sv/strings.xml index 73e04b274..11f3c661e 100644 --- a/F-Droid/res/values-sv/strings.xml +++ b/F-Droid/res/values-sv/strings.xml @@ -1,8 +1,5 @@ - Hittade %1$d program som matchade \'%2$s\': - Ett program matchade \'%s\': - Inga program matchade \'%s\' Den nya versionen är signerad med en annan nyckel än den gamla. Den gamla versionen måste först avinstalleras. Försök sedan igen. (Observera att data som tillhör programmet kommer att raderas när det avinstalleras.) Det verkar som att det här paketet inte är kompatibelt med din enhet. Vill du testa att installera det ändå? Du försöker nedgradera detta program. Detta kan få det att fungera felaktigt eller orsaka förlust av dina data. Vill du ändå försöka nedgradera? diff --git a/F-Droid/res/values-tr/strings.xml b/F-Droid/res/values-tr/strings.xml index d2b87b44d..7b37bf897 100644 --- a/F-Droid/res/values-tr/strings.xml +++ b/F-Droid/res/values-tr/strings.xml @@ -1,8 +1,5 @@ - \'%2$s\' ile eşleşen %1$d uygulama bulundu: - \'%s\' ile eşleşen bir uygulama bulundu: - \'%s\' ile eşleşen hiçbir uygulama bulunamadı Bu yeni sürüm farklı bir anahtar ile imzalanmıştır. Yeni sürümü kurmak için önce eski sürümü kaldırmanız gerekir. Lütfen bunu yapın ve tekrar deneyin. (Not: bu, uygulama tarafından saklanan tüm dahili verileri silecektir) Bu paket cihazınızla uyumlu değil gibi görünüyor. Yine de kurmayı denemek istiyor musunuz? Bu uygulamanın eski bir sürümüne dönmek üzeresiniz. Bu, uygulamanın yanlış çalışmasına ve hatta veri kaybına neden olabilir. Devam etmek istiyor musunuz? diff --git a/F-Droid/res/values-ug/strings.xml b/F-Droid/res/values-ug/strings.xml index eba8fc8d5..f9184d44d 100644 --- a/F-Droid/res/values-ug/strings.xml +++ b/F-Droid/res/values-ug/strings.xml @@ -1,8 +1,5 @@ - بۇ \'%2$s\'غا ماس كېلىدىغان %1$d ئەپنى تاپتى: - \'%s\' غا ماس كېلىدىغان بىر ئەپنى تاپتى: - \'%s\' غا ماس كېلىدىغان ھېچقانداق ئەپنى تاپالمىدى بۇ يېڭى نەشرى كونا نەشرىنىڭكى بىلەن پەرقلىق ئاچقۇچ بىلەن ئىمزا قويۇلغان. ئالدى بىلەن كونا نەشرىنى ئۆچۈرۈۋېتىپ ئاندىن يېڭى نەشرىنى ئورنىتىڭ. بۇ مەشغۇلاتنى قىلىپ ئاندىن قايتا سىناڭ. (دىققەت كونا نەشرى ئۆچۈرۈلسە شۇ ئەپتە ساقلانغان ھەممە سانلىق مەلۇماتلارمۇ ئۆچۈرۈلىدۇ) بۇ بوغچا ئۈسكۈنىڭىز بىلەن ماسلاشمايدىغاندەك تۇرىدۇ، ئۇنى سىناپ ئورنىتىۋېرەمسىز؟ بۇ ئەپنىڭ دەرىجىسىنى تۆۋەنلىتىشنى سىناۋاتىسىز. بۇ مەشغۇلاتنى ئىجرا قىلىش داۋامىدا كاشىلا كۆرۈلۈشى ۋە سانلىق مەلۇماتلىرىڭىزنى يوقۇتۇپ قويۇشىڭىز مۇمكىن. ئۇنى سىناپ دەرىجىسىنى تۆۋەنلىتىۋېرەمسىز؟ diff --git a/F-Droid/res/values-uk/strings.xml b/F-Droid/res/values-uk/strings.xml index cd33f0b0c..64b8b06d2 100644 --- a/F-Droid/res/values-uk/strings.xml +++ b/F-Droid/res/values-uk/strings.xml @@ -1,8 +1,5 @@ - Знайдено %1$d програм за запитом «%2$s»: - Знайдено програму за запитом «%s»: - Не знайдено програм за запитом «%s». Нова версія підписана не тим ключем, що стара. Перш ніж встановити нову версію, самостійно зітріть стару. (Зауважте, що стирання програми призведе до знищення всіх даних цієї програми) Версія Зберігати пакунки diff --git a/F-Droid/res/values-vi/strings.xml b/F-Droid/res/values-vi/strings.xml index b6ca7d525..9f3118a2b 100644 --- a/F-Droid/res/values-vi/strings.xml +++ b/F-Droid/res/values-vi/strings.xml @@ -1,8 +1,5 @@ - Tìm thấy %1$d ứng dụng với từ khoá \'%2$s\': - Tìm thấy một ứng dụng với từ khoá \'%s\': - Không tìm thấy ứng dụng với từ khoá \'%s\' Phiên bản mới có mã khoá khác với phiên bản cũ. Để cài đặt phiên bản mới phải xoá phiên bản cũ trước. Hãy xoá phiên bản cũ và thử lại. (Chú ý rằng khi xoá ứng dụng, dữ liệu ứng dụng sẽ bị mất) Ứng dụng này có khả năng không tương thích với thiết bị của bạn. Bạn vẫn muốn thử cài đặt? Bạn đang cài đè phiên bản cũ hơn của ứng dụng này. Làm như vậy có thể khiến cho ứng dụng không hoạt động được và thậm chí làm mất dữ liệu. Bạn vẫn muốn tiếp tục? diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml index 2b39a407b..623903528 100644 --- a/F-Droid/res/values-zh-rCN/strings.xml +++ b/F-Droid/res/values-zh-rCN/strings.xml @@ -1,8 +1,5 @@ - 找到 %1$d 个符合关键词 \'%2$s\' 的应用： - 找到 1 个符合关键词 \'%s\' 的应用： - 没有找到符合 \'%s\' 的应用 新版本签名与旧版本不同，请先卸载旧版本应用再安装新版本。（注意：卸载旧版本会清除该应用的所有已储存数据） 该应用程序好像与您的设备不兼容。您仍然要尝试安装吗？ 您正在降级该应用程序。这样做可能会使该程序无法工作，甚至丢失您的数据。您仍然要尝试降级吗？ diff --git a/F-Droid/res/values-zh-rHK/strings.xml b/F-Droid/res/values-zh-rHK/strings.xml index a87fb77e5..18237a70a 100644 --- a/F-Droid/res/values-zh-rHK/strings.xml +++ b/F-Droid/res/values-zh-rHK/strings.xml @@ -1,8 +1,5 @@ - 找到 %1$d 個符合「%2$s」的應用程式： - 找到 1 個符合「%s」的應用程式： - 找不到任何符合「%s」的應用程式 版本 刪除 啟用 NFC 傳送… diff --git a/F-Droid/res/values-zh-rTW/strings.xml b/F-Droid/res/values-zh-rTW/strings.xml index 603a5647f..0f2a094f3 100644 --- a/F-Droid/res/values-zh-rTW/strings.xml +++ b/F-Droid/res/values-zh-rTW/strings.xml @@ -1,9 +1,6 @@ F-Droid - 找到 %1$d 個跟「%2$s」有關的應用軟體： - 找到一個跟「%s」有關的應用軟體： - 找不到任何跟「%s」有關的應用軟體 此應用軟體的新版本被簽署了與舊版本不同的金鑰。如要安裝新版本，您必須將舊版本應用軟體先解除安裝。請於完成該操作後再嘗試一次。（注意解除安裝應用軟體時會清除任何由該應用軟體保存於系統中的所有資料） 看起來此軟體包與您的裝置並不相容。您無論如何都要嘗試安裝它嗎？ 您正在嘗試降級此應用軟體。這樣做可能會讓該應用軟體不能正常運作，甚至可能會造成您重要資料的流失。您確定無論如何都要試著降級它嗎？ diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml index e60b30152..222e9b6a2 100644 --- a/F-Droid/res/values/strings.xml +++ b/F-Droid/res/values/strings.xml @@ -3,9 +3,6 @@ F-Droid - Found %1$d applications matching \'%2$s\': - Found one application matching \'%s\': - No applications were found matching \'%s\' The new version is signed with a different key to the old one. To install the new version, the old one must be uninstalled first. Please do this and try again. (Note that uninstalling will erase any internal data stored by the application) It seems like this package is not compatible with your device. Do you want to try and install it anyway? You are trying to downgrade this application. Doing so might get it to malfunction and even lose your data. Do you want to try and downgrade it anyway? From 9c86655af008b14342b963debcda482aeab22e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 28 Feb 2016 14:19:02 +0000 Subject: [PATCH 2/5] Make some declaration accesses weaker As suggested by Android Studio. --- F-Droid/src/org/fdroid/fdroid/AppDetails.java | 16 ++++++++-------- F-Droid/src/org/fdroid/fdroid/FDroidApp.java | 2 +- .../src/org/fdroid/fdroid/FDroidCertPins.java | 2 +- F-Droid/src/org/fdroid/fdroid/Preferences.java | 2 +- F-Droid/src/org/fdroid/fdroid/RepoUpdater.java | 15 +++++++++------ .../src/org/fdroid/fdroid/compat/TabManager.java | 4 ++-- F-Droid/src/org/fdroid/fdroid/data/DBHelper.java | 2 +- .../fdroid/data/InstalledAppCacheUpdater.java | 8 ++++---- .../src/org/fdroid/fdroid/data/ValueObject.java | 2 +- .../org/fdroid/fdroid/installer/Installer.java | 8 ++++---- .../fdroid/localrepo/peers/BluetoothFinder.java | 2 +- .../fdroid/localrepo/peers/BonjourPeer.java | 2 +- .../fdroid/localrepo/type/BonjourBroadcast.java | 2 +- .../fdroid/net/AsyncDownloaderFromAndroid.java | 4 ++-- .../src/org/fdroid/fdroid/net/Downloader.java | 10 +++++----- .../src/org/fdroid/fdroid/net/LocalHTTPD.java | 4 ++-- .../fdroid/net/WifiStateChangeService.java | 2 +- .../privileged/install/InstallExtension.java | 14 +++++++------- .../install/InstallExtensionDialogActivity.java | 12 ++++++------ .../fdroid/fdroid/views/swap/StartSwapView.java | 6 +++--- 20 files changed, 61 insertions(+), 58 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index 8a9cb29e0..3770a235b 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -1043,7 +1043,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A public static class AppDetailsSummaryFragment extends Fragment { - protected final Preferences prefs; + final Preferences prefs; private AppDetailsData data; private static final int MAX_LINES = 5; private static boolean viewAllDescription; @@ -1076,11 +1076,11 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A data = (AppDetailsData) activity; } - protected App getApp() { + App getApp() { return data.getApp(); } - protected ApkListAdapter getApks() { + ApkListAdapter getApks() { return data.getApks(); } @@ -1436,7 +1436,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A private TextView progressSize; private TextView progressPercent; private ImageButton cancelButton; - protected final DisplayImageOptions displayImageOptions; + final DisplayImageOptions displayImageOptions; public static boolean installed; public static boolean updateWanted; @@ -1678,19 +1678,19 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A installListener = (AppInstallListener) activity; } - protected void install(final Apk apk) { + void install(final Apk apk) { installListener.install(apk); } - protected void remove() { + void remove() { installListener.removeApk(getApp().packageName); } - protected App getApp() { + App getApp() { return data.getApp(); } - protected ApkListAdapter getApks() { + ApkListAdapter getApks() { return data.getApks(); } diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java index f90207aa1..37dc218cd 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java @@ -362,7 +362,7 @@ public class FDroidApp extends Application { /** * Set the proxy settings based on whether Tor should be enabled or not. */ - public static void configureTor(boolean enabled) { + private static void configureTor(boolean enabled) { useTor = enabled; if (useTor) { NetCipher.useTor(); diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java index 79da8429c..9fe89f31b 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java +++ b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class FDroidCertPins { +class FDroidCertPins { private static final String[] DEFAULT_PINS = { // OU=PositiveSSL, CN=f-droid.org diff --git a/F-Droid/src/org/fdroid/fdroid/Preferences.java b/F-Droid/src/org/fdroid/fdroid/Preferences.java index c8570e6d4..ed9bc4df1 100644 --- a/F-Droid/src/org/fdroid/fdroid/Preferences.java +++ b/F-Droid/src/org/fdroid/fdroid/Preferences.java @@ -77,7 +77,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh public static final String DEFAULT_THEME = "light"; public static final String DEFAULT_PROXY_HOST = "127.0.0.1"; public static final int DEFAULT_PROXY_PORT = 8118; - public static final boolean DEFAULT_SHOW_NFC_DURING_SWAP = true; + private static final boolean DEFAULT_SHOW_NFC_DURING_SWAP = true; private static final boolean DEFAULT_FIRST_TIME = true; private static final boolean DEFAULT_POST_PRIVILEGED_INSTALL = false; diff --git a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java index cdb55020f..e1fd27d9c 100644 --- a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java @@ -54,10 +54,13 @@ public class RepoUpdater { public static final String PROGRESS_COMMITTING = "committing"; public static final String PROGRESS_DATA_REPO_ADDRESS = "repoAddress"; - @NonNull protected final Context context; - @NonNull protected final Repo repo; - protected boolean hasChanged; - @Nullable protected ProgressListener progressListener; + @NonNull + private final Context context; + @NonNull + private final Repo repo; + private boolean hasChanged; + @Nullable + private ProgressListener progressListener; private String cacheTag; private X509Certificate signingCertFromJar; @@ -82,7 +85,7 @@ public class RepoUpdater { return hasChanged; } - protected URL getIndexAddress() throws MalformedURLException { + private URL getIndexAddress() throws MalformedURLException { String urlString = repo.address + "/index.jar"; String versionName = Utils.getVersionName(context); if (versionName != null) { @@ -91,7 +94,7 @@ public class RepoUpdater { return new URL(urlString); } - Downloader downloadIndex() throws UpdateException { + private Downloader downloadIndex() throws UpdateException { Downloader downloader = null; try { downloader = DownloaderFactory.create(context, diff --git a/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java b/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java index cda6801c8..dc467c951 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java @@ -35,11 +35,11 @@ public class TabManager { this.pager = pager; } - protected CharSequence getLabel(int index) { + private CharSequence getLabel(int index) { return pager.getAdapter().getPageTitle(index); } - public void removeNotification(int id) { + private void removeNotification(int id) { parent.removeNotification(id); } diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java index 083abe138..f7d293b40 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java +++ b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java @@ -13,7 +13,7 @@ import org.fdroid.fdroid.Utils; import java.util.ArrayList; import java.util.List; -public class DBHelper extends SQLiteOpenHelper { +class DBHelper extends SQLiteOpenHelper { private static final String TAG = "DBHelper"; diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java index 9469b472e..6406fe961 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java @@ -32,7 +32,7 @@ public class InstalledAppCacheUpdater { private final List toInsert = new ArrayList<>(); private final List toDelete = new ArrayList<>(); - protected InstalledAppCacheUpdater(Context context) { + private InstalledAppCacheUpdater(Context context) { this.context = context; } @@ -59,7 +59,7 @@ public class InstalledAppCacheUpdater { updater.startBackgroundWorker(); } - protected boolean update() { + private boolean update() { long startTime = System.currentTimeMillis(); @@ -72,13 +72,13 @@ public class InstalledAppCacheUpdater { return hasChanged(); } - protected void notifyProviders() { + private void notifyProviders() { Utils.debugLog(TAG, "Installed app cache has changed, notifying content providers (so they can update the relevant views)."); context.getContentResolver().notifyChange(AppProvider.getContentUri(), null); context.getContentResolver().notifyChange(ApkProvider.getContentUri(), null); } - protected void startBackgroundWorker() { + private void startBackgroundWorker() { new PostponedWorker().execute(); } diff --git a/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java b/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java index 04f4e1fee..dca9e0a40 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java +++ b/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java @@ -4,7 +4,7 @@ import android.database.Cursor; class ValueObject { - protected void checkCursorPosition(Cursor cursor) throws IllegalArgumentException { + void checkCursorPosition(Cursor cursor) throws IllegalArgumentException { if (cursor.getPosition() == -1) { throw new IllegalArgumentException( "Cursor position is -1. " + diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java index 5b123a3f1..486d71144 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java @@ -37,9 +37,9 @@ import java.util.List; * instantiate a working Installer based on F-Droids granted permissions. */ public abstract class Installer { - protected final Context mContext; - protected final PackageManager mPm; - protected final InstallerCallback mCallback; + final Context mContext; + final PackageManager mPm; + final InstallerCallback mCallback; private static final String TAG = "Installer"; @@ -88,7 +88,7 @@ public abstract class Installer { void onError(int operation, int errorCode); } - public Installer(Context context, PackageManager pm, InstallerCallback callback) + Installer(Context context, PackageManager pm, InstallerCallback callback) throws AndroidNotCompatibleException { this.mContext = context; this.mPm = pm; diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java index a9a002070..89791a915 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java @@ -104,7 +104,7 @@ class BluetoothFinder extends PeerFinder { } - public void cancel() { + private void cancel() { if (adapter != null) { Utils.debugLog(TAG, "Stopping bluetooth discovery."); adapter.cancelDiscovery(); diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java index 1fd579d9a..1f3e5fc51 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java @@ -59,7 +59,7 @@ public class BonjourPeer extends WifiPeer { dest.writeParcelable(serviceInfo, flags); } - protected BonjourPeer(Parcel in) { + private BonjourPeer(Parcel in) { this((ServiceInfo) in.readParcelable(FDroidServiceInfo.class.getClassLoader())); } diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java index 11711ee49..d5e28c1c8 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java @@ -103,7 +103,7 @@ public class BonjourBroadcast extends SwapType { if (FDroidApp.ipAddressString != null) { try { return InetAddress.getByName(FDroidApp.ipAddressString); - } catch (UnknownHostException e) { } + } catch (UnknownHostException ignored) { } } return null; diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java index 5a77f547b..409e56e6f 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java +++ b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java @@ -191,7 +191,7 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader { return 0; } - protected void sendProgress(int bytesRead, int totalBytes) { + private void sendProgress(int bytesRead, int totalBytes) { Intent intent = new Intent(Downloader.LOCAL_ACTION_PROGRESS); intent.putExtra(Downloader.EXTRA_ADDRESS, remoteAddress); intent.putExtra(Downloader.EXTRA_BYTES_READ, bytesRead); @@ -321,7 +321,7 @@ public class AsyncDownloaderFromAndroid implements AsyncDownloader { * Check if a specific download is complete. * @return -1 if download is not complete, otherwise the download id */ - public static long isDownloadComplete(Context context, String uniqueDownloadId) { + private static long isDownloadComplete(Context context, String uniqueDownloadId) { DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE); DownloadManager.Query query = new DownloadManager.Query(); query.setFilterByStatus(DownloadManager.STATUS_SUCCESSFUL); diff --git a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java index 201697b97..24e96af71 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java +++ b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java @@ -33,8 +33,8 @@ public abstract class Downloader { protected final URL sourceUrl; protected String cacheTag; - protected int bytesRead; - protected int totalBytes; + private int bytesRead; + private int totalBytes; protected abstract InputStream getDownloadersInputStream() throws IOException; @@ -84,7 +84,7 @@ public abstract class Downloader { public abstract boolean hasChanged(); - public abstract int totalDownloadSize(); + protected abstract int totalDownloadSize(); /** * Helper function for synchronous downloads (i.e. those *not* using AsyncDownloadWrapper), @@ -149,7 +149,7 @@ public abstract class Downloader { * keeping track of the number of bytes that have flowed through for the * progress counter. */ - protected void copyInputToOutputStream(InputStream input, int bufferSize) throws IOException, InterruptedException { + private void copyInputToOutputStream(InputStream input, int bufferSize) throws IOException, InterruptedException { int bytesRead = 0; this.totalBytes = totalDownloadSize(); @@ -186,7 +186,7 @@ public abstract class Downloader { outputStream.close(); } - protected void sendProgress(int bytesRead, int totalBytes) { + private void sendProgress(int bytesRead, int totalBytes) { this.bytesRead = bytesRead; Intent intent = new Intent(LOCAL_ACTION_PROGRESS); intent.putExtra(EXTRA_ADDRESS, sourceUrl.toString()); diff --git a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java index dcb318d1f..8517e1189 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java +++ b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java @@ -216,7 +216,7 @@ public class LocalHTTPD extends NanoHTTPD { * Serves file from homeDir and its' subdirectories (only). Uses only URI, * ignores all headers and HTTP parameters. */ - Response serveFile(String uri, Map header, File file, String mime) { + private Response serveFile(String uri, Map header, File file, String mime) { Response res; try { // Calculate etag @@ -306,7 +306,7 @@ public class LocalHTTPD extends NanoHTTPD { return res; } - public static String getMimeTypeForFile(String uri) { + private static String getMimeTypeForFile(String uri) { String type = null; String extension = MimeTypeMap.getFileExtensionFromUrl(uri); if (extension != null) { diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java index 8c3e3ef69..3dd1e134b 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java +++ b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -197,7 +197,7 @@ public class WifiStateChangeService extends Service { } @TargetApi(9) - public void setIpInfoFromNetworkInterface() { + private void setIpInfoFromNetworkInterface() { try { for (Enumeration networkInterfaces = NetworkInterface.getNetworkInterfaces(); networkInterfaces.hasMoreElements();) { NetworkInterface netIf = networkInterfaces.nextElement(); diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java index 0241c9251..80ce7ac21 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java @@ -38,7 +38,7 @@ import eu.chainfire.libsuperuser.Shell; */ abstract class InstallExtension { - protected final Context context; + final Context context; private static final String APK_FILE_NAME = "FDroidPrivileged.apk"; @@ -67,7 +67,7 @@ abstract class InstallExtension { protected abstract String getSystemFolder(); - protected void onPreInstall() { + void onPreInstall() { // To be overridden by relevant base class[es] } @@ -79,7 +79,7 @@ abstract class InstallExtension { return context.getString(R.string.system_install_installing); } - protected String getInstallPath() { + String getInstallPath() { return getSystemFolder() + APK_FILE_NAME; } @@ -95,14 +95,14 @@ abstract class InstallExtension { return commands; } - protected List getCopyToSystemCommands(String apkPath) { + List getCopyToSystemCommands(String apkPath) { final List commands = new ArrayList<>(2); commands.add("cat " + apkPath + " > " + getInstallPath() + ".tmp"); commands.add("chmod 644 " + getInstallPath() + ".tmp"); return commands; } - protected List getPostInstallCommands() { + List getPostInstallCommands() { final List commands = new ArrayList<>(1); commands.add("am start -n org.fdroid.fdroid/.privileged.install.InstallExtensionDialogActivity --ez " + InstallExtensionDialogActivity.ACTION_POST_INSTALL + " true"); @@ -121,13 +121,13 @@ abstract class InstallExtension { return commands; } - protected List getCleanUninstallCommands() { + List getCleanUninstallCommands() { final List commands = new ArrayList<>(1); commands.add("rm -f " + getInstallPath()); return commands; } - protected List getPostUninstallCommands() { + List getPostUninstallCommands() { return new ArrayList<>(0); } diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java index 9d516d086..26bb0c299 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java @@ -59,7 +59,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity { public static final String ACTION_POST_INSTALL = "post_install"; public static final String ACTION_FIRST_TIME = "first_time"; - String apkFile; + private String apkFile; @Override protected void onCreate(Bundle savedInstanceState) { @@ -113,7 +113,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity { } } - public static void runFirstTime(final Context context) { + private static void runFirstTime(final Context context) { // don't do a "real" root access, just look up if "su" is present and has a version! // a real check would annoy the user AsyncTask checkRoot = new AsyncTask() { @@ -202,7 +202,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity { builder.create().show(); } - public void askBeforeInstall() { + private void askBeforeInstall() { // hack to get theme applied (which is not automatically applied due to activity's Theme.NoDisplay ContextThemeWrapper theme = new ContextThemeWrapper(this, FDroidApp.getCurThemeResId()); @@ -229,7 +229,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity { /** * 1. Check for root access */ - public final AsyncTask checkRootTask = new AsyncTask() { + private final AsyncTask checkRootTask = new AsyncTask() { ProgressDialog mProgressDialog; @Override @@ -299,7 +299,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity { /** * 2. Install into system */ - final AsyncTask installTask = new AsyncTask() { + private final AsyncTask installTask = new AsyncTask() { ProgressDialog mProgressDialog; @Override @@ -413,7 +413,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity { } } - final AsyncTask uninstallTask = new AsyncTask() { + private final AsyncTask uninstallTask = new AsyncTask() { ProgressDialog mProgressDialog; @Override diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java index 64e2004e7..507e03fc7 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java @@ -119,7 +119,7 @@ public class StartSwapView extends ScrollView implements SwapWorkflowActivity.In * When peers are emitted by the peer finder, add them to the adapter * so that they will show up in the list of peers. */ - private Subscriber onPeerFound = new Subscriber() { + private final Subscriber onPeerFound = new Subscriber() { @Override public void onCompleted() { @@ -185,7 +185,7 @@ public class StartSwapView extends ScrollView implements SwapWorkflowActivity.In onWifiNetworkChanged, new IntentFilter(WifiStateChangeService.BROADCAST)); } - private BroadcastReceiver onWifiNetworkChanged = new BroadcastReceiver() { + private final BroadcastReceiver onWifiNetworkChanged = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { uiUpdateWifiNetwork(); @@ -271,7 +271,7 @@ public class StartSwapView extends ScrollView implements SwapWorkflowActivity.In /** * @see StartSwapView#onWifiSwapStateChanged */ - private BroadcastReceiver onBluetoothSwapStateChanged = new BroadcastReceiver() { + private final BroadcastReceiver onBluetoothSwapStateChanged = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { if (intent.hasExtra(SwapService.EXTRA_STARTING)) { From 3af5f55abdb8145842b8c35245f2acfd0f92d691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 28 Feb 2016 14:22:27 +0000 Subject: [PATCH 3/5] Remove unused repo field Found by Android Studio. --- F-Droid/src/org/fdroid/fdroid/ProgressBufferedInputStream.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/ProgressBufferedInputStream.java b/F-Droid/src/org/fdroid/fdroid/ProgressBufferedInputStream.java index a965f053a..6327a14ee 100644 --- a/F-Droid/src/org/fdroid/fdroid/ProgressBufferedInputStream.java +++ b/F-Droid/src/org/fdroid/fdroid/ProgressBufferedInputStream.java @@ -11,7 +11,6 @@ import java.io.InputStream; public class ProgressBufferedInputStream extends BufferedInputStream { private static final String TAG = "ProgressBufferedInputSt"; - private final Repo repo; private final ProgressListener progressListener; private final Bundle data; private final int totalBytes; @@ -26,7 +25,6 @@ public class ProgressBufferedInputStream extends BufferedInputStream { throws IOException { super(in); this.progressListener = progressListener; - this.repo = repo; this.data = new Bundle(1); this.data.putString(RepoUpdater.PROGRESS_DATA_REPO_ADDRESS, repo.address); this.totalBytes = totalBytes; From d061dafcd74f32c03d474e354894cd688fd0e6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sun, 28 Feb 2016 14:29:51 +0000 Subject: [PATCH 4/5] Remove a few extra spaces that checkstyle missed There's also a change in a SQL string, but it should be safe. --- F-Droid/src/org/fdroid/fdroid/AppDetails.java | 2 +- F-Droid/src/org/fdroid/fdroid/data/DBHelper.java | 2 +- .../fdroid/fdroid/privileged/views/InstallConfirmActivity.java | 2 +- .../test/src/org/fdroid/fdroid/InstalledAppProviderTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java index 3770a235b..6fe4e8da4 100644 --- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java +++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java @@ -1199,7 +1199,7 @@ public class AppDetails extends AppCompatActivity implements ProgressListener, A final Spanned desc = Html.fromHtml(app.description, null, new Utils.HtmlTagHandler()); description.setMovementMethod(SafeLinkMovementMethod.getInstance(getActivity())); description.setText(trimNewlines(desc)); - final View viewMoreDescription = view.findViewById(R.id.view_more_description); + final View viewMoreDescription = view.findViewById(R.id.view_more_description); description.post(new Runnable() { @Override public void run() { diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java index f7d293b40..dce66b2a3 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java +++ b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java @@ -175,7 +175,7 @@ class DBHelper extends SQLiteOpenHelper { db.execSQL(createTableDdl); - String nonIdFields = "address, name, description, inuse, priority, " + + String nonIdFields = "address, name, description, inuse, priority, " + "pubkey, fingerprint, maxage, version, lastetag, lastUpdated"; String insertSql = "INSERT INTO " + TABLE_REPO + diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java b/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java index 081713243..73bd55830 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java @@ -103,7 +103,7 @@ public class InstallConfirmActivity extends Activity implements OnCancelListener } adapter.addTab(tabHost.newTabSpec(TAB_ID_NEW).setIndicator( getText(R.string.newPerms)), mScrollView); - } else { + } else { findViewById(R.id.tabscontainer).setVisibility(View.GONE); findViewById(R.id.divider).setVisibility(View.VISIBLE); } diff --git a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java index 351798a67..21386d660 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java +++ b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java @@ -114,7 +114,7 @@ public class InstalledAppProviderTest extends FDroidProviderTest Date: Sun, 28 Feb 2016 14:30:43 +0000 Subject: [PATCH 5/5] Bump checkstyle to 6.16 Due to fixes and improvements, some new checkstyle changes are due. --- F-Droid/build.gradle | 2 +- F-Droid/src/org/fdroid/fdroid/data/DBHelper.java | 2 +- .../src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java | 2 +- .../src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java | 3 +-- Privileged-Extension/build.gradle | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle index 92cabd569..d4f50c534 100644 --- a/F-Droid/build.gradle +++ b/F-Droid/build.gradle @@ -192,7 +192,7 @@ android { } checkstyle { - toolVersion = '6.15' + toolVersion = '6.16' } task checkstyle(type: Checkstyle) { diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java index dce66b2a3..1f0fe24f3 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java +++ b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java @@ -110,7 +110,7 @@ class DBHelper extends SQLiteOpenHelper { private final Context context; - public DBHelper(Context context) { + DBHelper(Context context) { super(context, DATABASE_NAME, null, DB_VERSION); this.context = context; } diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java index 6406fe961..137921cf7 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java @@ -23,7 +23,7 @@ import java.util.Map; * TODO: The content providers are not thread safe, so it is possible we will be writing * to the database at the same time we respond to a broadcasted intent. */ -public class InstalledAppCacheUpdater { +public final class InstalledAppCacheUpdater { private static final String TAG = "InstalledAppCache"; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 2e1f6edac..b5f8ed5c0 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -774,8 +774,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { public void run() { new SwapDebug().logStatus(); } - }, - 1000 + }, 1000 ); } } diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle index a0a55d871..f87e5543e 100644 --- a/Privileged-Extension/build.gradle +++ b/Privileged-Extension/build.gradle @@ -36,7 +36,7 @@ android { } checkstyle { - toolVersion = '6.15' + toolVersion = '6.16' } task checkstyle(type: Checkstyle) {