Merge branch 'master' of tyr.dev001.net:git/cert4android

3 files changed, 22 insertions, 3 deletions

diff --git a/src/main/java/at/bitfire/cert4android/CustomCertManager.kt b/src/main/java/at/bitfire/cert4android/CustomCertManager.kt
index dcbc69e..4e5df4a 100644
--- a/src/main/java/at/bitfire/cert4android/CustomCertManager.kt
+++ b/src/main/java/at/bitfire/cert4android/CustomCertManager.kt
@@ -91,9 +91,10 @@ class CustomCertManager @JvmOverloads constructor(
             }
         }
 
-        if (Looper.myLooper() == Looper.getMainLooper())
+        check(Looper.myLooper() != Looper.getMainLooper()) {
             // service is actually created after bindService() by code running in looper, so this would block
-            throw IllegalStateException("must not be run on main thread")
+            "must not be run on main thread"
+        }
 
         Constants.log.fine("Binding to service")
         if (context.bindService(Intent(context, CustomCertService::class.java), newServiceConn, Context.BIND_AUTO_CREATE)) {
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index b6ca654..f708e10 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -14,4 +14,6 @@
     <string name="trust_certificate_validity_period_value">%1$s – %2$s (няма да се прилага)</string>
     <string name="trust_certificate_fingerprints">Пръстови отпечатъци</string>
     <string name="trust_certificate_fingerprint_verified">Проверих целия пръстов отпечатък</string>
+    <string name="trust_certificate_accept">Приемам</string>
+    <string name="trust_certificate_reject">Отхвърлям</string>
     </resources>
\ No newline at end of file
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 583641d..52f5aa5 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    </resources>
\ No newline at end of file
+    <string name="certificate_notification_connection_security">امنیت اتصال</string>
+    <string name="certificate_notification_user_interaction">لطفا گواهی‌نامه‌ی خود را بازبینی کنید</string>
+
+    <string name="service_rejected_temporarily">گواهی‌نامه موقتاً رد شده‌است</string>
+
+    <string name="trust_certificate_unknown_certificate_found">cert4android با یک گواهی‌نامه‌ی ناشناخته مواجه‌شده‌است. آیا به آن اعتماد می‌کنید؟</string>
+    <string name="trust_certificate_x509_certificate_details">جزئیات گواهی‌نامه‌ی X509</string>
+    <string name="trust_certificate_issued_for">مشکل برای</string>
+    <string name="trust_certificate_issued_by">مشکل از</string>
+    <string name="trust_certificate_validity_period">دوره‌ی اعتبار</string>
+    <string name="trust_certificate_fingerprints">اثر انگشت‌ها</string>
+    <string name="trust_certificate_fingerprint_verified">به صورت دستی تمام اثر انگشت را تایید می‌کنم</string>
+    <string name="trust_certificate_accept">قبول</string>
+    <string name="trust_certificate_reject">رد</string>
+    <string name="trust_certificate_reset_info">شما می‌توانید تمام گواهی‌نامه‌های سفارشی را در تنظیمات برنامه مجدداً تنظیم کنید.</string>
+
+</resources>
\ No newline at end of file