Merge branch 'lint-checkstyle' into 'master'

Lint fixes and checkstyle update



See merge request !219

F-Droid/build.gradle

@@ -192,7 +192,7 @@ android {
 }
 
 checkstyle {
-    toolVersion = '6.15'
+    toolVersion = '6.16'
 }
 
 task checkstyle(type: Checkstyle) {

F-Droid/res/layout/searchresults.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="2dp"
-    android:paddingStart="2dp"
-    android:paddingRight="2dp"
-    android:paddingEnd="2dp"
-    android:baselineAligned="false"
-    android:orientation="vertical">
-
-    <TextView android:id="@+id/description"
-        android:singleLine="false"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="4dp"
-        android:gravity="center" />
-
-    <ListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
-
-</LinearLayout>

F-Droid/res/values-ar/strings.xml

@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="searchres_oneapp">عثر على تطبيق واحد يوافق \'%s\':</string>
-  <string name="searchres_noapps">لم يعثر على أي تطبيق يوافق \'%s\'</string>
   <string name="version">الإصدار</string>
   <string name="delete">حذف</string>
   <string name="updates">التحديثات</string>
@@ -67,7 +65,6 @@
   <string name="category_System">النظام</string>
   <string name="app_name">F-Droid</string>
 
-    <string name="searchres_napps">العثور على%1$d من التطبيقات مطابقة \'%2$s\':</string>
     <string name="SignatureMismatch">توقيع الإصدار الجديد مع مفتاح مختلفة إلى واحدة من العمر. لتثبيت الإصدار الجديد، القديم يجب أن يتم إلغاء تثبيت أولا. يرجى القيام بذلك وحاول مرة أخرى. (لاحظ أن ذلك إلغاء تثبيت محو أي بيانات داخلية تخزينها من قبل التطبيق)</string>
     <string name="installIncompatible">يبدو مثل هذه الحزمة غير متوافق مع جهازك. هل ترغب في محاولة لتثبيته على أي حال؟</string>
     </resources>

F-Droid/res/values-ast/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Alcontráronse %1$d aplicaciones que concasen con «%2$s»:</string>
-  <string name="searchres_oneapp">Alcontróse una aplicación que concasa con «%s»:</string>
-  <string name="searchres_noapps">Nun s\'alcontraron aplicaciones que concasen con «%s»</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Paez qu\'esti paquete nun ye compatible col to preséu. ¿Quies intentar instalalu de toes toes?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-bg/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Намерени са %1$d приложения съвпадащи с \"%2$s\":</string>
-  <string name="searchres_oneapp">Намерено е едно приложение съвпадащо с \"%s\":</string>
-  <string name="searchres_noapps">Не са намерени приложения съвпадащи с \"%s\"</string>
   <string name="SignatureMismatch">Новата версия е подписана с различен ключ. За да бъде инсталирана първо трябва да деинсталирате старата версия. (Забележка: деинсталирането ще доведе до изтриване на данни съхранявани от старата версия.)</string>
   <string name="installIncompatible">Изглежда пакетът не е съвместим с вашето устройство. Да бъде направен опит за инсталиране въпреки това?</string>
   <string name="installDowngrade">Опитвате се да инсталирате по-стара версия на приложението. Това действие може да предизвика нестабилност и дори загуба на данни. Наистина ли желаете да продължите?</string>

F-Droid/res/values-ca/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">S\'ha trobat %1$d aplicacions coincidents amb \'%2$s\':</string>
-  <string name="searchres_oneapp">S\'ha trobat una aplicació coincident amb \'%s\':</string>
-  <string name="searchres_noapps">No hi ha aplicacions coincidents amb \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Sembla que aquest paquet no és compatible amb el vostre dispositiu. Voleu provar a instaŀlar-lo de totes maneres?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-cs/strings.xml

@@ -1,7 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_oneapp">Nalezena jedna aplikace odpovídající \'%s\':</string>
-  <string name="searchres_noapps">Nenalezeny žádné aplikace odpovídající \'%s\'</string>
   <string name="SignatureMismatch">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.)</string>
   <string name="installIncompatible">Zdá se, že balíček není kompatibilní s tímto zařízením. Chcete ho přesto zkusit nainstalovat?</string>
   <string name="installDowngrade">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?</string>
@@ -143,7 +141,6 @@
   <string name="open_qr_code_scanner">Otevřít čtečku QR kódů</string>
   <string name="swap_welcome">Vítejte v aplikaci F-Droid!</string>
   <string name="swap_confirm_connect">Chceš nyní stáhnout aplikace z %1$s?</string>
