Merge branch 'master' into use-viewbinding

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties

4 files changed, 11 insertions, 2 deletions

diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle
index 2dedcb25..48a60bc2 100644
--- a/News-Android-App/build.gradle
+++ b/News-Android-App/build.gradle
@@ -26,6 +26,8 @@ android {
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
         vectorDrawables.useSupportLibrary = true
+
+        multiDexEnabled true
     }
 
     buildFeatures {
@@ -39,6 +41,7 @@ android {
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
 
     buildTypes {
@@ -191,6 +194,9 @@ dependencies {
 
     implementation 'com.nbsp:library:1.8' // MaterialFilePicker
 
+    implementation 'androidx.multidex:multidex:2.0.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
+
     //extraImplementation 'com.github.tommus:youtube-android-player-api:1.2.2'
 
 
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java
index e32f3d73..156f3c13 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderApplication.java
@@ -1,6 +1,6 @@
 package de.luhmer.owncloudnewsreader;
 
-import android.app.Application;
+import androidx.multidex.MultiDexApplication;
 
 import de.luhmer.owncloudnewsreader.di.ApiModule;
 import de.luhmer.owncloudnewsreader.di.AppComponent;
@@ -8,7 +8,7 @@ import de.luhmer.owncloudnewsreader.di.DaggerAppComponent;
 import de.luhmer.owncloudnewsreader.helper.AdBlocker;
 import de.luhmer.owncloudnewsreader.helper.ForegroundListener;
 
-public class NewsReaderApplication extends Application {
+public class NewsReaderApplication extends MultiDexApplication {
 
     protected AppComponent mAppComponent;
 
diff --git a/News-Android-App/src/main/res/values-fr/strings.xml b/News-Android-App/src/main/res/values-fr/strings.xml
index dfa290bf..22598be0 100644
--- a/News-Android-App/src/main/res/values-fr/strings.xml
+++ b/News-Android-App/src/main/res/values-fr/strings.xml
@@ -173,6 +173,7 @@
     <string name="pref_contribute">Contribuez !</string>
     <string name="pref_contribute_summary">Obtenir le code source</string>
     <string name="pref_privacy">Vie privée</string>
+    <string name="pref_privacy_summary">Politique de confidentialité de Nextcloud News pour Android</string>
     <string name="pref_version">Application Android NextCloud News</string>
 
 
diff --git a/News-Android-App/src/main/res/values-nl/strings.xml b/News-Android-App/src/main/res/values-nl/strings.xml
index 50592b99..5fa4e851 100644
--- a/News-Android-App/src/main/res/values-nl/strings.xml
+++ b/News-Android-App/src/main/res/values-nl/strings.xml
@@ -172,6 +172,8 @@
     <string name="pref_report_issue_summary">Vereist een (gratis) GitHub account</string>
     <string name="pref_contribute">Bijdragen!</string>
     <string name="pref_contribute_summary">Download de broncode</string>
+    <string name="pref_privacy">Privacy</string>
+    <string name="pref_privacy_summary">Nextcloud News Android Privacy Policy</string>
     <string name="pref_version">Nextcloud Nieuws Android app</string>