cleanup

app/src/main/java/com/github/libretube/Globals.kt

@@ -5,9 +5,12 @@ package com.github.libretube
  */
 object Globals {
     // for the player fragment
-    var isFullScreen = false
+    var IS_FULL_SCREEN = false
-    var isMiniPlayerVisible = false
+    var MINI_PLAYER_VISIBLE = false
 
     // for the data saver mode
-    var dataSaverModeEnabled = false
+    var DATA_SAVER_MODE_ENABLED = false
+
+    // for downloads
+    var IS_DOWNLOAD_RUNNING = false
 }

app/src/main/java/com/github/libretube/activities/MainActivity.kt

@@ -76,7 +76,7 @@ class MainActivity : AppCompatActivity() {
             }
 
         // save whether the data saver mode is enabled
-        Globals.dataSaverModeEnabled = PreferenceHelper.getBoolean(
+        Globals.DATA_SAVER_MODE_ENABLED = PreferenceHelper.getBoolean(
             PreferenceKeys.DATA_SAVER_MODE,
             false
         )
@@ -320,7 +320,7 @@ class MainActivity : AppCompatActivity() {
             enableTransition(R.id.yt_transition, true)
         }
         findViewById<LinearLayout>(R.id.linLayout).visibility = View.VISIBLE
-        Globals.isFullScreen = false
+        Globals.IS_FULL_SCREEN = false
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {

app/src/main/java/com/github/libretube/dialogs/DownloadDialog.kt

@@ -1,24 +1,20 @@
 package com.github.libretube.dialogs
 
-import android.Manifest
 import android.app.Dialog
 import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import android.util.Log
 import android.widget.ArrayAdapter
 import android.widget.Toast
-import androidx.core.app.ActivityCompat
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.size
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.github.libretube.R
-import com.github.libretube.activities.MainActivity
 import com.github.libretube.databinding.DialogDownloadBinding
 import com.github.libretube.obj.Streams
 import com.github.libretube.services.DownloadService
+import com.github.libretube.util.PermissionHelper
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -36,45 +32,12 @@ class DownloadDialog : DialogFragment() {
         return activity?.let {
             videoId = arguments?.getString("video_id")!!
 
-            val mainActivity = activity as MainActivity
             val builder = MaterialAlertDialogBuilder(it)
             binding = DialogDownloadBinding.inflate(layoutInflater)
 
             fetchAvailableSources()
 
-            // request storage permissions if not granted yet
+            PermissionHelper.requestReadWrite(activity as AppCompatActivity)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                Log.d("myz", "" + Build.VERSION.SDK_INT)
-                if (!Environment.isExternalStorageManager()) {
-                    ActivityCompat.requestPermissions(
-                        mainActivity,
-                        arrayOf(
-                            Manifest.permission.READ_EXTERNAL_STORAGE,
-                            Manifest.permission.MANAGE_EXTERNAL_STORAGE
-                        ),
-                        1
-                    ) // permission request code is just an int
-                }
-            } else {
-                if (ActivityCompat.checkSelfPermission(
-                        requireContext(),
-                        Manifest.permission.READ_EXTERNAL_STORAGE
-                    ) != PackageManager.PERMISSION_GRANTED ||
-                    ActivityCompat.checkSelfPermission(
-                            requireContext(),
-                            Manifest.permission.WRITE_EXTERNAL_STORAGE
-                        ) != PackageManager.PERMISSION_GRANTED
-                ) {
-                    ActivityCompat.requestPermissions(
-                        mainActivity,
-                        arrayOf(
-                            Manifest.permission.READ_EXTERNAL_STORAGE,
-                            Manifest.permission.WRITE_EXTERNAL_STORAGE
-                        ),
-                        1
-                    )
-                }
-            }
 
             binding.title.text = ThemeHelper.getStyledAppName(requireContext())
 

app/src/main/java/com/github/libretube/fragments/LibraryFragment.kt

@@ -79,7 +79,7 @@ class LibraryFragment : Fragment() {
     override fun onResume() {
         // optimize CreatePlaylistFab bottom margin if miniPlayer active
         val layoutParams = binding.createPlaylist.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.bottomMargin = if (Globals.isMiniPlayerVisible) 180 else 64
+        layoutParams.bottomMargin = if (Globals.MINI_PLAYER_VISIBLE) 180 else 64
         binding.createPlaylist.layoutParams = layoutParams
         super.onResume()
     }

app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt

@@ -358,11 +358,11 @@ class PlayerFragment : Fragment() {
                 val mainMotionLayout =
                     mainActivity.binding.mainMotionLayout
                 if (currentId == eId) {
-                    Globals.isMiniPlayerVisible = true
+                    Globals.MINI_PLAYER_VISIBLE = true
                     exoPlayerView.useController = false
                     mainMotionLayout.progress = 1F
                 } else if (currentId == sId) {
-                    Globals.isMiniPlayerVisible = false
+                    Globals.MINI_PLAYER_VISIBLE = false
                     exoPlayerView.useController = true
                     mainMotionLayout.progress = 0F
                 }
@@ -384,7 +384,7 @@ class PlayerFragment : Fragment() {
     // actions that don't depend on video information
     private fun initializeOnClickActions() {
         binding.closeImageView.setOnClickListener {
-            Globals.isMiniPlayerVisible = false
+            Globals.MINI_PLAYER_VISIBLE = false
             binding.playerMotionLayout.transitionToEnd()
             val mainActivity = activity as MainActivity
             mainActivity.supportFragmentManager.beginTransaction()
@@ -392,7 +392,7 @@ class PlayerFragment : Fragment() {
                 .commit()
         }
         playerBinding.closeImageButton.setOnClickListener {
-            Globals.isMiniPlayerVisible = false
+            Globals.MINI_PLAYER_VISIBLE = false
             binding.playerMotionLayout.transitionToEnd()
             val mainActivity = activity as MainActivity
             mainActivity.supportFragmentManager.beginTransaction()
@@ -436,7 +436,7 @@ class PlayerFragment : Fragment() {
         playerBinding.fullscreen.setOnClickListener {
             // hide player controller
             exoPlayerView.hideController()
-            if (!Globals.isFullScreen) {
+            if (!Globals.IS_FULL_SCREEN) {
                 // go to fullscreen mode
                 setFullscreen()
             } else {
@@ -578,7 +578,7 @@ class PlayerFragment : Fragment() {
             mainActivity.requestedOrientation = orientation
         }
 
-        Globals.isFullScreen = true
+        Globals.IS_FULL_SCREEN = true
     }
 
     private fun unsetFullscreen() {
@@ -602,7 +602,7 @@ class PlayerFragment : Fragment() {
             mainActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
         }
 
-        Globals.isFullScreen = false
+        Globals.IS_FULL_SCREEN = false
     }
 
     private fun scaleControls(scaleFactor: Float) {
@@ -983,7 +983,7 @@ class PlayerFragment : Fragment() {
         if (response.duration!! > 0) {
             // download clicked
             binding.relPlayerDownload.setOnClickListener {
-                if (!IS_DOWNLOAD_RUNNING) {
+                if (!Globals.IS_DOWNLOAD_RUNNING) {
                     val newFragment = DownloadDialog()
                     val bundle = Bundle()
                     bundle.putString("video_id", videoId)
@@ -1214,7 +1214,7 @@ class PlayerFragment : Fragment() {
             }
             playerBinding.chapterLL.visibility = View.VISIBLE
             playerBinding.chapterLL.setOnClickListener {
-                if (Globals.isFullScreen) {
+                if (Globals.IS_FULL_SCREEN) {
                     MaterialAlertDialogBuilder(requireContext())
                         .setTitle(R.string.chapters)
                         .setItems(titles.toTypedArray()) { _, index ->
@@ -1505,13 +1505,13 @@ class PlayerFragment : Fragment() {
         playerBinding.closeImageButton.visibility = visibility
         playerBinding.exoTitle.visibility =
             if (isLocked &&
-                Globals.isFullScreen
+                Globals.IS_FULL_SCREEN
             ) View.VISIBLE else View.INVISIBLE
 
         // hide the close image button
         playerBinding.closeImageButton.visibility =
             if (isLocked &&
-                !(Globals.isFullScreen && !autoRotationEnabled)
+                !(Globals.IS_FULL_SCREEN && !autoRotationEnabled)
             ) View.VISIBLE else View.GONE
 
         // disable double tap to seek when the player is locked
@@ -1674,7 +1674,7 @@ class PlayerFragment : Fragment() {
             }
             binding.linLayout.visibility = View.GONE
 
-            Globals.isFullScreen = false
+            Globals.IS_FULL_SCREEN = false
         } else {
             // enable exoPlayer controls again
             exoPlayerView.useController = true
@@ -1692,7 +1692,7 @@ class PlayerFragment : Fragment() {
         binding.playerScrollView.getHitRect(bounds)
 
         if (SDK_INT >= Build.VERSION_CODES.O &&
-            (binding.playerScrollView.getLocalVisibleRect(bounds) || Globals.isFullScreen)
+            (binding.playerScrollView.getLocalVisibleRect(bounds) || Globals.IS_FULL_SCREEN)
         ) {
             activity?.enterPictureInPictureMode(updatePipParams())
         }

app/src/main/java/com/github/libretube/preferences/InstanceSettings.kt

@@ -1,18 +1,14 @@
 package com.github.libretube.preferences
 
-import android.Manifest
 import android.content.ContentResolver
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.app.ActivityCompat
+import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.ListPreference
@@ -26,6 +22,7 @@ import com.github.libretube.dialogs.DeleteAccountDialog
 import com.github.libretube.dialogs.LoginDialog
 import com.github.libretube.dialogs.LogoutDialog
 import com.github.libretube.dialogs.RequireRestartDialog
+import com.github.libretube.util.PermissionHelper
 import com.github.libretube.util.RetrofitInstance
 import org.json.JSONObject
 import org.json.JSONTokener
@@ -288,51 +285,7 @@ class InstanceSettings : PreferenceFragmentCompat() {
     private fun importSubscriptions() {
         val token = PreferenceHelper.getToken()
         // check StorageAccess
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        PermissionHelper.requestReadWrite(activity as AppCompatActivity)
-            Log.d("myz", "" + Build.VERSION.SDK_INT)
-            if (ContextCompat.checkSelfPermission(
-                    this.requireContext(),
-                    Manifest.permission.READ_EXTERNAL_STORAGE
-                )
-                != PackageManager.PERMISSION_GRANTED
-            ) {
-                ActivityCompat.requestPermissions(
-                    this.requireActivity(),
-                    arrayOf(
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.MANAGE_EXTERNAL_STORAGE
-                    ),
-                    1
-                ) // permission request code is just an int
-            } else if (token != "") {
-                MainSettings.getContent.launch("*/*")
-            } else {
-                Toast.makeText(context, R.string.login_first, Toast.LENGTH_SHORT).show()
-            }
-        } else {
-            if (ActivityCompat.checkSelfPermission(
-                    requireContext(),
-                    Manifest.permission.READ_EXTERNAL_STORAGE
-                ) != PackageManager.PERMISSION_GRANTED ||
-                ActivityCompat.checkSelfPermission(
-                        requireContext(),
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    ) != PackageManager.PERMISSION_GRANTED
-            ) {
-                ActivityCompat.requestPermissions(
-                    this.requireActivity(),
-                    arrayOf(
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE
-                    ),
-                    1
-                )
-            } else if (token != "") {
-                MainSettings.getContent.launch("*/*")
-            } else {
-                Toast.makeText(context, R.string.login_first, Toast.LENGTH_SHORT).show()
-            }
-        }
     }
 
     private fun subscribe(channels: List<String>) {

app/src/main/java/com/github/libretube/preferences/MainSettings.kt

@@ -11,7 +11,7 @@ import com.github.libretube.R
 import com.github.libretube.activities.SettingsActivity
 import com.github.libretube.dialogs.RequireRestartDialog
 import com.github.libretube.dialogs.UpdateDialog
-import com.github.libretube.update.checkUpdate
+import com.github.libretube.update.UpdateChecker
 import com.github.libretube.util.ThemeHelper
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.CoroutineScope
@@ -93,7 +93,7 @@ class MainSettings : PreferenceFragmentCompat() {
         update?.setOnPreferenceClickListener {
             CoroutineScope(Dispatchers.IO).launch {
                 // check for update
-                val updateInfo = checkUpdate()
+                val updateInfo = UpdateChecker.checkUpdate()
                 if (updateInfo?.name != "" && BuildConfig.VERSION_NAME != updateInfo?.name) {
                     // show the UpdateAvailableDialog if there's an update available
                     val updateAvailableDialog = UpdateDialog(updateInfo!!)

app/src/main/java/com/github/libretube/services/DownloadService.kt

@@ -18,14 +18,13 @@ import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.arthenica.ffmpegkit.FFmpegKit
+import com.github.libretube.Globals
 import com.github.libretube.R
 import com.github.libretube.obj.DownloadType
 import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.preferences.PreferenceKeys
 import java.io.File
 
-var IS_DOWNLOAD_RUNNING = false
-
 class DownloadService : Service() {
     val TAG = "DownloadService"
 
@@ -45,7 +44,7 @@ class DownloadService : Service() {
     private lateinit var tempDir: File
     override fun onCreate() {
         super.onCreate()
-        IS_DOWNLOAD_RUNNING = true
+        Globals.IS_DOWNLOAD_RUNNING = true
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -283,7 +282,7 @@ class DownloadService : Service() {
         } catch (e: Exception) {
         }
 
-        IS_DOWNLOAD_RUNNING = false
+        Globals.IS_DOWNLOAD_RUNNING = false
         Log.d(TAG, "dl finished!")
         stopForeground(true)
         stopService(Intent(this@DownloadService, DownloadService::class.java))

app/src/main/java/com/github/libretube/update/UpdateChecker.kt

@@ -7,36 +7,38 @@ import java.io.InputStreamReader
 import java.net.URL
 import javax.net.ssl.HttpsURLConnection
 
-fun checkUpdate(): UpdateInfo? {
+object UpdateChecker {
-    var versionInfo: UpdateInfo? = null
+    fun checkUpdate(): UpdateInfo? {
-    // run http request as thread to make it async
+        var versionInfo: UpdateInfo? = null
-    val thread = Thread {
+        // run http request as thread to make it async
-        // otherwise crashes without internet
+        val thread = Thread {
-        try {
+            // otherwise crashes without internet
-            versionInfo = getUpdateInfo()
+            try {
-        } catch (e: Exception) {
+                versionInfo = getUpdateInfo()
+            } catch (e: Exception) {
+            }
         }
+        thread.start()
+        // wait for the thread to finish
+        thread.join()
+
+        // return the information about the latest version
+        return versionInfo
     }
-    thread.start()
-    // wait for the thread to finish
-    thread.join()
 
-    // return the information about the latest version
+    fun getUpdateInfo(): UpdateInfo? {
-    return versionInfo
+        val latest = URL(GITHUB_API_URL)
-}
+        val json = StringBuilder()
-
+        val urlConnection: HttpsURLConnection?
-fun getUpdateInfo(): UpdateInfo? {
+        urlConnection = latest.openConnection() as HttpsURLConnection
-    val latest = URL(GITHUB_API_URL)
+
-    val json = StringBuilder()
+        // read json
-    val urlConnection: HttpsURLConnection?
+        val br = BufferedReader(InputStreamReader(urlConnection.inputStream))
-    urlConnection = latest.openConnection() as HttpsURLConnection
+        var line: String?
-
+        while (br.readLine().also { line = it } != null) json.append(line)
-    // read json
+
-    val br = BufferedReader(InputStreamReader(urlConnection.inputStream))
+        // Parse and return the json data
-    var line: String?
+        val gson = Gson()
-    while (br.readLine().also { line = it } != null) json.append(line)
+        return gson.fromJson(json.toString(), UpdateInfo::class.java)
-
+    }
-    // Parse and return the json data
-    val gson = Gson()
-    return gson.fromJson(json.toString(), UpdateInfo::class.java)
 }

app/src/main/java/com/github/libretube/util/ConnectionHelper.kt

@@ -40,7 +40,7 @@ object ConnectionHelper {
     // load an image from a url into an imageView
     fun loadImage(url: String?, target: ImageView) {
         // only load the image if the data saver mode is disabled
-        if (!Globals.dataSaverModeEnabled) {
+        if (!Globals.DATA_SAVER_MODE_ENABLED) {
             Picasso.get().load(url).fit().centerCrop().into(target)
         }
     }

app/src/main/java/com/github/libretube/util/PermissionHelper.kt

@@ -0,0 +1,47 @@
+package com.github.libretube.util
+
+import android.Manifest
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Environment
+import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+
+object PermissionHelper {
+    fun requestReadWrite(activity: AppCompatActivity) {
+        // request storage permissions if not granted yet
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            Log.d("myz", "" + Build.VERSION.SDK_INT)
+            if (!Environment.isExternalStorageManager()) {
+                ActivityCompat.requestPermissions(
+                    activity,
+                    arrayOf(
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.MANAGE_EXTERNAL_STORAGE
+                    ),
+                    1
+                ) // permission request code is just an int
+            }
+        } else {
+            if (ActivityCompat.checkSelfPermission(
+                    activity,
+                    Manifest.permission.READ_EXTERNAL_STORAGE
+                ) != PackageManager.PERMISSION_GRANTED ||
+                ActivityCompat.checkSelfPermission(
+                        activity,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    ) != PackageManager.PERMISSION_GRANTED
+            ) {
+                ActivityCompat.requestPermissions(
+                    activity,
+                    arrayOf(
+                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE
+                    ),
+                    1
+                )
+            }
+        }
+    }
+}