-<string name="searchres_napps">Nalezeno %1$d aplikací odpovídajících \"%2$s\":</string>
     <string name="uninstall_system">Aktualizovat/odinstalovat privilegovaná rozšíření</string>
     <string name="uninstall_system_summary">Otevřít obrazovku detailů privilegovaných rozšíření pro aktualizaci/deinstalaci</string>
     <string name="about_source">Zdrojový kód</string>

F-Droid/res/values-da/strings.xml

@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="app_name">F-Droid</string>
 
-    <string name="searchres_napps">Fandt %1$d programmer som matcher \'%2$s\':</string>
-    <string name="searchres_oneapp">Fandt et program som matcher \'%s\':</string>
-    <string name="searchres_noapps">Fandt ingen programmer som matcher \'%s\'</string>
     <string name="SignatureMismatch">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)</string>
     <string name="installIncompatible">Det ser ud til at denne pakke er inkompatibel med din enhed. Vil du forsøge at installere den alligevel?</string>
     <string name="installDowngrade">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?</string>

F-Droid/res/values-de/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">%1$d Anwendungen mit »%2$s« gefunden:</string>
-  <string name="searchres_oneapp">Eine Anwendung mit »%s« gefunden:</string>
-  <string name="searchres_noapps">Keine Anwendung mit »%s« gefunden</string>
   <string name="SignatureMismatch">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.)</string>
   <string name="installIncompatible">Es sieht so aus, als sei dieses Paket mit Ihrem Gerät nicht kompatibel. Möchten Sie trotzdem versuchen, es zu installieren?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-el/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Βρέθηκαν %1$d εφαρμογές που συσχετίζονται με \'%2$s\':</string>
-  <string name="searchres_oneapp">Βρέθηκε μια εφαρμογή που συσχετίζεται με \'%s\':</string>
-  <string name="searchres_noapps">Δε βρέθηκαν εφαρμογές που να συσχετίζονται με το \'%s\'</string>
   <string name="SignatureMismatch">Η καινούργια έκδοση είναι υπογεγραμμένη με διαφορετικό κλειδί από την παλιά. Για να γίνει η εγκατάσταση της καινούργιας έκδοσης, πρέπει να γίνει πρώτα η απεγκατάσταση της παλιάς έκδοσης. Παρακαλώ όπως το κάνετε αυτό και προσπαθήστε ξανά. (Σημειώστε ότι η απεγκατάσταση θα διαγράψει οποιαδήποτε εσωτερικά δεδομένα που αποθηκεύονται από την εφαρμογή)</string>
   <string name="installIncompatible">Φαίνεται ότι αυτό το πακέτο δεν είναι συμβατό με τη συσκευή σας. Θα θέλατε να δοκιμάσετε να το εγκαταστήσετε ούτως ή άλλως;</string>
   <string name="installDowngrade">Προσπαθείτε να υποβαθμίσετε αυτήν την εφαρμογή. Αν το κάνετε αυτό, μπορεί να προκληθούν προβλήματα στην εφαρμογή ή ακόμα και να χάσετε τα δεδομένα σας. Θέλετε να δοκιμάσετε να την υποβαθμίσετε ούτως ή άλλως;</string>

F-Droid/res/values-eo/strings.xml

@@ -116,10 +116,7 @@
     <string name="unstable_updates">Nestabilaj ĝisdatigoj</string>
     <string name="update_interval">Intervalo de aŭtomata ĝisdatigo</string>
     <string name="installDowngrade">Vi klopodas malpromocii ĉi tiun aplikaĵon. Fari tion eble malfunkciigos ĝin kaj eĉ perdigos viajn datumojn. Ĉu vi volas klopodi malpromocii ĝin ĉiaokaze?</string>
-    <string name="searchres_napps">Trovitaj %1$d aplikaĵojn kongruante \'%2$s\':</string>
-    <string name="searchres_oneapp">Trovita unu aplikaĵon kongruante \'%s\':</string>
     <string name="SignatureMismatch">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)</string>
-    <string name="searchres_noapps">Neniu aplikaĵo trovita kongruante \'%s\'</string>
     <string name="by_author">de</string>
     <string name="enable_nfc_send">Aktivigi sendadon tra NFC…</string>
     <string name="cache_downloaded">Kaŝmemorigi pakaĵojn</string>

