From 0ab055303d53ccd00ae25dccc81c08e4aa79106b Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Thu, 8 Sep 2022 18:31:22 +0200
Subject: [PATCH] minor code improvements

---
 .../com/github/libretube/activities/MainActivity.kt  | 12 +++++-------
 .../com/github/libretube/util/NotificationHelper.kt  |  2 +-
 .../java/com/github/libretube/util/PlayerHelper.kt   |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
index c2b4bbb3c..a0cbaed35 100644
--- a/app/src/main/java/com/github/libretube/activities/MainActivity.kt
+++ b/app/src/main/java/com/github/libretube/activities/MainActivity.kt
@@ -167,15 +167,13 @@ class MainActivity : BaseActivity() {
                 if (binding.mainMotionLayout.progress == 0F) {
                     try {
                         minimizePlayer()
+                        return
                     } catch (e: Exception) {
-                        if (navController.currentDestination?.id == startFragmentId) {
-                            // close app
-                            moveTaskToBack(true)
-                        } else {
-                            navController.popBackStack()
-                        }
+                        // current fragment isn't the player fragment
                     }
-                } else if (navController.currentDestination?.id == startFragmentId) {
+                }
+
+                if (navController.currentDestination?.id == startFragmentId) {
                     moveTaskToBack(true)
                 } else {
                     navController.popBackStack()
diff --git a/app/src/main/java/com/github/libretube/util/NotificationHelper.kt b/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
index a0c855250..100e84b18 100644
--- a/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/NotificationHelper.kt
@@ -17,8 +17,8 @@ import com.github.libretube.R
 import com.github.libretube.activities.MainActivity
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.SubscriptionHelper
-import com.github.libretube.extensions.toID
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.extensions.toID
 import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import java.util.concurrent.TimeUnit
diff --git a/app/src/main/java/com/github/libretube/util/PlayerHelper.kt b/app/src/main/java/com/github/libretube/util/PlayerHelper.kt
index a1543bec2..fb53e0ac5 100644
--- a/app/src/main/java/com/github/libretube/util/PlayerHelper.kt
+++ b/app/src/main/java/com/github/libretube/util/PlayerHelper.kt
@@ -2,8 +2,8 @@ package com.github.libretube.util
 
 import android.content.Context
 import android.view.accessibility.CaptioningManager
-import com.github.libretube.obj.PipedStream
 import com.github.libretube.constants.PreferenceKeys
+import com.github.libretube.obj.PipedStream
 import com.google.android.exoplayer2.ui.CaptionStyleCompat
 
 object PlayerHelper {