fix(android): preserve queued upload scheduling by veryCrunchy · Pull Request #439 · Obiente/native

veryCrunchy · 2026-09-01T21:15:50Z

Outcome

Preserve durable attachment uploads when WorkManager accepts a job but its completion signal fails. Keep the journal and source ownership so startup and status restoration can recover the same upload without submitting a duplicate.

Recovery now also:

defers transient credential and source failures while rejecting permanently unavailable sources;
preserves per-job retry deadlines when status refreshes or unrelated recovery requests arrive;
retries terminal source cleanup independently of network availability;
quarantines malformed capability records without deleting another job's grant;
rejects reuse of a permission still owned by malformed metadata;
bounds persisted capability storage before loading preferences and stops retrying quarantined cleanup indefinitely.

Cancellation after persistence remains cancellation. A source is released only when the queue can prove that no active job owns it.

Validation

The preceding recovery revision passed on the dedicated Linux build host at source tree f26d5d41b6b6fe167a0b2138f806611e29be4503:

145 focused Android unit tests, with no failures or skips, covering upload policy, scheduling recovery, source preflight, terminal cleanup, capability lifecycle, cleanup pruning, and oversized storage recovery.
:androidApp:assembleDebug.
bash tools/check-repository.sh and git diff --check.

The latest revision also stops permanently retrying cleanup blocked by malformed peer metadata. Ambiguous non-preexisting grants remain quarantined. Proven preexisting grants use metadata-only removal without revoking another owner's grant. Three regression tests cover these cases.

Head 50db150461553e227b19907d7b0f2ea7ecec74e1 includes main at 92dd2ae9cec1dc7dac16907e66d7b870694ebbbf and the parent provider-deadlock fix. All 49 layer commits retained identical patches during the latest restack. Full repository checks and git diff --check passed. The new regression tests and inherited deadlock fix have not yet received direct build-host validation because the host stopped responding during another capture job. Hosted checks on this head are pending; the earlier 145-test result does not cover these newest changes.

Limits and dependency

Deterministic tests and APK assembly do not prove emulator lifecycle behavior, a live Nextcloud attachment upload, or fault injection inside Android's real WorkManager database. Those checks were not performed for this revision.

This PR builds on #438, which owns the adjacent account-isolated queued credential lookup.

Advances #52

obiente-cloud · 2026-09-01T21:15:54Z

Obiente preview

NC Native · d0e7378c894f · Ready

Open preview

View in Obiente

_{Obiente updates this comment as the preview changes.}

chatgpt-codex-connector · 2026-09-01T21:16:04Z

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	🔄 Running since 2026-09-04T21:39:40.762081Z	`84c8005`	New commits

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 454d73b427

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 84677b8a69

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7b2e575cd6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a86e5ec1fa

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a81651dda8

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6299358fb0

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

…lities

chatgpt-codex-connector

💡 Codex Review

native/androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidDurableMultipartUploads.kt

