Add exception handling for background updater

app/src/main/AndroidManifest.xml

@@ -261,5 +261,12 @@
             android:name=".UpdateActionReceiver"
             android:exported="false" />
 
+        <activity
+            android:name=".activities.InstallUpdateActivity"
+            android:exported="false"
+            android:theme="@style/Theme.App.TransparentNoUi"
+            android:excludeFromRecents="true"
+            android:finishOnTaskLaunch="true" />
+
     </application>
 </manifest>

app/src/main/java/com/futo/platformplayer/UpdateActionReceiver.kt

@@ -17,7 +17,6 @@ class UpdateActionReceiver : BroadcastReceiver() {
             UpdateNotificationManager.ACTION_UPDATE_NO -> handleUpdateNo(context)
             UpdateNotificationManager.ACTION_UPDATE_NEVER -> handleUpdateNever(context)
             UpdateNotificationManager.ACTION_DOWNLOAD_CANCEL -> handleDownloadCancel(context, intent)
-            UpdateNotificationManager.ACTION_INSTALL_NOW -> handleInstallNow(context, intent)
         }
     }
 
@@ -31,24 +30,10 @@ class UpdateActionReceiver : BroadcastReceiver() {
 
         NotificationManagerCompat.from(context).cancel(UpdateNotificationManager.NOTIF_ID_AVAILABLE)
 
-        if (Settings.instance.autoUpdate.backgroundDownload == 1) {
-            val serviceIntent = Intent(context, UpdateDownloadService::class.java).apply {
-                putExtra(UpdateDownloadService.EXTRA_VERSION, version)
-            }
-            ContextCompat.startForegroundService(context, serviceIntent)
-        } else {
-            if (StateApp.instance.isMainActive) {
-                StateApp.withContext { ctx ->
-                    UIDialogs.showUpdateAvailableDialog(ctx, version, false)
-                }
-            } else {
-                val startIntent = Intent(context, MainActivity::class.java).apply {
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                    putExtra("SHOW_UPDATE_DIALOG_VERSION", version)
-                }
-                context.startActivity(startIntent)
-            }
+        val serviceIntent = Intent(context, UpdateDownloadService::class.java).apply {
+            putExtra(UpdateDownloadService.EXTRA_VERSION, version)
         }
+        ContextCompat.startForegroundService(context, serviceIntent)
     }
 
     private fun handleUpdateNo(context: Context) {
@@ -75,22 +60,4 @@ class UpdateActionReceiver : BroadcastReceiver() {
 
         NotificationManagerCompat.from(context).cancel(UpdateNotificationManager.NOTIF_ID_DOWNLOADING)
     }
-
-    private fun handleInstallNow(context: Context, intent: Intent) {
-        val version = intent.getIntExtra(UpdateNotificationManager.EXTRA_VERSION, 0)
-        val apkPath = intent.getStringExtra(UpdateNotificationManager.EXTRA_APK_PATH)
-
-        if (version == 0 || apkPath.isNullOrEmpty()) {
-            return
-        }
-
-        val apkFile = File(apkPath)
-        if (!apkFile.exists()) {
-            return
-        }
-
-        UpdateNotificationManager.cancelAll(context)
-        UpdateInstaller.startInstall(context, apkFile)
-        UpdateDownloadService.updateDownloadedDialog?.dismiss()
-    }
 }

app/src/main/java/com/futo/platformplayer/UpdateDownloadService.kt

@@ -4,6 +4,7 @@ import android.app.Dialog
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
+import com.futo.platformplayer.UIDialogs.ActionStyle
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateUpdate
@@ -219,10 +220,16 @@ class UpdateDownloadService : Service() {
             StateApp.instance.scopeOrNull?.launch(Dispatchers.Main) {
                 StateApp.withContext { ctx ->
                     try {
-                        updateDownloadedDialog = UIDialogs.showConfirmationDialog(ctx, "Update downloaded, press confirm to install", {
-                            UpdateNotificationManager.cancelAll(ctx)
-                            UpdateInstaller.startInstall(ctx, apkFile)
-                        }, dismissAction = { updateDownloadedDialog = null })
+                        updateDownloadedDialog = UIDialogs.showDialog(ctx, R.drawable.foreground,
+                            "Update downloaded",
+                            "Would you like to install it now?", null, 0,
+                            UIDialogs.Action("Cancel", {
+                                updateDownloadedDialog = null
+                            }, ActionStyle.NONE, true),
+                            UIDialogs.Action("Install", {
+                                UpdateNotificationManager.cancelAll(ctx)
+                                UpdateInstaller.startInstall(ctx, apkFile)
+                            }, ActionStyle.PRIMARY, true));
                     } catch (t: Throwable) {
                         Logger.w(TAG, "Failed to show in-app update downloaded dialog", t)
                         updateDownloadedDialog = null

app/src/main/java/com/futo/platformplayer/UpdateInstaller.kt

@@ -7,7 +7,9 @@ import android.app.PendingIntent.getBroadcast
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageInstaller
+import android.graphics.drawable.Animatable
 import android.provider.Settings
+import android.view.View
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.receivers.InstallReceiver
 import kotlinx.coroutines.Dispatchers
@@ -17,6 +19,8 @@ import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.InputStream
 import androidx.core.net.toUri
+import com.futo.platformplayer.dialogs.AutoUpdateDialog
+import com.futo.platformplayer.states.StateApp
 
 object UpdateInstaller {
     private const val TAG = "UpdateInstaller"
@@ -53,8 +57,8 @@ object UpdateInstaller {
         GlobalScope.launch(Dispatchers.IO) {
             var inputStream: InputStream? = null
             var session: PackageInstaller.Session? = null
-
             try {
+
                 val packageInstaller: PackageInstaller = context.packageManager.packageInstaller
                 val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL)
                 val sessionId = packageInstaller.createSession(params)
@@ -72,6 +76,10 @@ object UpdateInstaller {
                 val pendingIntent = getBroadcast(context, 0, intent, FLAG_MUTABLE or FLAG_UPDATE_CURRENT)
                 val statusReceiver = pendingIntent.intentSender
 
+                InstallReceiver.onReceiveResult.subscribe(this) { message ->
+                    InstallReceiver.onReceiveResult.clear();
+                    onReceiveResult(context, message);
+                };
                 Logger.i(TAG, "Committing install session for ${apkFile.absolutePath}")
                 session.commit(statusReceiver)
             } catch (e: Throwable) {
@@ -86,4 +94,11 @@ object UpdateInstaller {
             }
         }
     }
+
+
+
+    private fun onReceiveResult(context: Context, result: String?) {
+        InstallReceiver.onReceiveResult.remove(this);
+        UIDialogs.showGeneralErrorDialog(context, "Install failed due to:\n" + result);
+    }
 }

app/src/main/java/com/futo/platformplayer/UpdateNotificationManager.kt

@@ -4,6 +4,7 @@ import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
+import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_MUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.app.PendingIntent.getBroadcast
@@ -13,6 +14,7 @@ import android.content.pm.PackageManager
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
+import com.futo.platformplayer.activities.InstallUpdateActivity
 import java.io.File
 
 object UpdateNotificationManager {
@@ -25,6 +27,7 @@ object UpdateNotificationManager {
     const val ACTION_UPDATE_NEVER = "com.futo.platformplayer.UPDATE_NEVER"
     const val ACTION_DOWNLOAD_CANCEL = "com.futo.platformplayer.UPDATE_CANCEL"
     const val ACTION_INSTALL_NOW = "com.futo.platformplayer.UPDATE_INSTALL"
+    private const val REQUEST_CODE_INSTALL = 1001
 
     const val EXTRA_VERSION = "version"
     const val EXTRA_APK_PATH = "apk_path"
@@ -36,12 +39,17 @@ object UpdateNotificationManager {
     fun ensureChannel(context: Context) {
         val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         if (manager.getNotificationChannel(CHANNEL_ID) == null) {
-            val channel = NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT)
-            channel.description = CHANNEL_DESCRIPTION
+            val channel = NotificationChannel(CHANNEL_ID, CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT).apply {
+                description = CHANNEL_DESCRIPTION
+                enableVibration(false)
+                enableLights(false)
+                setSound(null, null)
+            }
             manager.createNotificationChannel(channel)
         }
     }
 
+
     fun showUpdateAvailableNotification(context: Context, version: Int) {
         if (ContextCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
             return
@@ -70,9 +78,10 @@ object UpdateNotificationManager {
             .setContentText("A new version ($version) is available.")
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setAutoCancel(true)
-            .addAction(0, "Download", yesPendingIntent)
-            .addAction(0, "Not now", noPendingIntent)
+            .setSilent(true)
             .addAction(0, "Never", neverPendingIntent)
+            .addAction(0, "Not now", noPendingIntent)
+            .addAction(0, "Download", yesPendingIntent)
 
         NotificationManagerCompat.from(context).notify(NOTIF_ID_AVAILABLE, builder.build())
     }
@@ -97,6 +106,7 @@ object UpdateNotificationManager {
             .setContentText("Downloading version $version")
             .setPriority(NotificationCompat.PRIORITY_LOW)
             .setOngoing(true)
+            .setSilent(true)
             .addAction(0, "Cancel", cancelPendingIntent)
 
         if (indeterminate) {
@@ -123,17 +133,8 @@ object UpdateNotificationManager {
         }
         ensureChannel(context)
 
-        val installIntent = Intent(context, UpdateActionReceiver::class.java).apply {
-            action = ACTION_INSTALL_NOW
-            putExtra(EXTRA_VERSION, version)
-            putExtra(EXTRA_APK_PATH, apkFile.absolutePath)
-        }
-        val installPendingIntent = getBroadcast(
-            context,
-            4,
-            installIntent,
-            FLAG_MUTABLE or FLAG_UPDATE_CURRENT
-        )
+        val installIntent = InstallUpdateActivity.createIntent(context, version, apkFile.absolutePath)
+        val installPendingIntent = PendingIntent.getActivity(context, REQUEST_CODE_INSTALL, installIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
 
         val builder = NotificationCompat.Builder(context, CHANNEL_ID)
             .setSmallIcon(R.drawable.foreground)
@@ -141,6 +142,7 @@ object UpdateNotificationManager {
             .setContentText("Tap to install version $version.")
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setAutoCancel(true)
+            .setSilent(true)
             .addAction(0, "Install", installPendingIntent)
 
         NotificationManagerCompat.from(context).notify(NOTIF_ID_READY, builder.build())
@@ -159,6 +161,7 @@ object UpdateNotificationManager {
             .setContentText(error?.message ?: "Unknown error")
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
             .setAutoCancel(true)
+            .setSilent(true)
 
         NotificationManagerCompat.from(context).notify(NOTIF_ID_READY, builder.build())
     }

app/src/main/java/com/futo/platformplayer/Utility.kt

@@ -445,8 +445,8 @@ fun addressScore(addr: InetAddress): Int {
 fun <T> Enumeration<T>.toList(): List<T> = Collections.list(this)
 
 fun <T> RequestBuilder<T>.withMaxSizePx(maxSizePx: Int = 1920): RequestBuilder<T> {
-    return this
-        .downsample(DownsampleStrategy.AT_MOST)
-        .override(maxSizePx, maxSizePx)
-        .centerInside()
+    return this;
+        //.downsample(DownsampleStrategy.AT_MOST)
+        //.override(maxSizePx, maxSizePx)
+        //.centerInside()
 }

app/src/main/java/com/futo/platformplayer/activities/InstallUpdateActivity.kt

@@ -0,0 +1,47 @@
+package com.futo.platformplayer.activities
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.UpdateInstaller
+import com.futo.platformplayer.UpdateNotificationManager
+import com.futo.platformplayer.logging.Logger
+import java.io.File
+
+class InstallUpdateActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val version = intent.getIntExtra(UpdateNotificationManager.EXTRA_VERSION, 0)
+        val apkPath = intent.getStringExtra(UpdateNotificationManager.EXTRA_APK_PATH)
+
+        if (version == 0 || apkPath.isNullOrEmpty()) {
+            Logger.w("InstallUpdateActivity", "Missing version or apkPath")
+            finish()
+            return
+        }
+
+        val apkFile = File(apkPath)
+        if (!apkFile.exists()) {
+            Logger.w("InstallUpdateActivity", "APK file does not exist: $apkPath")
+            UIDialogs.Companion.toast(this, "Update file missing")
+            finish()
+            return
+        }
+
+        UpdateInstaller.startInstall(this, apkFile)
+        finish()
+    }
+
+    companion object {
+        fun createIntent(context: Context, version: Int, apkPath: String): Intent =
+            Intent(context, InstallUpdateActivity::class.java).apply {
+                putExtra(UpdateNotificationManager.EXTRA_VERSION, version)
+                putExtra(UpdateNotificationManager.EXTRA_APK_PATH, apkPath)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+    }
+}

app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt

@@ -1302,7 +1302,15 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
                     finish();
                 } else {
                     //UIDialogs.toast("Grayjay continues in background because of an open video.")
-                    moveTaskToBack(false);
+                    if(Settings.instance.playback.isBackgroundPictureInPicture()) {
+                        try {
+                            _fragVideoDetail._viewDetail?.startPictureInPicture();
+                            _fragVideoDetail?.forcePictureInPicture();
+                        } catch (ex: Throwable) {
+                        } //Fail silently
+                    }
+                    else
+                     moveTaskToBack(false);
                     /*
                     UIDialogs.showConfirmationDialog(this, "There is a video playing, are you sure you want to exit the app?", {
                         finish();

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/bottombar/MenuBottomBarFragment.kt

@@ -155,15 +155,16 @@ class MenuBottomBarFragment : MainActivityFragment() {
                     StateApp.instance.setPrivacyMode(true);
                     UIDialogs.appToast("Privacy mode enabled");
 
-                    UIDialogs.showDialog(it.context ?: return@setOnClickListener, R.drawable.incognito, "Privacy Mode",
-                        "All requests will be processed anonymously (any logins will be disabled except for the personalized home page), local playback and history tracking will also be disabled.\n\nTap the icon to disable.", null, 0,
-                        UIDialogs.Action("Don't show again", {
-                            Settings.instance.other.showPrivacyModeDialog = false;
-                            Settings.instance.save();
-                        }, UIDialogs.ActionStyle.NONE),
-                        UIDialogs.Action("Understood", {
+                    if(Settings.instance.other.showPrivacyModeDialog)
+                        UIDialogs.showDialog(it.context ?: return@setOnClickListener, R.drawable.incognito, "Privacy Mode",
+                            "All requests will be processed anonymously (any logins will be disabled except for the personalized home page), local playback and history tracking will also be disabled.\n\nTap the icon to disable.", null, 0,
+                            UIDialogs.Action("Don't show again", {
+                                Settings.instance.other.showPrivacyModeDialog = false;
+                                Settings.instance.save();
+                            }, UIDialogs.ActionStyle.NONE),
+                            UIDialogs.Action("Understood", {
 
-                        }, UIDialogs.ActionStyle.PRIMARY));
+                            }, UIDialogs.ActionStyle.PRIMARY));
                 }
             }
 

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/LoginFragment.kt

@@ -55,7 +55,7 @@ class LoginFragment : MainFragment() {
         fun showLogin(config: SourcePluginConfig, callback: ((SourceAuth?) -> Unit)? = null) {
             if(_callback != null) _callback?.invoke(null);
             _callback = callback;
-            StateApp.instance.activity?.navigate<LoginFragment>(config, false);
+            StateApp.instance.activity?.navigate<LoginFragment>(config, true);
         }
     }
 

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt

@@ -50,7 +50,7 @@ class VideoDetailFragment() : MainFragment() {
 
     private var _isActive: Boolean = false;
 
-    private var _viewDetail : VideoDetailView? = null;
+    var _viewDetail : VideoDetailView? = null;
     private var _view : SingleViewTouchableMotionLayout? = null;
 
     var isFullscreen : Boolean = false;
@@ -450,7 +450,8 @@ class VideoDetailFragment() : MainFragment() {
         if (viewDetail.shouldEnterPictureInPicture) {
             _leavingPiP = false
         }
-        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.S && viewDetail.preventPictureInPicture == false && !StateCasting.instance.isCasting && Settings.instance.playback.isBackgroundPictureInPicture() && !viewDetail.isAudioOnlyUserAction) {
+        val shouldPiP = Settings.instance.playback.isBackgroundPictureInPicture()
+        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.S && viewDetail.preventPictureInPicture == false && !StateCasting.instance.isCasting && shouldPiP && !viewDetail.isAudioOnlyUserAction) {
             val params = _viewDetail?.getPictureInPictureParams();
             if(params != null) {
                 Logger.i(TAG, "enterPictureInPictureMode")

app/src/main/java/com/futo/platformplayer/fragment/mainactivity/topbar/GeneralTopBarFragment.kt

@@ -1,5 +1,6 @@
 package com.futo.platformplayer.fragment.mainactivity.topbar
 
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -49,7 +50,11 @@ class GeneralTopBarFragment : TopFragment() {
             } else if (currentMain is PlaylistsFragment || currentMain is PlaylistFragment) {
                 navigate<SuggestionsFragment>(SuggestionsFragmentData("", SearchType.PLAYLIST));
             } else if (currentMain is LibraryFragment) {
-                navigate<LibrarySearchFragment>();
+                if(Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                    UIDialogs.toast("Your Android version is too old for Mediastore search", true);
+                }
+                else
+                    navigate<LibrarySearchFragment>();
             } else {
                 navigate<SuggestionsFragment>(SuggestionsFragmentData("", SearchType.VIDEO));
             }

app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt

@@ -169,6 +169,9 @@ class StatePlugins {
             return false;
 
         LoginFragment.showLogin(config) {//LoginActivity.showLogin(context, config) {
+
+            if(it == null)
+                return@showLogin;
             try {
                 StatePlugins.instance.setPluginAuth(config.id, it);
             } catch (e: Throwable) {

app/src/main/res/values/themes.xml

@@ -116,4 +116,14 @@
         <item name="android:fontFamily">@font/inter_regular</item>
     </style>
 
+    <style name="Theme.App.TransparentNoUi" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+    </style>
+
 </resources>