Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cd2281f authored by Ricki Hirner's avatar Ricki Hirner
Browse files

SDK/build tools 27

parent fb3b55af

build.gradle

+5 −5
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ apply plugin: 'com.android.library' 
apply plugin: 'kotlin-android'



android {

    compileSdkVersion 26

    buildToolsVersion '26.0.2'

    compileSdkVersion 27

    buildToolsVersion '27.0.0'



    defaultConfig {

        minSdkVersion 14

        targetSdkVersion 26

        targetSdkVersion 27

    }



    lintOptions {
@@ -47,8 +47,8 @@ android { 
dependencies {

    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"



    compile 'com.android.support:appcompat-v7:26.1.0'

    compile 'com.android.support:cardview-v7:26.1.0'

    compile 'com.android.support:appcompat-v7:27.0.0'

    compile 'com.android.support:cardview-v7:27.0.0'



    //noinspection GradleDynamicVersion

    androidTestCompile 'com.android.support.test:runner:+'

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

+5 −5
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ import android.os.Handler 
import android.os.Message

import android.os.Messenger

import android.os.RemoteException

import android.support.v4.app.NotificationCompat

import android.support.v4.app.NotificationManagerCompat

import android.support.v7.app.NotificationCompat

import android.widget.Toast

import java.io.File

import java.io.FileInputStream
@@ -58,10 +58,10 @@ class CustomCertService: Service() { 


    }



    var keyStoreFile: File? = null

    private var keyStoreFile: File? = null



    val trustedKeyStore = KeyStore.getInstance(KeyStore.getDefaultType())!!

    var customTrustManager: X509TrustManager? = null

    private val trustedKeyStore = KeyStore.getInstance(KeyStore.getDefaultType())!!

    private var customTrustManager: X509TrustManager? = null



    var untrustedCerts = HashSet<X509Certificate>()
@@ -175,7 +175,7 @@ class CustomCertService: Service() { 


    // bound service; Messenger for IPC



    val messenger = Messenger(MessageHandler(this))

    private val messenger = Messenger(MessageHandler(this))

    override fun onBind(intent: Intent?) = messenger.binder!!



    private class MessageHandler(