fix(conflict-resolve-activity): threading

[alperozturk96]

Issue

"main" tid=1 Timed Waiting
  at jdk.internal.misc.Unsafe.park (Native method)
  at java.util.concurrent.locks.LockSupport.parkNanos (LockSupport.java:269)
  at android.database.sqlite.SQLiteConnectionPool.waitForConnection (SQLiteConnectionPool.java:1044)
  at android.database.sqlite.SQLiteConnectionPool.acquireConnection (SQLiteConnectionPool.java:619)
  at android.database.sqlite.SQLiteSession.acquireConnection (SQLiteSession.java:916)
  at android.database.sqlite.SQLiteSession.beginTransactionUnchecked (SQLiteSession.java:312)
  at android.database.sqlite.SQLiteSession.beginTransaction (SQLiteSession.java:300)
  at android.database.sqlite.SQLiteDatabase.beginTransaction (SQLiteDatabase.java:970)
  at android.database.sqlite.SQLiteDatabase.beginTransaction (SQLiteDatabase.java:880)
  at androidx.sqlite.db.framework.FrameworkSQLiteDatabase.beginTransaction (FrameworkSQLiteDatabase.android.kt:52)
  at com.owncloud.android.providers.FileContentProvider.query (FileContentProvider.java:454)
  at android.content.ContentProvider.query (ContentProvider.java:1677)
  at android.content.ContentProvider.query (ContentProvider.java:1773)
  at android.content.ContentProvider$Transport.query (ContentProvider.java:297)
  at android.content.ContentResolver.query (ContentResolver.java:1229)
  at android.content.ContentResolver.query (ContentResolver.java:1161)
  at android.content.ContentResolver.query (ContentResolver.java:1117)
  at com.owncloud.android.datamodel.FileDataStorageManager.getCapabilityCursorForAccount (FileDataStorageManager.java:2428)
  at com.owncloud.android.datamodel.FileDataStorageManager.getCapability (FileDataStorageManager.java:2455)
  at com.owncloud.android.datamodel.FileDataStorageManager.getCapability (FileDataStorageManager.java:2449)
  at com.nextcloud.client.jobs.upload.FileUploadHelper.getUploadByPaths (FileUploadHelper.kt:291)
  at com.nextcloud.client.jobs.upload.FileUploadHelper.uploadUpdatedFile (FileUploadHelper.kt:528)
  at com.owncloud.android.ui.activity.ConflictsResolveActivity.keepLocal (ConflictsResolveActivity.kt:197)
  at com.owncloud.android.ui.activity.ConflictsResolveActivity.setupOnConflictDecisionMadeListener$lambda$0 (ConflictsResolveActivity.kt:118)
  at com.owncloud.android.ui.activity.ConflictsResolveActivity$$ExternalSyntheticLambda2.conflictDecisionMade (D8$$SyntheticClass)
  at com.owncloud.android.ui.activity.ConflictsResolveActivity.conflictDecisionMade (ConflictsResolveActivity.kt:256)
  at com.nmc.android.ui.conflict.ConflictsResolveConsentDialog.onCreateDialog$lambda$0 (ConflictsResolveConsentDialog.kt:110)
  at com.nmc.android.ui.conflict.ConflictsResolveConsentDialog$$ExternalSyntheticLambda0.onClick (D8$$SyntheticClass)
  at android.view.View.performClick (View.java:8047)
  at android.widget.TextView.performClick (TextView.java:17792)
  at com.google.android.material.button.MaterialButton.performClick (MaterialButton.java:1345)
  at android.view.View.performClickInternal (View.java:8024)
  at android.view.View.-$$Nest$mperformClickInternal (unavailable)
  at android.view.View$PerformClick.run (View.java:31890)
  at android.os.Handler.handleCallback (Handler.java:958)
  at android.os.Handler.dispatchMessage (Handler.java:99)
  at android.os.Looper.loopOnce (Looper.java:230)
  at android.os.Looper.loop (Looper.java:319)
  at android.app.ActivityThread.main (ActivityThread.java:8919)
  at java.lang.reflect.Method.invoke (Native method)
  at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run (RuntimeInit.java:578)
  at com.android.internal.os.ZygoteInit.main (ZygoteInit.java:1103)

[github-actions]

APK file: https://github.com/nextcloud/android/actions/runs/23746452551/artifacts/6178792106
To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.
(please click on link to get QR code displayed)

[github-actions]

Codacy

SpotBugs

Category	Base	New
Bad practice	39	39
Correctness	70	70
Dodgy code	231	231
Experimental	1	1
Internationalization	7	7
Malicious code vulnerability	2	2
Multithreaded correctness	34	34
Performance	42	42
Security	16	16
Total	442	442

[github-actions]

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.