Merge pull request #692 from OpenArchive/bugfix/translation-and-upload-queue-fixes

Language Fixes and Upload Queue fixes

Author: prathieshna

app/build.gradle.kts

@@ -45,8 +45,8 @@ android {
         minSdk = 29
         //noinspection OldTargetApi
         targetSdk = 34
-        versionCode = 30008
-        versionName = "0.7.8"
+        versionCode = 30010
+        versionName = "4.0.0"
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/net/opendasharchive/openarchive/db/UploadMediaAdapter.kt

@@ -176,38 +176,37 @@ class UploadMediaAdapter(
         if (pos < 0 || pos >= media.size) return
 
         val item = media[pos]
-        var undone = false
-
-        val snackbar =
-            Snackbar.make(recyclerView, R.string.confirm_remove_media, Snackbar.LENGTH_LONG)
-        snackbar.setAction(R.string.undo) { _ ->
-            undone = true
-            media.add(pos, item)
-
-            notifyItemInserted(pos)
+//        var undone = false
+
+//        val snackbar = Snackbar.make(recyclerView, R.string.confirm_remove_media, Snackbar.LENGTH_LONG)
+//        snackbar.setAction(R.string.undo) { _ ->
+//            undone = true
+//            media.add(pos, item)
+//
+//            notifyItemInserted(pos)
+//        }
+
+//        snackbar.addCallback(object : Snackbar.Callback() {
+//            override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
+//                if (!undone) {
+        val collection = item.collection
+
+        // Delete collection along with the item, if the collection
+        // would become empty.
+        if ((collection?.size ?: 0) < 2) {
+            collection?.delete()
+        } else {
+            item.delete()
         }
 
-        snackbar.addCallback(object : Snackbar.Callback() {
-            override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
-                if (!undone) {
-                    val collection = item.collection
-
-                    // Delete collection along with the item, if the collection
-                    // would become empty.
-                    if ((collection?.size ?: 0) < 2) {
-                        collection?.delete()
-                    } else {
-                        item.delete()
-                    }
-
-                    BroadcastManager.postDelete(recyclerView.context, item.id)
-                }
-
-                super.onDismissed(transientBottomBar, event)
-            }
-        })
+        BroadcastManager.postDelete(recyclerView.context, item.id)
+//                }
+//
+//                super.onDismissed(transientBottomBar, event)
+//            }
+//        })
 
-        snackbar.show()
+        // snackbar.show()
 
         removeItem(item.id)
 

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

@@ -310,7 +310,7 @@
 <!--    <string name="intro_text_archive">Keep your media verifiable, safe and organized for the long-term by uploading it to private or public servers like Nextcloud or the Internet Archive.&lt;br&gt;Communicate your intentions for future use by adding a &lt;a href="%1$s" style="text-decoration: underline;"&gt;Creative Commons License&lt;/a&gt;.</string>-->
 
     <string name="intro_link_archive" translatable="false">https://creativecommons.org</string>
-    <string name="intro_text_verify"><![CDATA[استوثق من وسائطك وتحقق منها باستخدام تلبيد التجزئة sha256 ووضع <a href=\"%1$s\"><u>ProofMode</u></a>.]]></string>
+    <string name="intro_text_verify"><![CDATA[Authenticate and verify your media with sha256 hashes and <a href=\"%1$s\"><u>ProofMode</u></a>.]]></string>
     <string name="intro_link_verify" translatable="false">https://proofmode.org</string>
     <string name="intro_text_encrypt_old">Automatically upload over TLS (Transport Layer Security) and use Orbot to protect your media in transit over the Tor network.</string>
     <string name="intro_text_encrypt"><![CDATA[<b><i>Save</i></b> always uploads over TLS (Transport Layer Security) to protect your media in transit.<br>To further enhance security, enable <a href=\"%1$s\"><u>Orbot</u></a> to prevent interception of your media from your phone to the server.]]></string>