Use arrows instead of text in the transferred byte message to save space. Fix closing of management socket

15 files changed, 11 insertions, 20 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5a1039bc..fbde65ed 100755
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -125,7 +125,6 @@
   <string name="no_vpn_support_image">Tvůj obrázek není podporovaný rozhraním VPNService, je mi líto :-(</string>
   <string name="encryption">Šifrování</string>
   <string name="cipher_dialog_title">Zadej šifrovací metodu</string>
-  <string name="chipher_dialog_message">Zadej šifru pro OpenVPN. Nech prázdné pro výchozí šifru</string>
   <string name="settings_auth">Autentizace/Šifrování</string>
   <string name="file_explorer_tab">Prohlížeč souború</string>
   <string name="inline_file_tab">Vložený soubor</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4f8d8ca8..024bf20a 100755
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -125,7 +125,8 @@
   <string name="no_vpn_support_image">Dieses Android ROM enthält keine VPNService API. Sorry :(</string>
   <string name="encryption">Verschlüsselung</string>
   <string name="cipher_dialog_title">Geben Sie die Verschlüsslungsmethode an</string>
-  <string name="chipher_dialog_message">Verschlüsslungsalgorithmus (chiper). Leer lassen um Standardalgorithmus auszuwählen</string>
+  <string name="chipher_dialog_message">Verschlüsslungsalgorithmus der von OpenVPN genutzt werden soll. Um den Standardalgorithmus zu benutzten leer lassen.</string>
+  <string name="auth_dialog_message">Geben Sie den Hashalgorithmus der zur Nachrichtenauthentifizierung benutzt wird an. Leer lassen um den Standard Algorithmus zu nutzen.</string>
   <string name="settings_auth">Authentifizierung/Verschlüsselung</string>
   <string name="file_explorer_tab">Datei auswählen…</string>
   <string name="inline_file_tab">Eingebettete Datei</string>
@@ -252,4 +253,10 @@
   <string name="state_tcp_connect">Verbinde (TCP)</string>
   <string name="state_auth_failed">Authentifizierung fehlgeschlagen</string>
   <string name="state_nonetwork">Warte auf Internetverbindung</string>
+  <string name="statusline_bytecount">↓%2$s/s %1$s - ↑%4$s/s %3$s</string>
+  <string name="notifcation_title_notconnect">Nicht verbunden</string>
+  <string name="jelly_keystore_alphanumeric_bug">Einige Versionen von Android 4.1 haben Probleme, wenn der Name des im Zertifikat Keystore gespeicherten Zertifikates nicht alphanumerische Zeichen (wie Leerzeichen, Unterstriche oder Bindestriche) enthält. Probieren Sie das Sie das Zertifikat mit einem Namen ohne Sonderzeichen zu importieren.</string>
+  <string name="encryption_cipher">Verschlüsslungsalgorithmus</string>
+  <string name="packet_auth">Packetauthentifizierung</string>
+  <string name="auth_dialog_title">Geben Sie den Authentifizierungsalgorithmus an</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8e1b3a5a..5bc4e406 100755
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -125,7 +125,6 @@
   <string name="no_vpn_support_image">Su imagen no es compatible con la API de VPNService, lo siento :(</string>
   <string name="encryption">Cifrado</string>
   <string name="cipher_dialog_title">Especifique el método de cifrado</string>
-  <string name="chipher_dialog_message">Introduzca la clave de cifrado para OpenVPN. Deje en blanco para utilizar cifrado predeterminado</string>
   <string name="settings_auth">Autenticación/Cifrado</string>
   <string name="file_explorer_tab">Administrador de archivos</string>
   <string name="inline_file_tab">Archivo en línea</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 9a4c6717..bdcda96c 100755
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -125,7 +125,6 @@
   <string name="no_vpn_support_image">Teie süsteemitarkvara ei toeta VPNService API\'t, vabandame :(</string>
   <string name="encryption">Krüpteerimine</string>
   <string name="cipher_dialog_title">Vali krüpteerimismeetod</string>
-  <string name="chipher_dialog_message">Sisestage OpenVPN šifrivõti. Valikust loobumisel kasutatakse vaikimisi šifrit</string>
   <string name="settings_auth">Autentimine/Krüpteerimine</string>
   <string name="file_explorer_tab">Failihaldur</string>
   <string name="inline_file_tab">Integreeritud fail</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e7048048..1bac99ce 100755
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -124,7 +124,6 @@
   <string name="no_vpn_support_image">"Votre ROM ne prend pas en charge l\'API VPNService, désolé :("</string>
   <string name="encryption">"Cryptage"</string>
   <string name="cipher_dialog_title">"Entrez la méthode de cryptage"</string>
-  <string name="chipher_dialog_message">"Entrez la clé de chiffrement Cipher pour OpenVPN. Laissez vide pour utiliser le chiffrement par défaut"</string>
   <string name="settings_auth">"Authentification / Cryptage"</string>
   <string name="file_explorer_tab">"Explorateur de fichiers"</string>
   <string name="inline_file_tab">"Fichier personnalisé"</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 50459a66..f6b863fd 100755
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -125,7 +125,6 @@
   <string name="no_vpn_support_image">Gambar Anda tidak mendukung VPNService API, maaf:(</string>
   <string name="encryption">Enkripsi</string>
   <string name="cipher_dialog_title">Masukkan metode enkripsi</string>
-  <string name="chipher_dialog_message">Masukkan kunci sandi untuk OpenVPN. Biarkan kosong untuk menggunakan standar cipher</string>
   <string name="settings_auth">Otentikasi/Enkripsi</string>
   <string name="file_explorer_tab">Penjelajah berkas</string>
   <string name="inline_file_tab">Inline File</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3ad6fdd2..85a5f090 100755
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -126,7 +126,6 @@ Usa il tasto hardware Menù se non è visibile nella GUI.</string>
   <string name="no_vpn_support_image">La tua immagine non è supportata dal VPNService API, mi dispiace :(</string>
   <string name="encryption">Crittografia</string>
   <string name="cipher_dialog_title">Inserire il metodo di crittografia</string>
-  <string name="chipher_dialog_message">Inserisci la chiave di cifratura per OpenVPN. Lascia vuoto per usare la chiave di cifratura predefinita</string>
   <string name="settings_auth">Autenticazione/crittografia</string>
   <string name="file_explorer_tab">Esplora risorse</string>
   <string name="inline_file_tab">Blocco note</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index aec401af..a6f37b45 100755
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -127,7 +127,6 @@
   <string name="no_vpn_support_image">申し訳ありませんが、お使いの環境ではVPNサービスがサポートされていません。</string>
   <string name="encryption">暗号化</string>
   <string name="cipher_dialog_title">暗号化方式を入力</string>
-  <string name="chipher_dialog_message">OpenVPNに使用する暗号キーを入力してください。デフォルト値を使用する場合は空欄にしてください。</string>
   <string name="settings_auth">認証/暗号化</string>
   <string name="file_explorer_tab">ファイルを選択</string>
   <string name="inline_file_tab">インライン ファイル</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 07989d5d..a4318a0c 100755
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -125,7 +125,6 @@
   <string name="no_vpn_support_image">당신의 이미지는 VPNService API를 지원 하지 않습니다, 죄송 합니다:(</string>
   <string name="encryption">암호화</string>
   <string name="cipher_dialog_title">입력 암호화 방법</string>
-  <string name="chipher_dialog_message">Openvpn에 대한 암호화 키를 입력 합니다. 공란으로 두시면 기본 cipher를 사용하게 됩니다.</string>
   <string name="settings_auth">인증/암호화</string>
   <string name="file_explorer_tab">파일 탐색기</string>
   <string name="inline_file_tab">인라인 파일</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d7d68540..88fb1217 100755
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -125,7 +125,6 @@
   <string name="no_vpn_support_image">Ваша прошивка не поддерживает VPNService API, извините :(</string>
   <string name="encryption">Шифрование</string>
   <string name="cipher_dialog_title">Укажите метод шифрования</string>
-  <string name="chipher_dialog_message">Введите ключ шифра для OpenVPN. Оставьте пустым для использования шифрования по умолчанию</string>
   <string name="settings_auth">Авторизация/шифрование</string>
   <string name="file_explorer_tab">Обзор файлов</string>
   <string name="inline_file_tab">Встроенный файл</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 064c20fa..fea2005a 100755
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -125,7 +125,6 @@
   <string name="no_vpn_support_image">Ваша прошивка не підтримує VPNService API, вибачте :(</string>
   <string name="encryption">Шифрування</string>
   <string name="cipher_dialog_title">Введіть метод шифрування</string>
-  <string name="chipher_dialog_message">Введіть ключ шифру для OpenVPN. Залиште пустим для використання типового шифру</string>
   <string name="settings_auth">Автентифікація/Шифрування</string>
   <string name="file_explorer_tab">Провідник файлів</string>
   <string name="inline_file_tab">Вбудований файл</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b6156ab2..d196827a 100755
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -109,7 +109,6 @@
   <string name="faq_shortcut">启动快捷方式</string>
   <string name="encryption">加密</string>
   <string name="cipher_dialog_title">输入加密方法</string>
-  <string name="chipher_dialog_message">输入 OpenVPN 密钥。留空以使用默认密码</string>
   <string name="settings_auth">认证/加密</string>
   <string name="file_explorer_tab">文件浏览器</string>
   <string name="inline_file_tab">内联文件</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 20807bb9..0c50125d 100755
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -110,7 +110,6 @@
   <string name="no_vpn_support_image">你的Android ROM不支援VPN服務API，抱歉了。 :(</string>
   <string name="encryption">加密</string>
   <string name="cipher_dialog_title">輸入加密方法</string>
-  <string name="chipher_dialog_message">輸入OpenVPN加密方法，留空則使用預設</string>
   <string name="settings_auth">驗證/加密</string>
   <string name="file_explorer_tab">檔案瀏覽器</string>
   <string name="inline_file_tab">內嵌檔案</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1fe96ae2..da98236a 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -254,7 +254,7 @@
     <string name="state_tcp_connect">Connecting (TCP)</string>
     <string name="state_auth_failed">Authentication failed</string>
     <string name="state_nonetwork">Waiting for usable network</string>
-    <string name="statusline_bytecount">In: %1$8s %2$8s/s  Out: %3$8s %4$8s/s</string>
+    <string name="statusline_bytecount">↓%2$s/s %1$s - ↑%4$s/s %3$s</string>
     <string name="notifcation_title_notconnect">Not connected</string>
     <string name="jelly_keystore_alphanumeric_bug">Some versions of Android 4.1 have problems if the name of the keystore certificate contains non alphanumeric characters (like spaces, underscores or dashes). Try to reimport the certificate without special characters</string>
     <string name="encryption_cipher">Encryption cipher</string>
diff --git a/src/de/blinkt/openvpn/OpenVpnService.java b/src/de/blinkt/openvpn/OpenVpnService.java
index 71cc5cd2..6103ff89 100644
--- a/src/de/blinkt/openvpn/OpenVpnService.java
+++ b/src/de/blinkt/openvpn/OpenVpnService.java
@@ -201,6 +201,8 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 	private LocalServerSocket openManagmentInterface(int tries) {
 		// Could take a while to open connection
 		String socketname = (getCacheDir().getAbsolutePath() + "/" +  "mgmtsocket");
+		// The sock is transfered to the LocalServerSocket, ignore warning
+		@SuppressWarnings("resource")
 		LocalSocket sock = new LocalSocket();
 
 		while(tries > 0 && !sock.isConnected()) {
@@ -221,12 +223,6 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
 			return lss;
 		} catch (IOException e) {
 			e.printStackTrace();
-		} finally {
-			try {
-				sock.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
 		}
 		return null;