From e0bc57655a868ca0c81de7572053f16ca3faeb7a Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Wed, 26 Apr 2023 22:32:12 +0200
Subject: [PATCH] theme fixes

---
 .../main/java/com/deniscerri/ytdlnis/App.kt   |  8 ----
 .../com/deniscerri/ytdlnis/MainActivity.kt    |  1 -
 .../ytdlnis/receiver/ShareActivity.kt         |  1 -
 .../ytdlnis/util/NotificationUtil.kt          | 44 ++++++++++---------
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/deniscerri/ytdlnis/App.kt b/app/src/main/java/com/deniscerri/ytdlnis/App.kt
index a88a010e..ca9e0e28 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/App.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/App.kt
@@ -47,14 +47,6 @@ class App : Application() {
             }
         }
 
-        AppCompatDelegate.setDefaultNightMode(
-            when(sharedPreferences.getString("ytdlnis_theme", "Default")){
-                "Default" -> MODE_NIGHT_FOLLOW_SYSTEM
-                "Dark" -> MODE_NIGHT_YES
-                else -> MODE_NIGHT_NO
-            }
-        )
-
         WorkManager.initialize(
             this@App,
             Configuration.Builder()
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt
index 951191ec..07aadba4 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/MainActivity.kt
@@ -66,7 +66,6 @@ class MainActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        ThemeUtil.updateTheme(this)
         setContentView(R.layout.activity_main)
         context = baseContext
         resultViewModel = ViewModelProvider(this)[ResultViewModel::class.java]
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt
index 735dc295..0d162aaa 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/receiver/ShareActivity.kt
@@ -57,7 +57,6 @@ class ShareActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        ThemeUtil.updateTheme(this)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets ->
             v.setPadding(0, 0, 0, 0)
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt
index 3c4a714b..59b25ca4 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt
@@ -127,31 +127,33 @@ class NotificationUtil(var context: Context) {
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
             .clearActions()
         if (filepath != null){
-            val file = File(filepath)
-            val uri = FileProvider.getUriForFile(
-                context,
-                "com.deniscerri.ytdl.fileprovider",
-                file
-            )
+            try{
+                val file = File(filepath)
+                val uri = FileProvider.getUriForFile(
+                    context,
+                    "com.deniscerri.ytdl.fileprovider",
+                    file
+                )
 
-            //open intent
-            val intent = Intent()
-            intent.action = Intent.ACTION_VIEW
-            intent.setDataAndType(uri, "*/*")
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            val openNotificationPendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
+                //open intent
+                val intent = Intent()
+                intent.action = Intent.ACTION_VIEW
+                intent.setDataAndType(uri, "*/*")
+                intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                val openNotificationPendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
 
-            //share intent
-            val shareIntent = Intent(context, SharedDownloadNotificationReceiver::class.java)
-            shareIntent.putExtra("share", "")
-            shareIntent.putExtra("path", filepath)
-            shareIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
-            shareIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            val shareNotificationPendingIntent = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_IMMUTABLE)
+                //share intent
+                val shareIntent = Intent(context, SharedDownloadNotificationReceiver::class.java)
+                shareIntent.putExtra("share", "")
+                shareIntent.putExtra("path", filepath)
+                shareIntent.putExtra("notificationID", DOWNLOAD_FINISHED_NOTIFICATION_ID)
+                shareIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                val shareNotificationPendingIntent = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_IMMUTABLE)
 
 
-            notificationBuilder.addAction(0, context.getString(R.string.Open_File), openNotificationPendingIntent)
-            notificationBuilder.addAction(0, context.getString(R.string.share), shareNotificationPendingIntent)
+                notificationBuilder.addAction(0, context.getString(R.string.Open_File), openNotificationPendingIntent)
+                notificationBuilder.addAction(0, context.getString(R.string.share), shareNotificationPendingIntent)
+            }catch (_: Exception){}
         }
         notificationManager.notify(DOWNLOAD_FINISHED_NOTIFICATION_ID, notificationBuilder.build())
     }