Merge branch 'master' of tyr.dev001.net:git/cert4android (1488e39a) · Commits · e / os / cert4android

.gitlab-ci.yml

+4 −3

Original line number	Diff line number	Diff line
		image: registry.gitlab.com/bitfireat/davx5-ose:latest
		image: registry.gitlab.com/bitfireat/docker-android-emulator:latest

		before_script:
		- export GRADLE_USER_HOME=`pwd`/.gradle; chmod +x gradlew
		@@ -8,10 +8,11 @@ cache:
		- .gradle/

		test:
		tags:
		- privileged
		script:
		- (cd /sdk/emulator; ./emulator @test -no-audio -no-window & wait-for-emulator.sh)
		- start-emulator.sh
		- ./gradlew check connectedCheck
		- ./gradlew check
		artifacts:
		paths:
		- build/outputs/lint-results-debug.html

build.gradle

+14 −6

Original line number	Diff line number	Diff line

		buildscript {
		ext.versions = [
		kotlin: '1.3.50',
		dokka: '0.9.18',
		kotlin: '1.3.61',
		dokka: '0.10.0',
		conscrypt: '2.2.1'
		]

		@@ -12,9 +12,9 @@ buildscript {
		}

		dependencies {
		classpath 'com.android.tools.build:gradle:3.5.0'
		classpath 'com.android.tools.build:gradle:3.5.3'
		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
		classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}"
		classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
		}
		}

		@@ -25,11 +25,11 @@ repositories {

		apply plugin: 'com.android.library'
		apply plugin: 'kotlin-android'
		apply plugin: 'org.jetbrains.dokka-android'
		apply plugin: 'org.jetbrains.dokka'

		android {
		compileSdkVersion 29
		buildToolsVersion '29.0.1'
		buildToolsVersion '29.0.2'

		defaultConfig {
		minSdkVersion 14
		@@ -51,6 +51,14 @@ android {
		defaultConfig {
		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
		}

		dokka.configuration {
		sourceLink {
		url = "https://gitlab.com/bitfireAT/cert4android/tree/master/"
		lineSuffix = "#L"
		}
		jdkVersion = 7
		}
		}

		dependencies {

src/main/java/at/bitfire/cert4android/CustomCertManager.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -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)) {

src/main/res/values-bg/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

src/main/res/values-fa/strings.xml

+17 −1

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<resources>

		<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