From 2d3608b3a790632fdd42c109c2002352a5e167c1 Mon Sep 17 00:00:00 2001
From: Elelan's Macbook Pro <evic2132@sysco.com>
Date: Fri, 29 Nov 2024 23:24:35 +0530
Subject: [PATCH] AOO-26: Enabled ProofMode updated proofmode lib to 1.0.27
 updated fresco

---
 app/build.gradle                              |  8 +++----
 .../services/webdav/WebDavConduit.kt          | 21 +++++++++-------
 app/src/main/res/xml/prefs_general.xml        | 24 +++++++++----------
 app/src/main/res/xml/prefs_proof_mode.xml     | 22 ++++++++---------
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e5dae627..d44d3f25 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@ android {
         minSdkVersion 29
         //noinspection OldTargetApi
         targetSdkVersion 34
-        versionCode 30004
-        versionName "0.7.4"
+        versionCode 30005
+        versionName "0.7.7"
         archivesBaseName = "Save-$versionName"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -129,7 +129,7 @@ dependencies {
     annotationProcessor "com.github.bumptech.glide:compiler:4.16.0"
     implementation "com.github.derlio:audio-waveform:v1.0.1"
     implementation "com.github.esafirm:android-image-picker:3.0.0"
-    implementation "com.facebook.fresco:fresco:2.6.0"
+    implementation "com.facebook.fresco:fresco:3.5.0"
     implementation "com.squareup.picasso:picasso:2.5.2"
 
     implementation "com.github.abdularis:circularimageview:1.4"
@@ -138,7 +138,7 @@ dependencies {
     implementation "info.guardianproject.netcipher:netcipher:2.2.0-alpha"
 
     //from here: https://github.com/guardianproject/proofmode
-    implementation("org.proofmode:android-libproofmode:1.0.26") {
+    implementation("org.proofmode:android-libproofmode:1.0.27") {
 
         transitive = false
 
diff --git a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavConduit.kt b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavConduit.kt
index e1703ca1..e95860e7 100644
--- a/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavConduit.kt
+++ b/app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavConduit.kt
@@ -192,16 +192,19 @@ class WebDavConduit(media: Media, context: Context) : Conduit(media, context) {
         if (mCancelled) throw Exception("Cancelled")
 
         mClient.put(
-            construct(base, path, "$fileName.meta.json"), metadata.toByteArray(),
-            "text/plain", null)
+            construct(base, path, "$fileName.meta.json"),
+            metadata.toByteArray(),
+            "text/plain",
+            null
+        )
 
         /// Upload ProofMode metadata, if enabled and successfully created.
-//        for (file in getProof()) {
-//            if (mCancelled) throw Exception("Cancelled")
-//
-//            mClient.put(
-//                construct(base, path, file.name), file, "text/plain",
-//                false, null)
-//        }
+        for (file in getProof()) {
+            if (mCancelled) throw Exception("Cancelled")
+
+            mClient.put(
+                construct(base, path, file.name), file, "text/plain",
+                false, null)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/xml/prefs_general.xml b/app/src/main/res/xml/prefs_general.xml
index b498b18b..3d816788 100644
--- a/app/src/main/res/xml/prefs_general.xml
+++ b/app/src/main/res/xml/prefs_general.xml
@@ -18,20 +18,20 @@
 
     </PreferenceCategory>
 
-<!--    <PreferenceCategory-->
-<!--        app:iconSpaceReserved="false"-->
-<!--        app:layout="@layout/prefs_title"-->
-<!--        app:title="@string/metadata">-->
+    <PreferenceCategory
+        app:iconSpaceReserved="false"
+        app:layout="@layout/prefs_title"
+        app:title="@string/metadata">
 
-<!--        <Preference-->
-<!--            app:allowDividerAbove="false"-->
-<!--            app:allowDividerBelow="false"-->
-<!--            app:iconSpaceReserved="false"-->
-<!--            app:key="proof_mode"-->
-<!--            app:title="@string/proofmode"-->
-<!--            app:singleLineTitle="false" />-->
+        <Preference
+            app:allowDividerAbove="false"
+            app:allowDividerBelow="false"
+            app:iconSpaceReserved="false"
+            app:key="proof_mode"
+            app:title="@string/proofmode"
+            app:singleLineTitle="false" />
 
-<!--    </PreferenceCategory>-->
+    </PreferenceCategory>
 
 <!--    <PreferenceCategory-->
 <!--        app:iconSpaceReserved="false"-->
diff --git a/app/src/main/res/xml/prefs_proof_mode.xml b/app/src/main/res/xml/prefs_proof_mode.xml
index fe899d88..c2b3a3d6 100644
--- a/app/src/main/res/xml/prefs_proof_mode.xml
+++ b/app/src/main/res/xml/prefs_proof_mode.xml
@@ -8,18 +8,18 @@
         app:singleLineTitle="false"
         app:summary="@string/prefs_use_proofmode_summary" />
 
-    <SwitchPreferenceCompat
-        app:key="proofmode_key_encryption"
-        app:defaultValue="false"
-        app:title="@string/prefs_proofmode_key_encryption_title_all"
-        app:singleLineTitle="false"
-        app:summary="@string/prefs_proofmode_key_encryption_summary" />
+<!--    <SwitchPreferenceCompat-->
+<!--        app:key="proofmode_key_encryption"-->
+<!--        app:defaultValue="false"-->
+<!--        app:title="@string/prefs_proofmode_key_encryption_title_all"-->
+<!--        app:singleLineTitle="false"-->
+<!--        app:summary="@string/prefs_proofmode_key_encryption_summary" />-->
 
-    <Preference
-        app:key="share_proofmode"
-        app:title="@string/prefs_share_proofmode_title"
-        app:singleLineTitle="false"
-        app:summary="@string/prefs_share_proofmode_summary" />
+<!--    <Preference-->
+<!--        app:key="share_proofmode"-->
+<!--        app:title="@string/prefs_share_proofmode_title"-->
+<!--        app:singleLineTitle="false"-->
+<!--        app:summary="@string/prefs_share_proofmode_summary" />-->
 
     <Preference
         app:selectable="false"