Skip to content

AOO-26: Enabled ProofMode #628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 4, 2024
Merged

AOO-26: Enabled ProofMode #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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

Expand Down
21 changes: 12 additions & 9 deletions app/src/main/java/net/opendasharchive/openarchive/services/webdav/WebDavConduit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
24 changes: 12 additions & 12 deletions app/src/main/res/xml/prefs_general.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"-->
Expand Down
22 changes: 11 additions & 11 deletions app/src/main/res/xml/prefs_proof_mode.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down