F-Droid/res/values-es/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Se encontraron %1$d aplicaciones con \'%2$s\':</string>
-  <string name="searchres_oneapp">Se encontró una aplicación con \'%s\':</string>
-  <string name="searchres_noapps">No se encontró ninguna aplicación con \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Parece que este paquete no es compatible con el dispositivo. ¿Quieres probar e instalarlo de todos modos?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-eu/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">\'%2$s\'-rekin bat datozen %1$d aplikazio aurkitu dira:</string>
-  <string name="searchres_oneapp">\'%s\'-rekin bat datorren aplikazio bat aurkitu da:</string>
-  <string name="searchres_noapps">\'%s\'-rekin bat datorren aplikaziorik ez da aurkitu</string>
   <string name="SignatureMismatch">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)</string>
   <string name="version">Bertsioa</string>
   <string name="delete">Ezabatu</string>

F-Droid/res/values-fa/strings.xml

@@ -75,9 +75,6 @@
   <string name="requires_features">نیاز دارد: %1$s</string>
 <string name="app_name">اف‌دروید</string>
 
-    <string name="searchres_napps">%1$d کارهٔ مطابق با «%2$s» پیدا شد:</string>
-    <string name="searchres_oneapp">یک کارهٔ مطابق با «%s» پیدا شد:</string>
-    <string name="searchres_noapps">هیچ کارهٔ مطابق با «%s» پیدا نشد</string>
     <string name="SignatureMismatch">نگارش جدید با کلیدی متفاوت با قبلی امضا شده است. برای نصب نگارش جدید، باید نخست نگارش قدیمی را حذف کرد. لطفاً این کار را انجام داده و دوباره تلاش کنید. (به خاطر داشته باشید حذف نصب، تمام داده‌های درونی دخیره شدهٔ کاره را پاک می‌کند)</string>
     <string name="version">نگارش</string>
     <string name="enable_nfc_send">فعّال کردن ارسال NFC…</string>

F-Droid/res/values-fi/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Löydettiin %1$d sovellusta, jotka täsmäävät \'%2$s\':</string>
-  <string name="searchres_oneapp">Löydettiin yksi sovellus, joka täsmää \'%s\':</string>
-  <string name="searchres_noapps">Sovelluksia, jotka täsmäävät \'%s\' ei löytynyt</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Tämä paketti ei näytä olevan yhteensopiva laitteesi kanssa. Haluatko silti asentaa sen?</string>
   <string name="installDowngrade">Sovellusta päivitetään vanhempaan versioon. Sovellus voi toimia väärin tai kadottaa tietojasi. Haluatko päivittää vanhempaan versioon?</string>

F-Droid/res/values-fr/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="searchres_napps">%1$d applications contenant \"%2$s\" ont été trouvées :</string>
-  <string name="searchres_oneapp">Une application contenant \"%s\" a été trouvée :</string>
-  <string name="searchres_noapps">Aucune application contenant \"%s\" n\'a été trouvée</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Il semble que ce paquet ne soit pas compatible avec votre appareil. Voulez-vous quand même essayer de l\'installer ?</string>
   <string name="installDowngrade">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 ?</string>

F-Droid/res/values-gl/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Atopáronse %1$d aplicativos que cadran con \'%2$s\':</string>
-  <string name="searchres_oneapp">Atopouse un aplicativo que cadra con \'%s\':</string>
-  <string name="searchres_noapps">Non se atoparon aplicativos que cadren con \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Parece que este paquete non é compatíbel co seu dispositivo. Quere facer a proba e instalalo aínda así?</string>
   <string name="installDowngrade">Está tentando instalar unha versión anterior. Isto pode supoñer un mal funcionamento ou perda de datos. Quere tentalo de todas maneiras?</string>

F-Droid/res/values-he/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="searchres_napps">נמצאו %1$d אפליקציות תואמות \'%2$s\':</string>
-    <string name="searchres_oneapp">נמצאה אפליקציה אחת תואמת \'%s\':</string>
-    <string name="searchres_noapps">לא נמצאו אפליקציות תואמות את \'%s\'</string>
     <string name="installIncompatible">נראה כי חבילה זו אינה תואמת את מכשירך. האם ברצונך להתקין אותה בכל מקרה?</string>
     <string name="installDowngrade">הינך מנסה להנמיך את אפליקציה זו. פעולה שכזו עלולה לגרום לתפקוד לקוי ואף לאיבוד מידע. האם ברצונך לנסות להנמיך בכל מקרה?</string>
     <string name="version">גרסה</string>

F-Droid/res/values-hu/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">%1$d alkalmazástalálat ehhez: \'%2$s\':</string>
-  <string name="searchres_oneapp">Egy alkalmazástalálat ehhez: \'%s\':</string>
-  <string name="searchres_noapps">\"Nincs ezzel \'%s\' egyező alkalmazás\"</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Úgy tűnik, ez a csomag nem kompatibilis a készülékkel. Ennek ellenére is megpróbálja telepíteni?</string>
   <string name="installDowngrade">Ö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?</string>

