diff options
author | Daniel Lublin <daniel@lublin.se> | 2020-04-07 11:06:02 +0300 |
---|---|---|
committer | Daniel Lublin <daniel@lublin.se> | 2020-04-07 11:06:02 +0300 |
commit | 6fdea1b07111aeb810113329ae55e79cec453f26 (patch) | |
tree | e91b9426edd747731596ce044504fed9cdc9f0b4 | |
parent | 52a7ceaacabaead6c704ca25d5043694f28751c8 (diff) |
Adjust lintOptions; squeeze some lints; adjust and remove ExtraTranslations
-rw-r--r-- | app/build.gradle | 14 | ||||
-rw-r--r-- | app/src/main/java/se/lublin/mumla/drawable/CircleDrawable.java | 3 | ||||
-rw-r--r-- | app/src/main/java/se/lublin/mumla/service/MumlaService.java | 2 | ||||
-rw-r--r-- | app/src/main/res/values-de/preference.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-de/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-es/preference.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-es/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-fr/preference.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-fr/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-it/preference.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-it/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-ja/preference.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-ja/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-nl/preference.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-nl/strings.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values-pl/preference.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values-ru/preference.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
18 files changed, 22 insertions, 41 deletions
diff --git a/app/build.gradle b/app/build.gradle index 3b5d4d7..f1b91cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -104,7 +104,17 @@ android { } lintOptions { - abortOnError false - disable "ExtraTranslation" + quiet false + + disable "MissingSuperCall" + disable "DuplicateDefinition" + disable "WrongThread" + disable "InvalidPackage" + disable "EllipsizeMaxLines" + + disable "MissingTranslation" + + ignoreWarnings false + abortOnError true } } diff --git a/app/src/main/java/se/lublin/mumla/drawable/CircleDrawable.java b/app/src/main/java/se/lublin/mumla/drawable/CircleDrawable.java index b105b5d..2cb2cdb 100644 --- a/app/src/main/java/se/lublin/mumla/drawable/CircleDrawable.java +++ b/app/src/main/java/se/lublin/mumla/drawable/CircleDrawable.java @@ -24,6 +24,7 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Matrix; import android.graphics.Paint; +import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Shader; @@ -109,7 +110,7 @@ public class CircleDrawable extends Drawable { @Override public int getOpacity() { - return 0; + return PixelFormat.UNKNOWN; } @Override diff --git a/app/src/main/java/se/lublin/mumla/service/MumlaService.java b/app/src/main/java/se/lublin/mumla/service/MumlaService.java index a1e426b..da2b4b8 100644 --- a/app/src/main/java/se/lublin/mumla/service/MumlaService.java +++ b/app/src/main/java/se/lublin/mumla/service/MumlaService.java @@ -462,7 +462,7 @@ public class MumlaService extends HumlaService implements private void setProximitySensorOn(boolean on) { if(on) { PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE); - mProximityLock = pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, "mumla_proximity"); + mProximityLock = pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, "Mumla:Proximity"); mProximityLock.acquire(); } else { if(mProximityLock != null) mProximityLock.release(); diff --git a/app/src/main/res/values-de/preference.xml b/app/src/main/res/values-de/preference.xml index 5229e30..3bc5e33 100644 --- a/app/src/main/res/values-de/preference.xml +++ b/app/src/main/res/values-de/preference.xml @@ -25,10 +25,6 @@ <string name="licenses">Lizenzen</string> <string name="authentication">Authentifizierung</string> <string name="authenticationSum">Zertifikate verwalten und erstellen</string> - <string name="certificateFile">Zertifikatsdatei</string> - <string name="certificateFileSum">Pfad des gewünschten P12-Zertifikats aus dem \"Mumla\" Verzeichnis auf dem externen Speicher.</string> - <string name="certificatePassword">Zertifikatspasswort</string> - <string name="certificatePasswordSum">Das Passwort für Ihr PKCS12 Zertifikat. (Optional)</string> <string name="audioInput">Audioeingabe</string> <string name="audioInputMethodSum">Wie Ton zum Server übertragen werden soll.</string> <string name="audioInputMethod">Eingabemethode</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 53625f0..634c930 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -70,7 +70,7 @@ <string name="server_host">Adresse</string> <string name="server_label">Beschriftung</string> <string name="connecting">Verbinden</string> - <string name="connecting_to_server">Zu Server %1$s:%2$s verbinden</string> + <string name="connecting_to_server">Zu Server %1$s:%2$d verbinden</string> <string name="fragment_chat">Chat</string> <string name="fragment_channel">Kanal</string> <string name="menu_settings">Einstellungen</string> diff --git a/app/src/main/res/values-es/preference.xml b/app/src/main/res/values-es/preference.xml index 6d4c5af..61e2050 100644 --- a/app/src/main/res/values-es/preference.xml +++ b/app/src/main/res/values-es/preference.xml @@ -25,10 +25,6 @@ <string name="licenses">Licencias</string> <string name="authentication">Autenticación</string> <string name="authenticationSum">Gestiona y crea certificados</string> - <string name="certificateFile">Archivo de certificado</string> - <string name="certificateFileSum">La ruta del certificado P12 que desee usar, situado en la carpeta \"Mumla\" o en el almacenamiento externo</string> - <string name="certificatePassword">Contraseña del certificado</string> - <string name="certificatePasswordSum">La contraseña de tu certificado PKCS12 (opcional)</string> <string name="audioInput">Entrada de audio</string> <string name="audioInputMethodSum">El método de entrada de audio</string> <string name="audioInputMethod">Modo de transmisión</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1d40b3a..ffc67a3 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -70,7 +70,7 @@ <string name="server_host">Dirección</string> <string name="server_label">Etiqueta</string> <string name="connecting">Conectando</string> - <string name="connecting_to_server">Conectando a %1$s:%2$s</string> + <string name="connecting_to_server">Conectando a %1$s:%2$d</string> <string name="fragment_chat">Chat</string> <string name="fragment_channel">Canal</string> <string name="menu_settings">Opciones</string> diff --git a/app/src/main/res/values-fr/preference.xml b/app/src/main/res/values-fr/preference.xml index 60934d1..3baee8a 100644 --- a/app/src/main/res/values-fr/preference.xml +++ b/app/src/main/res/values-fr/preference.xml @@ -25,10 +25,6 @@ <string name="licenses">Licences</string> <string name="authentication">Authentification</string> <string name="authenticationSum">Gérer et créer des certificats</string> - <string name="certificateFile">Fichier de certificat</string> - <string name="certificateFileSum">Le chemin du certificat P12 que vous voulez utilisez, placé dans le dossier \"Mumla\" sur une mémoire externe.</string> - <string name="certificatePassword">Mot de passe du certificat</string> - <string name="certificatePasswordSum">Le mot de passe pour votre certificat PKCS12. (optionnel)</string> <string name="audioInput">Entrée audio</string> <string name="audioInputMethodSum">La méthode d\'entrée audio.</string> <string name="audioInputMethod">Mode de transmition</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d41cb0a..622b4a5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -70,7 +70,7 @@ <string name="server_host">Adresse</string> <string name="server_label">Libellé</string> <string name="connecting">Connexion</string> - <string name="connecting_to_server">Connexion à %1$s:%2$s</string> + <string name="connecting_to_server">Connexion à %1$s:%2$d</string> <string name="fragment_chat">Chat</string> <string name="fragment_channel">canal</string> <string name="menu_settings">Paramètres</string> diff --git a/app/src/main/res/values-it/preference.xml b/app/src/main/res/values-it/preference.xml index 12d26e3..f2b5913 100644 --- a/app/src/main/res/values-it/preference.xml +++ b/app/src/main/res/values-it/preference.xml @@ -9,8 +9,6 @@ <string name="licenses">Licenze</string> <string name="authentication">Autenticazione</string> <string name="authenticationSum">Gestisci e crea certificati</string> - <string name="certificateFile">File certificato</string> - <string name="certificatePassword">Password certificato</string> <string name="audioInput">Input audio</string> <string name="audioInputVolume">Volume microfono</string> <string name="general">Generale</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 629edaf..0734438 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -41,7 +41,7 @@ <string name="server_port">Porta</string> <string name="server_host">Indirizzo</string> <string name="connecting">Connessione</string> - <string name="connecting_to_server">Connessione a %1$s:%2$s</string> + <string name="connecting_to_server">Connessione a %1$s:%2$d</string> <string name="fragment_chat">Chat</string> <string name="fragment_channel">Canale</string> <string name="menu_settings">Impostazioni</string> diff --git a/app/src/main/res/values-ja/preference.xml b/app/src/main/res/values-ja/preference.xml index 1918fa5..900fd49 100644 --- a/app/src/main/res/values-ja/preference.xml +++ b/app/src/main/res/values-ja/preference.xml @@ -25,10 +25,6 @@ <string name="licenses">ライセンス</string> <string name="authentication">認証</string> <string name="authenticationSum">証明書の管理と作成</string> - <string name="certificateFile">証明書ファイル</string> - <string name="certificateFileSum">外部ストレージの \"Mumla\" フォルダに配置した、使用したい P12 証明書のパス。</string> - <string name="certificatePassword">証明書パスワード</string> - <string name="certificatePasswordSum">PKCS12 証明書のパスワード (オプション)</string> <string name="audioInput">音声入力</string> <string name="audioInputMethodSum">音声入力の方法。</string> <string name="audioInputMethod">送信モード</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index de520d7..d4b25ef 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -70,7 +70,7 @@ <string name="server_host">アドレス</string> <string name="server_label">ラベル</string> <string name="connecting">接続中</string> - <string name="connecting_to_server">%1$s:%2$s に接続中</string> + <string name="connecting_to_server">%1$s:%2$d に接続中</string> <string name="fragment_chat">チャット</string> <string name="fragment_channel">チャンネル</string> <string name="menu_settings">設定</string> diff --git a/app/src/main/res/values-nl/preference.xml b/app/src/main/res/values-nl/preference.xml index 5d55a46..e1a58f8 100644 --- a/app/src/main/res/values-nl/preference.xml +++ b/app/src/main/res/values-nl/preference.xml @@ -25,10 +25,6 @@ <string name="licenses">Licenties</string> <string name="authentication">Authenticatie</string> <string name="authenticationSum">Beheer en creeer certificaten</string> - <string name="certificateFile">Certificaat Bestand</string> - <string name="certificateFileSum">Het pad van het P12 certificaat dat u wenst te gebruiken, in de \"Mumla\" folder op externe opslag.</string> - <string name="certificatePassword">Certificaat Wachtwoord</string> - <string name="certificatePasswordSum">Het wachtwoord voor uw PKCS12 certificaat. (optioneel)</string> <string name="audioInput">Audio Invoer</string> <string name="audioInputMethodSum">De methode van audio invoer.</string> <string name="audioInputMethod">Doorstuur Methode</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 08a5746..96dbcdc 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -70,7 +70,7 @@ <string name="server_host">Adres</string> <string name="server_label">Label</string> <string name="connecting">Verbinden</string> - <string name="connecting_to_server">Verbinden met %1$s:%2$s</string> + <string name="connecting_to_server">Verbinden met %1$s:%2$d</string> <string name="fragment_chat">Chat</string> <string name="fragment_channel">Kanaal</string> <string name="menu_settings">Instellingen</string> diff --git a/app/src/main/res/values-pl/preference.xml b/app/src/main/res/values-pl/preference.xml index a35ef44..2d47fe7 100644 --- a/app/src/main/res/values-pl/preference.xml +++ b/app/src/main/res/values-pl/preference.xml @@ -7,10 +7,6 @@ <!--About--> <string name="authentication">Authentication</string> <string name="authenticationSum">Manage and create certificates</string> - <string name="certificateFile">Certificate File</string> - <string name="certificateFileSum">The path of the P12 certificate you wish to use, placed in the \"Mumla\" folder on external storage.</string> - <string name="certificatePassword">Certificate Password</string> - <string name="certificatePasswordSum">The password for your PKCS12 certificate. (optional)</string> <string name="audioInput">Audio Input</string> <string name="audioInputMethodSum">The way audio is sent to the server.</string> <string name="audioInputMethod">Input Method</string> diff --git a/app/src/main/res/values-ru/preference.xml b/app/src/main/res/values-ru/preference.xml index 4c9fd02..c6864f1 100644 --- a/app/src/main/res/values-ru/preference.xml +++ b/app/src/main/res/values-ru/preference.xml @@ -25,10 +25,6 @@ <string name="licenses">Лицензии</string> <string name="authentication">Идентификация</string> <string name="authenticationSum">Управление и создание сертификатов</string> - <string name="certificateFile">Файл сертификата</string> - <string name="certificateFileSum">Файл P12 сертификата который вы хотите использовать, размещенные в папке \"Mumla\".</string> - <string name="certificatePassword">Пароль сертификата</string> - <string name="certificatePasswordSum">Пароль к вашему PKCS12 сертификату. (опционально)</string> <string name="audioInput">Аудио вход</string> <string name="audioInputMethodSum">Способ ввода звука.</string> <string name="audioInputMethod">Режим передачи</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c67a537..fa0b87e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -96,7 +96,7 @@ <string name="server_host">Address</string> <string name="server_label">Label</string> <string name="connecting">Connecting</string> - <string name="connecting_to_server">Connecting to %1$s:%2$s</string> + <string name="connecting_to_server">Connecting to %1$s:%2$d</string> <string name="fragment_chat">Chat</string> <string name="fragment_channel">Channel</string> <string name="menu_settings">Settings</string> |