aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2017-10-14 13:45:22 +0200
committerpacien2017-10-14 13:45:22 +0200
commit8c1190a5a39a7762b82f1ae8f9a3ac46a47d0320 (patch)
tree4d50eaca5bada964c2d1c5b638229c6a380f5dd3
parent3a84dbf5fa0c0a625374d942a73a9d00445f7ca3 (diff)
downloadtincapp-backport.tar.gz
Use multi-dex support lib for old Android versionsbackport
-rw-r--r--app/build.gradle1
-rw-r--r--app/src/main/java/org/pacien/tincapp/context/App.kt6
2 files changed, 7 insertions, 0 deletions
diff --git a/app/build.gradle b/app/build.gradle
index dd14097..c79fca7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,6 +39,7 @@ android {
39dependencies { 39dependencies {
40 compile fileTree(dir: 'libs', include: ['*.jar']) 40 compile fileTree(dir: 'libs', include: ['*.jar'])
41 41
42 compile 'com.android.support:multidex:1.0.1'
42 compile 'com.android.support:appcompat-v7:25.4.0' 43 compile 'com.android.support:appcompat-v7:25.4.0'
43 compile 'com.android.support:design:25.4.0' 44 compile 'com.android.support:design:25.4.0'
44 compile 'com.android.support:support-v4:25.4.0' 45 compile 'com.android.support:support-v4:25.4.0'
diff --git a/app/src/main/java/org/pacien/tincapp/context/App.kt b/app/src/main/java/org/pacien/tincapp/context/App.kt
index 7aaa3d0..88e1b32 100644
--- a/app/src/main/java/org/pacien/tincapp/context/App.kt
+++ b/app/src/main/java/org/pacien/tincapp/context/App.kt
@@ -5,6 +5,7 @@ import android.content.Context
5import android.content.Intent 5import android.content.Intent
6import android.net.Uri 6import android.net.Uri
7import android.support.annotation.StringRes 7import android.support.annotation.StringRes
8import android.support.multidex.MultiDex
8import android.support.v7.app.AlertDialog 9import android.support.v7.app.AlertDialog
9import android.view.WindowManager 10import android.view.WindowManager
10import org.pacien.tincapp.R 11import org.pacien.tincapp.R
@@ -19,6 +20,11 @@ class App : Application() {
19 appContext = applicationContext 20 appContext = applicationContext
20 } 21 }
21 22
23 override fun attachBaseContext(base: Context) {
24 super.attachBaseContext(base)
25 MultiDex.install(this)
26 }
27
22 companion object { 28 companion object {
23 29
24 private var appContext: Context? = null 30 private var appContext: Context? = null