F-Droid/res/values-id/strings.xml

@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources><string name="app_name">F-Droid</string>
 
-    <string name="searchres_napps">Menemukan %1$d aplikasi yang cocok dengan \'%2$s\':</string>
-    <string name="searchres_oneapp">Menemukan satu aplikasi yang cocok dengan \'%s\':</string>
-    <string name="searchres_noapps">Tidak ada aplikasi yang cocok dengan \'%s\'</string>
     <string name="installIncompatible">Sepertinya versi paket ini tidak kompatibel dengan perangkat Anda. Apakah Anda tetap ingin memasang dan mencobanya?</string>
     <string name="installDowngrade">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?</string>
     <string name="version">Versi</string>

F-Droid/res/values-it/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Trovate %1$d applicazioni corrispondenti a \'%2$s\':</string>
-  <string name="searchres_oneapp">Trovata un\'applicazione corrispondente a \'%s\':</string>
-  <string name="searchres_noapps">Non è stata trovata nessuna applicazione corrispondente a \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Sembra che questo pacchetto non sia compatibile con il tuo dispositivo. Vuoi provare comunque ad installarlo?</string>
   <string name="installDowngrade">Stai provando a passare ad una versione precedente di questa applicazione. Potresti avere malfunzionamenti e perdite di dati. Vuoi installarla comunque?</string>

F-Droid/res/values-ja/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">\'%2$s\' に適合する %1$d ｱﾌﾟﾘｹｰｼｮﾝが見つかりました:</string>
-  <string name="searchres_oneapp">\'%s\' に適合する 1 ｱﾌﾟﾘｹｰｼｮﾝが見つかりました:</string>
-  <string name="searchres_noapps">\'%s\' に適合するｱﾌﾟﾘｹｰｼｮﾝは見つかりませんでした</string>
   <string name="SignatureMismatch">新しいﾊﾞｰｼﾞｮﾝは､以前のものと異なる暗号鍵で署名されています｡新しいﾊﾞｰｼﾞｮﾝをｲﾝｽﾄｰﾙするには､まず以前のﾊﾞｰｼﾞｮﾝをｱﾝｲﾝｽﾄｰﾙする必要があります｡その後で再度実行してください｡(ｱﾌﾟﾘｹｰｼｮﾝをｱﾝｲﾝｽﾄｰﾙすると保存したﾃﾞｰﾀｰが消えることに注意してください)</string>
   <string name="installIncompatible">このﾊﾟｯｹｰｼﾞはあなたの端末と互換性がないようです｡それでもｲﾝｽﾄｰﾙを続行しますか?</string>
   <string name="installDowngrade">このｱﾌﾟﾘｹｰｼｮﾝをﾀﾞｳﾝｸﾞﾚｰﾄﾞしようとしています｡これにより不具合を発生させたりﾃﾞｰﾀを失ったりする場合があります｡それでもﾀﾞｳﾝｸﾞﾚｰﾄﾞを続行しますか?</string>

F-Droid/res/values-ko/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">\'%2$s\' 검색결과 (%1$d개)</string>
-  <string name="searchres_oneapp">\'%s\' 검색결과:</string>
-  <string name="searchres_noapps">\'%s\' 와 일치하는 응용프로그램을 찾을 수 없습니다.</string>
   <string name="SignatureMismatch">새 버전은 기존 버전과 다른 키로 서명되어 있습니다. 새 버전을 설치하려면 기존 버전을 반드시 먼저 삭제해야 합니다. 그 다음에 다시 시도하세요. (참고로, 삭제를 할 경우 앱이 저장한 모든 내부 자료도 같이 삭제됩니다)</string>
   <string name="installIncompatible">이 패키지가 기기와 호환되지 않는 것 같습니다. 계속 설치를 진행할까요?</string>
   <string name="installDowngrade">이 응용 프로그램의 다운그레이드 하려고 합니다. 이전 버전을 설치할 경우, 응용 프로그램에 데이터가 손상되거나 오작동이 발생할 수 있습니다. 정말로 다운그레이드하시겠습니까?</string>

F-Droid/res/values-nb/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="searchres_napps">Fant %1$d programmer som samsvarer med \'%2$s\':</string>
-  <string name="searchres_oneapp">Fant ett program som samsvarer med \'%s\':</string>
-  <string name="searchres_noapps">Fant ingen program som samsvarer med \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Det ser ut til at denne pakken ikke er kompatibel med ditt utstyr. Vil du prøve å installere det likevel?</string>
   <string name="installDowngrade">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 ?</string>

