From abf4c9b546af4198899c888274bea3ffac0acb7d Mon Sep 17 00:00:00 2001
From: NekoInverter <42698724+NekoInverter@users.noreply.github.com>
Date: Fri, 17 Jul 2020 17:21:23 +0800
Subject: [PATCH] Fix crash on Android R Beta 2

---
 app/build.gradle                                 | 16 ++++++++--------
 .../meowcat/edxposed/manager/BaseActivity.java   |  2 +-
 .../edxposed/manager/util/DownloadsUtil.java     |  9 ++++++++-
 build.gradle                                     |  2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d5492f3d..f6867880 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,15 +27,15 @@ android {
         disable 'MissingTranslation'
         disable 'ExtraTranslation'
     }
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.1"
     defaultConfig {
         applicationId "org.meowcat.edxposed.manager"
         minSdkVersion 26
         //noinspection OldTargetApi
         targetSdkVersion 27
-        versionCode 457050
-        versionName "4.5.7.5"
+        versionCode 457060
+        versionName "4.5.7.6"
         signingConfig signingConfigs.release
     }
     buildTypes {
@@ -66,13 +66,13 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
     implementation 'androidx.browser:browser:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
-    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha03"
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8'
+    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha04"
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation "com.github.topjohnwu.libsu:core:2.5.1"
     implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
-    implementation 'com.google.android.material:material:1.2.0-beta01'
+    implementation 'com.google.android.material:material:1.3.0-alpha01'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.takisoft.preferencex:preferencex:1.1.0'
     implementation 'com.takisoft.preferencex:preferencex-colorpicker:1.1.0'
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java b/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
index bbcb0309..b605e6c4 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/BaseActivity.java
@@ -119,7 +119,7 @@ public class BaseActivity extends AppCompatActivity {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        AppCompatDelegate.setDefaultNightMode(XposedApp.getPreferences().getInt("theme", 0));
+        AppCompatDelegate.setDefaultNightMode(XposedApp.getPreferences().getInt("theme", -1));
         theme = getTheme(this) + getCustomTheme() + XposedApp.getPreferences().getBoolean("md2", false);
     }
 
diff --git a/app/src/main/java/org/meowcat/edxposed/manager/util/DownloadsUtil.java b/app/src/main/java/org/meowcat/edxposed/manager/util/DownloadsUtil.java
index 19341660..68d05c61 100644
--- a/app/src/main/java/org/meowcat/edxposed/manager/util/DownloadsUtil.java
+++ b/app/src/main/java/org/meowcat/edxposed/manager/util/DownloadsUtil.java
@@ -47,7 +47,14 @@ public class DownloadsUtil {
         request.setTitle(b.title);
         request.setMimeType(b.mimeType.toString());
         request.setNotificationVisibility(Request.VISIBILITY_VISIBLE);
-        File destination = new File(context.getExternalCacheDir(), "/downloads/" + b.title + b.mimeType.getExtension());
+        File path = new File(context.getExternalCacheDir(), "downloads");
+        try {
+            if (!path.mkdirs()) return null;
+        }catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        File destination = new File(path, b.title + b.mimeType.getExtension());
         removeAllForLocalFile(context, destination);
         request.setDestinationUri(Uri.fromFile(destination));
         DownloadManager dm = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
diff --git a/build.gradle b/build.gradle
index fa36b030..5ac27519 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
         
         // NOTE: Do not place your application dependencies here; they belong