Skip to content

Fix created assertions #123

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

Open
redaranj wants to merge 1 commit into
base: dev_c2pa_0.0.9-beta.5
Choose a base branch
from
Open

Fix created assertions #123

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
25 changes: 15 additions & 10 deletions android-libproofmode/src/main/java/org/witness/proofmode/c2pa/C2PAManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import org.contentauth.c2pa.Action
import org.contentauth.c2pa.Builder
import org.contentauth.c2pa.BuilderIntent
import org.contentauth.c2pa.C2PA
import org.contentauth.c2pa.C2paSettings
import org.contentauth.c2pa.C2PASettings
import org.contentauth.c2pa.CertificateManager
import org.contentauth.c2pa.DigitalSourceType
import org.contentauth.c2pa.FileStream
Expand Down Expand Up @@ -526,20 +526,25 @@ class C2PAManager(private val context: Context, private val preferencesManager:
Timber.d( "Starting signImageData")
Timber.d( "Manifest JSON: ${manifestJSON.take(200)}...") // First 200 chars

val createdLabels = (Builder.DEFAULT_CREATED_ASSERTION_LABELS + listOf(
"proofmode.metadata",
)).joinToString(", ") { "\"$it\"" }

val settingsJson = """
{
"version": 1,
"builder": {
"created_assertion_labels": ["c2pa.actions"]
}
}
""".trimIndent()
{
"version": 1,
"builder": {
"created_assertion_labels": [$createdLabels]
}
}
""".trimIndent()

val settings = C2paSettings().apply {
val settings = C2PASettings.create().apply {
updateFromString(settingsJson, "json")
}

val builder = Builder.fromJson(manifestJSON, settings)
settings.close()
if (!embed)
builder.setNoEmbed()

Expand Down Expand Up @@ -574,7 +579,7 @@ class C2PAManager(private val context: Context, private val preferencesManager:
)
builder.addAction(action)

// builder.setIntent(BuilderIntent.Create(DigitalSourceType.DIGITAL_CAPTURE))
builder.setIntent(BuilderIntent.Create(DigitalSourceType.DIGITAL_CAPTURE))

val ingredientJson = JSONObject().apply {
put("title", fileName)
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ listenablefuture = "9999.0-empty-to-avoid-conflict-with-guava"
zxing = "3.5.4"
bitcoinj = "0.14.7"
#c2pa = "0.0.9-beta.4"
c2pa = "0.0.9-beta.5"
c2pa = "0.0.9-beta.6"
play-integrity = "1.6.0"

# Testing
Expand Down