F-Droid/res/values-nl/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="searchres_napps">%1$d applicaties gevonden die voldoen aan \'%2$s\':</string>
-  <string name="searchres_oneapp">Eén applicatie gevonden die voldoet aan \'%s\':</string>
-  <string name="searchres_noapps">Geen applicaties gevonden die voldoen aan \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Dit pakket is niet compatibel met uw apparaat. Wilt u het alsnog proberen te installeren?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-pl/strings.xml

@@ -140,9 +140,6 @@ Uwaga: Wszystkie poprzednio zainstalowane aplikacje zostaną na urządzeniu.</st
   <string name="swap_confirm_connect">Czy wymienić aplikacje z %1$s?</string>
 <string name="app_name">F-Droid</string>
 
-    <string name="searchres_napps">Znaleziono %1$d wyników pasujących do zapytania \'%2$s\':</string>
-    <string name="searchres_oneapp">Znaleziono jedną aplikację pasującą do zapytania \'%s\':</string>
-    <string name="searchres_noapps">Nie znaleziono żadnych wyników dla zapytania \'%s\'</string>
     <string name="SignatureMismatch">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ń)</string>
     <string name="installDowngrade">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ć?</string>
     <string name="cache_downloaded_on">Trzymaj pobrane pliki .apk na urządzeniu by móc ich potem używać w trybie offline</string>

F-Droid/res/values-pt-rBR/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Encontramos %1$d aplicativos correspondentes a \'%2$s\':</string>
-  <string name="searchres_oneapp">Encontramos um aplicativo correspondente a \'%s\':</string>
-  <string name="searchres_noapps">Não foram encontrados aplicativos correspondentes a \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Aparentemente este pacote não é compatível com o seu dispositivo. Quer tentar instalá-lo mesmo assim?</string>
   <string name="installDowngrade">Você está tentando desatualizar este aplicativo. Isso pode causar mal funcionamento e eventualmente perda de dados. Você quer tentar desatualizá-lo mesmo assim?</string>

F-Droid/res/values-pt-rPT/strings.xml

@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="app_name">F-Droid</string>
 
-    <string name="searchres_napps">Encontradas %1$d aplicações coincidentes com \'%2$s\':</string>
-    <string name="searchres_oneapp">Encontrada uma aplicação coincidente com \'%s\':</string>
-    <string name="searchres_noapps">Não foram encontradas aplicações correspondentes a \'%s\'</string>
     <string name="SignatureMismatch">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)</string>
     <string name="installIncompatible">Parece que este pacote não é compatível com o seu dispositivo. Deseja tentar a instalação?</string>
     <string name="installDowngrade">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?</string>

F-Droid/res/values-ro/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="searchres_napps">S-au gasit %1$d aplicatii ce se potrivesc cu \'%2$s\':</string>
-  <string name="searchres_oneapp">S-a gasit o aplicatie ce se potriveste cu \'%s\':</string>
-  <string name="searchres_noapps">Nici o aplicatie nu se potriveste cu \'%s\'</string>
   <string name="version">Versiune</string>
   <string name="delete">Sterge</string>
   <string name="cache_downloaded">Pastreaza pachete</string>

F-Droid/res/values-ru/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">По запросу \'%2$s\' найдено %1$d приложений:</string>
-  <string name="searchres_oneapp">Найдено одно приложение по запросу \'%s\':</string>
-  <string name="searchres_noapps">По запросу \'%s\' ничего не найдено</string>
   <string name="SignatureMismatch">Новая версия подписана ключом, отличным от старого. Перед установкой новой версии необходимо удалить старую. Сделайте это и попробуйте ещё раз. (При удалении приложения все его данные будут потеряны)</string>
   <string name="installIncompatible">Похоже, этот пакет несовместим с вашим устройством. Всё равно установить?</string>
   <string name="installDowngrade">Вы пытаетесь установить более старую версию приложения. Это может привести к его некорректной работе и даже потере данных. Вы уверены, что хотите продолжить?</string>

