From 837a888b372ba341a4b757233d1c3bb3e3f76234 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Wed, 6 Jul 2022 11:40:02 +0300
Subject: [PATCH] some music fixes

---
 .../lite/downloaders/OTADownloader.java        |  3 +--
 .../java/ru/vtosters/lite/utils/Globals.java   | 18 ++++--------------
 .../ru/vtosters/lite/utils/Preferences.java    |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java
index fc79a181a..e77f07b46 100644
--- a/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java
+++ b/app/src/main/java/ru/vtosters/lite/downloaders/OTADownloader.java
@@ -23,8 +23,7 @@ public class OTADownloader{
         @Override
         public void onReceive(Context context, Intent intent){
             var extras = intent.getExtras();
-            if(extras == null
-                    || !intent.getAction().equals(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+            if(extras == null || !intent.getAction().equals(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
                 return;
 
             var query = new DownloadManager.Query();
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java
index ce880bb84..3d2027e2e 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java
@@ -317,22 +317,12 @@ public class Globals{
     } // Network check
 
     public static void fixGapps(){
-        try {
-            if(Build.VERSION.SDK_INT >= 26){
-                NotificationManager notificationManager = (NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE);
-                boolean hasMusicChannel = false;
+        if(Build.VERSION.SDK_INT >= 26){
+            NotificationManager notificationManager = (NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE);
 
-                try {
-                    if(notificationManager.getNotificationChannel("audio_playback_channel") != null){
-                        hasMusicChannel = true;
-                    }
-                } catch (Exception ignored) {
-                }
-                if(!hasMusicChannel){
-                    notificationManager.createNotificationChannel(new NotificationChannel("audio_playback_channel", getResources().getString(getIdentifier("audio_message_play_error", "string")), NotificationManager.IMPORTANCE_LOW));
-                }
+            if(notificationManager.getNotificationChannel("audio_playback_channel") == null){
+                notificationManager.createNotificationChannel(new NotificationChannel("audio_playback_channel", getResources().getString(getIdentifier("audio_message_play_error", "string")), NotificationManager.IMPORTANCE_LOW));
             }
-        } catch (Exception ignored) {
         }
     } // Music channels fix
 
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
index 7bda6e3dc..3fa06231a 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -36,7 +36,7 @@ public class Preferences{
     public static SharedPreferences preferences = getContext().getSharedPreferences("com.vtosters.lite_preferences", Context.MODE_PRIVATE);
     public static String VERSIONNAME = "Beta";
 
-    public static void init(Application application){
+    public static void init(Application application) throws Exception{
         setupFilters();
         fixGapps();
         setProxy();