Lines 438 to 446 in 74e1dae

    
           val decrypted = try { 
        
               cipher.decrypt(encrypted) 
        
           } catch (cancelled: CancellationException) { 
        
               throw cancelled 
        
           } catch (failure: Exception) { 
        
               throw AndroidDurableMultipartUploadRecoveryException( 
        
                   failure, 
        
                   DurableUploadQueueRecoveryDisposition.Quarantine, 
        
               )

Retry transient queue decryption failures

When SessionCipher.decrypt fails because Android's keystore/provider is temporarily unavailable rather than because it raised the definitive InvalidSessionCiphertextException, this catch still classifies the queue as permanently quarantined. During startup, NextcloudNativeApplication treats that disposition as recovered and lets the monitor become idle; if the queued row had not yet reached WorkManager, it remains unscheduled even after the keystore recovers because no new signal is guaranteed. Reserve quarantine for definitive ciphertext failures and classify other decryption exceptions as retryable.

AGENTS.md reference: AGENTS.md:L281-L285

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ae87dc36a6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 1, 2026 21:15 Destroyed

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 1, 2026 21:17 Destroyed

chatgpt-codex-connector Bot reviewed Sep 1, 2026

View reviewed changes

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidDurableMultipartUploads.kt Outdated

veryCrunchy force-pushed the fix/durable-upload-scheduling-recovery-stack branch from e2a8728 to d4e541c Compare September 1, 2026 21:54

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 1, 2026 21:54 Destroyed

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 1, 2026 22:31 Destroyed

veryCrunchy force-pushed the fix/durable-upload-scheduling-recovery-stack branch from 4482b93 to c2f0cc7 Compare September 3, 2026 20:43

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 3, 2026 20:43 Destroyed

veryCrunchy force-pushed the fix/durable-upload-scheduling-recovery-stack branch from c2f0cc7 to 84677b8 Compare September 3, 2026 20:54

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 3, 2026 20:54 Destroyed

chatgpt-codex-connector Bot reviewed Sep 3, 2026

View reviewed changes

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidDurableMultipartUploads.kt Outdated

veryCrunchy force-pushed the fix/durable-upload-scheduling-recovery-stack branch from 84677b8 to abcbb66 Compare September 3, 2026 21:18

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 3, 2026 21:19 Destroyed

veryCrunchy force-pushed the fix/durable-upload-scheduling-recovery-stack branch from abcbb66 to 7b2e575 Compare September 3, 2026 21:43

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 3, 2026 21:43 Destroyed

chatgpt-codex-connector Bot reviewed Sep 3, 2026

View reviewed changes

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/NextcloudNativeApplication.kt Outdated

veryCrunchy force-pushed the fix/durable-upload-scheduling-recovery-stack branch from 7b2e575 to a86e5ec Compare September 4, 2026 00:39

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 4, 2026 00:39 Destroyed

chatgpt-codex-connector Bot reviewed Sep 4, 2026

View reviewed changes

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/NextcloudNativeApplication.kt Outdated

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidDurableUploadScheduling.kt Outdated

veryCrunchy force-pushed the fix/durable-upload-scheduling-recovery-stack branch from a86e5ec to 3ed84f8 Compare September 4, 2026 01:10

obiente-cloud Bot temporarily deployed to Obiente Preview / PR #439 / NC Native September 4, 2026 01:10 Destroyed

veryCrunchy and others added 15 commits September 14, 2026 00:12

fix(uploads): protect owned malformed capabilities

2d9ae79

test(uploads): split account resolution coverage

127ee49

fix(uploads): reject corrupt capability ciphertext

d8ac3b4

refactor(platform): preserve service size boundary

a01404f

chore(website): refresh marketing captures

8dfc37a

fix(uploads): bound capability recovery

3befe2c

fix(uploads): coalesce terminal recovery

953b587

fix(uploads): quarantine unknowable capability cleanup

f602ce1

fix(uploads): terminate quarantined cleanup

76b24cb

fix(uploads): bound storage and preserve recovery backoff

476bea5

fix(uploads): finish stable malformed-peer cleanup

93ab744

fix(android): bound upload scheduling recovery passes

b13b950

test(android): group scheduling monitor regressions by owner

0cd8c03

fix(android): coalesce cleanup recovery self wakeups

6e1fa4c

test(windows): allow support upload startup under CI load

a81651d

chatgpt-codex-connector Bot reviewed Sep 13, 2026

View reviewed changes

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidDurableUploadWorker.kt Outdated

fix(android): retain upload access during provider outages

6299358

chatgpt-codex-connector Bot reviewed Sep 13, 2026

View reviewed changes

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidLocalUploadPicker.kt

veryCrunchy added 2 commits September 14, 2026 01:46

fix(android): preserve picker capacity around unidentified old capabi…

02a03d0

…lities

chore(accounts): merge background upload recovery into queued uploads

74e1dae

chatgpt-codex-connector Bot reviewed Sep 13, 2026

View reviewed changes

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidDurableUploadScheduling.kt Outdated

fix(android): surface unknown outcomes for orphaned uploads

ae87dc3

chatgpt-codex-connector Bot reviewed Sep 14, 2026

View reviewed changes

Comment thread androidApp/src/main/kotlin/dev/obiente/nextcloudnative/AndroidDurableUploadScheduling.kt Outdated

veryCrunchy added 6 commits September 14, 2026 02:32

fix(accounts): integrate safe account recovery with upload scheduling

edb58fb

fix(android): preserve immediate upload recovery requests

7755c30

fix(accounts): integrate credential retries and bounded Linux CI

e35a38e

fix(android): integrate permanent credential recovery for uploads

6f9c79e

fix(android): integrate upload startup credential recovery

4c18afc

fix(android): integrate guarded background restoration recovery

d0e7378

veryCrunchy mentioned this pull request Sep 14, 2026

fix(accounts): integrate credential and file recovery lifecycles #470

Open

	val decrypted = try {
	cipher.decrypt(encrypted)
	} catch (cancelled: CancellationException) {
	throw cancelled
	} catch (failure: Exception) {
	throw AndroidDurableMultipartUploadRecoveryException(
	failure,
	DurableUploadQueueRecoveryDisposition.Quarantine,
	)

Uh oh!

Conversation

veryCrunchy commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Outcome

Validation

Limits and dependency

Uh oh!

obiente-cloud Bot commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Obiente preview

Uh oh!

chatgpt-codex-connector Bot commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

veryCrunchy commented Sep 1, 2026 •

edited

Loading

obiente-cloud Bot commented Sep 1, 2026 •

edited

Loading

chatgpt-codex-connector Bot commented Sep 1, 2026 •

edited

Loading