F-Droid/res/values-sc/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Agatadas %1$d aplicatziones currispondentes cun \'%2$s\':</string>
-  <string name="searchres_oneapp">Agatada una aplicatzione currispondente cun \'%s\':</string>
-  <string name="searchres_noapps">Non sunt istadas agatadas aplicatziones currispondentes cun \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Paret chi custu pachete non siat cumpatìbile cun su dispositivu tuo. Boles a proare a lu installare su matessi?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-sk/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="searchres_napps">Nájdených %1$d zodpovedajúcich \'%2$s\':</string>
-  <string name="searchres_oneapp">Nájdená jedna aplikácia zodpovedajúca \'%s\':</string>
-  <string name="searchres_noapps">Žiadna aplikácia nezodpovedá \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Zdá sa, že tento balíček nie je kompatibilný s vašim zariadením. Chcete ho napriek tomu nainštalovať?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-sl/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Najdenih %1$d applikacij, ki ustrezajo \'%2$s\':</string>
-  <string name="searchres_oneapp">Najdena ena aplikacija, ki ustreza \'%s\':</string>
-  <string name="searchres_noapps">Nobena aplikacija ne ustreza \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="version">Različica</string>
   <string name="cache_downloaded">Predpomnilnik naloženih aplikacij</string>

F-Droid/res/values-sq/strings.xml

@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources><string name="app_name">F-Droid</string>
 
-    <string name="searchres_napps">U gjetën %1$d aplikacione që përputhem me \'%2$s\':</string>
-    <string name="searchres_oneapp">U gjet një aplikacion që përputhet me \'%s\':</string>
-    <string name="searchres_noapps">Nuk u gjetën aplikacione që përputhen me \'%s\'</string>
     <string name="SignatureMismatch">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)</string>
     <string name="installIncompatible">Mesa duket kjo paketë nuk përputhet me pajisjen tuaj. Dëshironi të provoni ta instaloni sidoqoftë?</string>
     <string name="version">Versioni</string>

F-Droid/res/values-sr/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Нађено је %1$d апликација који садрже „%2$s“:</string>
-  <string name="searchres_oneapp">Једна апликација садржи „%s“:</string>
-  <string name="searchres_noapps">Ниједна апликација не садржи „%s“</string>
   <string name="SignatureMismatch">Ново издање је потписано другачијим кључем од старог. Да бисте инсталирали ново издање, најпре уклоните старо. (Имајте на уму да уклањањем такође бришете унутрашње податке апликације.)</string>
   <string name="installIncompatible">Изгледа да овај пакет не одговара вашем уређају. Желите ли свеједно да га инсталирате?</string>
   <string name="installDowngrade">Покушавате да инсталирате старије издање ове апликације. То може довести до отказа и губитка података. Желите ли заиста да инсталирате старије издање?</string>

F-Droid/res/values-sv/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Hittade %1$d program som matchade \'%2$s\':</string>
-  <string name="searchres_oneapp">Ett program matchade \'%s\':</string>
-  <string name="searchres_noapps">Inga program matchade \'%s\'</string>
   <string name="SignatureMismatch">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.)</string>
   <string name="installIncompatible">Det verkar som att det här paketet inte är kompatibelt med din enhet. Vill du testa att installera det ändå?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-tr/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">\'%2$s\' ile eşleşen %1$d uygulama bulundu:</string>
-  <string name="searchres_oneapp">\'%s\' ile eşleşen bir uygulama bulundu:</string>
-  <string name="searchres_noapps">\'%s\' ile eşleşen hiçbir uygulama bulunamadı</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Bu paket cihazınızla uyumlu değil gibi görünüyor. Yine de kurmayı denemek istiyor musunuz?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-ug/strings.xml

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="searchres_napps">بۇ \'%2$s\'غا ماس كېلىدىغان %1$d ئەپنى تاپتى:</string>
-  <string name="searchres_oneapp">\'%s\' غا ماس كېلىدىغان بىر ئەپنى تاپتى:</string>
-  <string name="searchres_noapps">\'%s\' غا ماس كېلىدىغان ھېچقانداق ئەپنى تاپالمىدى</string>
   <string name="SignatureMismatch">بۇ يېڭى نەشرى كونا نەشرىنىڭكى بىلەن پەرقلىق ئاچقۇچ بىلەن ئىمزا قويۇلغان. ئالدى بىلەن كونا نەشرىنى ئۆچۈرۈۋېتىپ ئاندىن يېڭى نەشرىنى ئورنىتىڭ. بۇ مەشغۇلاتنى قىلىپ ئاندىن قايتا سىناڭ. (دىققەت كونا نەشرى ئۆچۈرۈلسە شۇ ئەپتە ساقلانغان ھەممە سانلىق مەلۇماتلارمۇ ئۆچۈرۈلىدۇ)</string>
   <string name="installIncompatible">بۇ بوغچا ئۈسكۈنىڭىز بىلەن ماسلاشمايدىغاندەك تۇرىدۇ، ئۇنى سىناپ ئورنىتىۋېرەمسىز؟</string>
   <string name="installDowngrade">بۇ ئەپنىڭ دەرىجىسىنى تۆۋەنلىتىشنى سىناۋاتىسىز. بۇ مەشغۇلاتنى ئىجرا قىلىش داۋامىدا كاشىلا كۆرۈلۈشى ۋە سانلىق مەلۇماتلىرىڭىزنى يوقۇتۇپ قويۇشىڭىز مۇمكىن. ئۇنى سىناپ دەرىجىسىنى تۆۋەنلىتىۋېرەمسىز؟</string>

