Merge branch 'master' of gitlab.futo.org:videostreaming/grayjay

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

@@ -48,6 +48,7 @@ import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.SubscriptionStorage
 import com.futo.platformplayer.stores.v2.ManagedStore
 import com.futo.platformplayer.views.ToastView
+import com.futo.polycentric.core.ApiMethods
 import com.google.gson.JsonParser
 import com.google.zxing.integration.android.IntentIntegrator
 import kotlinx.coroutines.*
@@ -154,6 +155,8 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
     }
 
     constructor() : super() {
+        ApiMethods.UserAgent = "Grayjay Android (${BuildConfig.VERSION_CODE})";
+
         Thread.setDefaultUncaughtExceptionHandler { _, throwable ->
             val writer = StringWriter();
 

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

@@ -456,6 +456,18 @@ class StateDownloads {
                 }
             }
         }
+
+        try {
+            val currentDownloads = _downloaded.getItems().map { it.url }.toHashSet();
+            val exporting = _exporting.findItems { !currentDownloads.contains(it.videoLocal.url) };
+            for (export in exporting)
+                _exporting.delete(export);
+        }
+        catch(ex: Throwable) {
+            Logger.e(TAG, "Failed to delete dangling export:", ex);
+            UIDialogs.toast("Failed to delete dangling export:\n" + ex);
+        }
+
         return Pair(totalDeletedCount, totalDeleted);
     }