F-Droid/res/values-uk/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Знайдено %1$d програм за запитом «%2$s»:</string>
-  <string name="searchres_oneapp">Знайдено програму за запитом «%s»:</string>
-  <string name="searchres_noapps">Не знайдено програм за запитом «%s».</string>
   <string name="SignatureMismatch">Нова версія підписана не тим ключем, що стара. Перш ніж встановити нову версію, самостійно зітріть стару. (Зауважте, що стирання програми призведе до знищення всіх даних цієї програми)</string>
   <string name="version">Версія</string>
   <string name="cache_downloaded">Зберігати пакунки</string>

F-Droid/res/values-vi/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">Tìm thấy %1$d ứng dụng với từ khoá \'%2$s\':</string>
-  <string name="searchres_oneapp">Tìm thấy một ứng dụng với từ khoá \'%s\':</string>
-  <string name="searchres_noapps">Không tìm thấy ứng dụng với từ khoá \'%s\'</string>
   <string name="SignatureMismatch">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)</string>
   <string name="installIncompatible">Ứ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?</string>
   <string name="installDowngrade">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?</string>

F-Droid/res/values-zh-rCN/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">找到 %1$d 个符合关键词 \'%2$s\' 的应用：</string>
-  <string name="searchres_oneapp">找到 1 个符合关键词 \'%s\' 的应用：</string>
-  <string name="searchres_noapps">没有找到符合 \'%s\' 的应用</string>
   <string name="SignatureMismatch">新版本签名与旧版本不同，请先卸载旧版本应用再安装新版本。（注意：卸载旧版本会清除该应用的所有已储存数据）</string>
   <string name="installIncompatible">该应用程序好像与您的设备不兼容。您仍然要尝试安装吗？</string>
   <string name="installDowngrade">您正在降级该应用程序。这样做可能会使该程序无法工作，甚至丢失您的数据。您仍然要尝试降级吗？</string>

F-Droid/res/values-zh-rHK/strings.xml

@@ -1,8 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="searchres_napps">找到 %1$d 個符合「%2$s」的應用程式：</string>
-  <string name="searchres_oneapp">找到 1 個符合「%s」的應用程式：</string>
-  <string name="searchres_noapps">找不到任何符合「%s」的應用程式</string>
   <string name="version">版本</string>
   <string name="delete">刪除</string>
   <string name="enable_nfc_send">啟用 NFC 傳送…</string>

F-Droid/res/values-zh-rTW/strings.xml

@@ -1,9 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources><string name="app_name">F-Droid</string>
 
-    <string name="searchres_napps">找到 %1$d 個跟「%2$s」有關的應用軟體：</string>
-    <string name="searchres_oneapp">找到一個跟「%s」有關的應用軟體：</string>
-    <string name="searchres_noapps">找不到任何跟「%s」有關的應用軟體</string>
     <string name="SignatureMismatch">此應用軟體的新版本被簽署了與舊版本不同的金鑰。如要安裝新版本，您必須將舊版本應用軟體先解除安裝。請於完成該操作後再嘗試一次。（注意解除安裝應用軟體時會清除任何由該應用軟體保存於系統中的所有資料）</string>
     <string name="installIncompatible">看起來此軟體包與您的裝置並不相容。您無論如何都要嘗試安裝它嗎？</string>
     <string name="installDowngrade">您正在嘗試降級此應用軟體。這樣做可能會讓該應用軟體不能正常運作，甚至可能會造成您重要資料的流失。您確定無論如何都要試著降級它嗎？</string>

F-Droid/res/values/strings.xml

@@ -3,9 +3,6 @@
 
     <string name="app_name">F-Droid</string>
 
-    <string name="searchres_napps">Found %1$d applications matching \'%2$s\':</string>
-    <string name="searchres_oneapp">Found one application matching \'%s\':</string>
-    <string name="searchres_noapps">No applications were found matching \'%s\'</string>
     <string name="SignatureMismatch">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)</string>
     <string name="installIncompatible">It seems like this package is not compatible with your device. Do you want to try and install it anyway?</string>
     <string name="installDowngrade">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?</string>

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();
         }
 
@@ -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() {
@@ -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();
         }
 

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();

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

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;
 

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;

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
-    @NonNull protected final Repo repo;
+    private final Context context;
-    protected boolean hasChanged;
+    @NonNull
-    @Nullable protected ProgressListener progressListener;
+    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,

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);
     }
 

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";
 
@@ -110,7 +110,7 @@ public 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;
     }
@@ -175,7 +175,7 @@ public 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 +

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";
 
@@ -32,7 +32,7 @@ public class InstalledAppCacheUpdater {
     private final List<PackageInfo> toInsert = new ArrayList<>();
     private final List<String>      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();
     }
 

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. " +

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;
+    final Context mContext;
-    protected final PackageManager mPm;
+    final PackageManager mPm;
-    protected final InstallerCallback mCallback;
+    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;

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();

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()));
     }
 

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;

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);

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;
+    private int bytesRead;
-    protected int totalBytes;
+    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());

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<String, String> header, File file, String mime) {
+    private Response serveFile(String uri, Map<String, String> 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) {

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<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces(); networkInterfaces.hasMoreElements();) {
                 NetworkInterface netIf = networkInterfaces.nextElement();

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<String> getCopyToSystemCommands(String apkPath) {
+    List<String> getCopyToSystemCommands(String apkPath) {
         final List<String> commands = new ArrayList<>(2);
         commands.add("cat " + apkPath + " > " + getInstallPath() + ".tmp");
         commands.add("chmod 644 " + getInstallPath() + ".tmp");
         return commands;
     }
 
-    protected List<String> getPostInstallCommands() {
+    List<String> getPostInstallCommands() {
         final List<String> 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<String> getCleanUninstallCommands() {
+    List<String> getCleanUninstallCommands() {
         final List<String> commands = new ArrayList<>(1);
         commands.add("rm -f " + getInstallPath());
         return commands;
     }
 
-    protected List<String> getPostUninstallCommands() {
+    List<String> getPostUninstallCommands() {
         return new ArrayList<>(0);
     }
 

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<Void, Void, Boolean> checkRoot = new AsyncTask<Void, Void, Boolean>() {
@@ -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<Void, Void, Boolean> checkRootTask = new AsyncTask<Void, Void, Boolean>() {
+    private final AsyncTask<Void, Void, Boolean> checkRootTask = new AsyncTask<Void, Void, Boolean>() {
         ProgressDialog mProgressDialog;
 
         @Override
@@ -299,7 +299,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
     /**
      * 2. Install into system
      */
-    final AsyncTask<Void, Void, Void> installTask = new AsyncTask<Void, Void, Void>() {
+    private final AsyncTask<Void, Void, Void> installTask = new AsyncTask<Void, Void, Void>() {
         ProgressDialog mProgressDialog;
 
         @Override
@@ -413,7 +413,7 @@ public class InstallExtensionDialogActivity extends FragmentActivity {
         }
     }
 
-    final AsyncTask<Void, Void, Void> uninstallTask = new AsyncTask<Void, Void, Void>() {
+    private final AsyncTask<Void, Void, Void> uninstallTask = new AsyncTask<Void, Void, Void>() {
         ProgressDialog mProgressDialog;
 
         @Override

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);
         }

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<Peer> onPeerFound = new Subscriber<Peer>() {
+    private final Subscriber<Peer> onPeerFound = new Subscriber<Peer>() {
 
         @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)) {

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
             );
         }
     }

F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java

@@ -114,7 +114,7 @@ public class InstalledAppProviderTest extends FDroidProviderTest<InstalledAppPro
         assertResultCount(1, InstalledAppProvider.getContentUri());
         assertIsInstalledVersionInDb("com.example.toUpgrade", 1, "v0.1");
 
-        upgradeAndBroadcast("com.example.toUpgrade", 2,  "v0.2");
+        upgradeAndBroadcast("com.example.toUpgrade", 2, "v0.2");
 
         assertResultCount(1, InstalledAppProvider.getContentUri());
         assertIsInstalledVersionInDb("com.example.toUpgrade", 2, "v0.2");

Privileged-Extension/build.gradle

@@ -36,7 +36,7 @@ android {
 }
 
 checkstyle {
-    toolVersion = '6.15'
+    toolVersion = '6.16'
 }
 
 task checkstyle(type: Checkstyle) {