WIP: Storacha chnages to check if all changes in next is intact

app/build.gradle.kts

@@ -60,8 +60,8 @@ android {
         applicationId = "net.opendasharchive.openarchive"
         minSdk = 29
         targetSdk = 36
-        versionCode = 30021
-        versionName = "4.0.3"
+        versionCode = 30027
+        versionName = "4.0.4"
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -130,9 +130,13 @@ android {
         resources {
             excludes.addAll(
                 listOf(
-                    "META-INF/LICENSE.txt", "META-INF/NOTICE.txt", "META-INF/LICENSE",
-                    "META-INF/NOTICE", "META-INF/DEPENDENCIES", "LICENSE.txt"
-                )
+                    "META-INF/LICENSE.txt",
+                    "META-INF/NOTICE.txt",
+                    "META-INF/LICENSE",
+                    "META-INF/NOTICE",
+                    "META-INF/DEPENDENCIES",
+                    "LICENSE.txt",
+                ),
             )
         }
     }
@@ -241,12 +245,14 @@ dependencies {
     implementation(libs.retrofit.gson)
     implementation(libs.retrofit.kotlinx.serialization)
     implementation(libs.guardianproject.sardine)
+    implementation(libs.jsoup)
 
     // Images & Media
     implementation(libs.coil)
     implementation(libs.coil.compose)
     implementation(libs.coil.video)
     implementation(libs.coil.network)
+    implementation(libs.picasso)
 
     // CameraX
     implementation(libs.androidx.camera.core)
@@ -256,6 +262,10 @@ dependencies {
     implementation(libs.androidx.camera.view)
     implementation(libs.androidx.camera.extensions)
 
+    // Barcode Scanning
+    implementation(libs.zxing.core)
+    implementation(libs.zxing.android.embedded)
+
     // Media3 - ExoPlayer
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.ui)

app/src/main/AndroidManifest.xml

@@ -55,6 +55,7 @@
     -->
 
     <application
+        android:usesCleartextTraffic="true"
         android:name=".SaveApp"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -203,6 +204,12 @@
             android:theme="@style/SaveAppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden" />
 
+        <activity
+            android:name=".services.storacha.PortraitCaptureActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/zxing_CaptureTheme"
+            android:exported="false" />
+
         <meta-data
             android:name="DOMAIN_PACKAGE_NAME"
             android:value="net.opendasharchive.openarchive.db" />

app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt

@@ -2,20 +2,18 @@ package net.opendasharchive.openarchive
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.app.UiModeManager
 import android.content.Context
-import android.os.Build
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.SingletonImageLoader
 import coil3.video.VideoFrameDecoder
 import com.orm.SugarApp
 import info.guardianproject.netcipher.proxy.OrbotHelper
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import net.opendasharchive.openarchive.analytics.api.AnalyticsManager
 import net.opendasharchive.openarchive.analytics.api.session.SessionTracker
@@ -27,10 +25,11 @@ import net.opendasharchive.openarchive.core.di.retrofitModule
 import net.opendasharchive.openarchive.core.di.unixSocketModule
 import net.opendasharchive.openarchive.core.logger.AppLogger
 import net.opendasharchive.openarchive.features.settings.passcode.PasscodeManager
+import net.opendasharchive.openarchive.services.storacha.di.storachaModule
 import net.opendasharchive.openarchive.util.Prefs
+import org.koin.android.ext.android.inject
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
-import org.koin.android.ext.android.inject
 import org.koin.core.context.startKoin
 import org.koin.core.logger.Level
 
@@ -71,6 +70,8 @@ class SaveApp : SugarApp(), SingletonImageLoader.Factory, DefaultLifecycleObserv
                 retrofitModule,
                 unixSocketModule,
                 passcodeModule,
+                storachaModule,
+                passcodeModule,
                 analyticsModule(
                     mixpanelToken = getString(R.string.mixpanel_key),
                     cleanInsightsConsentChecker = { CleanInsightsManager.hasConsent() }

app/src/main/java/net/opendasharchive/openarchive/db/Space.kt

@@ -43,7 +43,6 @@
     private var licenseUrl: String? = null,
     // private var chunking: Boolean? = null
 ) : SugarRecord() {
-
     constructor(type: Type) : this() {
         tType = type
 
@@ -55,25 +54,33 @@
             }
 
             Type.RAVEN -> "Raven"
+            Type.STORACHA -> "Storacha Service"
         }
     }
 
-    enum class Type(val id: Int, val friendlyName: String) {
+    enum class Type(
+        val id: Int,
+        val friendlyName: String,
+    ) {
         WEBDAV(0, "Private Server"),
         INTERNET_ARCHIVE(1, IaConduit.NAME),
         RAVEN(5, "DWeb Storage"),
+        STORACHA(7, "Storacha Service"),
     }
 
     enum class IconStyle {
-        SOLID, OUTLINE
+        SOLID,
+        OUTLINE,
     }
 
     companion object {
-        fun getAll(): Iterator<Space> {
-            return findAll(Space::class.java)
-        }
+        fun getAll(): Iterator<Space> = findAll(Space::class.java)
 
-        fun get(type: Type, host: String? = null, username: String? = null): List<Space> {
+        fun get(
+            type: Type,
+            host: String? = null,
+            username: String? = null,
+        ): List<Space> {
             var whereClause = "type = ?"
             val whereArgs = mutableListOf(type.id.toString())
 
@@ -88,14 +95,20 @@
             }
 
             return find(
-                Space::class.java, whereClause, whereArgs.toTypedArray(),
-                null, null, null
+                Space::class.java,
+                whereClause,
+                whereArgs.toTypedArray(),
+                null,
+                null,
+                null,
             )
         }
 
-        fun has(type: Type, host: String? = null, username: String? = null): Boolean {
-            return get(type, host, username).isNotEmpty()
-        }
+        fun has(
+            type: Type,
+            host: String? = null,
+            username: String? = null,
+        ): Boolean = get(type, host, username).isNotEmpty()
 
         var current: Space?
             get() {
@@ -107,9 +120,7 @@
                 Prefs.currentSpaceId = value?.id ?: -1
             }
 
-        fun get(id: Long): Space? {
-            return findById(Space::class.java, id)
-        }
+        fun get(id: Long): Space? = findById(Space::class.java, id)
 
         fun navigate(activity: AppCompatActivity) {
             if (getAll().hasNext()) {
@@ -161,59 +172,67 @@
 //        }
 
     val projects: List<Project>
-        get() = find(
-            Project::class.java,
-            "space_id = ? AND NOT archived",
-            arrayOf(id.toString()),
-            null,
-            "id DESC",
-            null
-        )
+        get() =
+            find(
+                Project::class.java,
+                "space_id = ? AND NOT archived",
+                arrayOf(id.toString()),
+                null,
+                "id DESC",
+                null,
+            )
 
     val archivedProjects: List<Project>
-        get() = find(
-            Project::class.java,
-            "space_id = ? AND archived",
-            arrayOf(id.toString()),
-            null,
-            "id DESC",
-            null
-        )
+        get() =
+            find(
+                Project::class.java,
+                "space_id = ? AND archived",
+                arrayOf(id.toString()),
+                null,
+                "id DESC",
+                null,
+            )
 
     fun hasProject(description: String): Boolean {
         // Cannot use `count` from Kotlin due to strange <T> in method signature.
         return find(
             Project::class.java,
             "space_id = ? AND description = ?",
             id.toString(),
-            description
+            description,
         ).isNotEmpty()
     }
 
-    fun getAvatar(context: Context): Drawable? {
-
-
-        return when (tType) {
+    fun getAvatar(context: Context): Drawable? =
+        when (tType) {
             Type.WEBDAV -> ContextCompat.getDrawable(context, R.drawable.ic_private_server)
 
-            Type.INTERNET_ARCHIVE -> ContextCompat.getDrawable(context, R.drawable.ic_internet_archive)
+            Type.INTERNET_ARCHIVE ->
+                ContextCompat.getDrawable(
+                    context,
+                    R.drawable.ic_internet_archive,
+                )
 
             Type.RAVEN -> ContextCompat.getDrawable(context, R.drawable.ic_dweb)
 
+            Type.STORACHA ->
+                ContextCompat.getDrawable(
+                    context,
+                    R.drawable.storacha,
+                )
         }
-    }
 
     @Composable
-    fun getAvatar(): Painter {
-
-        return when (tType) {
+    fun getAvatar(): Painter =
+        when (tType) {
             Type.WEBDAV -> painterResource(R.drawable.ic_space_private_server)
 
             Type.INTERNET_ARCHIVE -> painterResource(R.drawable.ic_space_interent_archive)
 
             Type.RAVEN -> painterResource(R.drawable.ic_space_dweb)
+
+            Type.STORACHA -> painterResource(R.drawable.storacha)
         }
-    }
 
     fun setAvatar(view: ImageView) {
         when (tType) {
@@ -223,7 +242,6 @@
 
             else -> {
                 view.setImageDrawable(getAvatar(view.context))
-
             }
         }
     }
@@ -235,4 +253,4 @@
 
         return super.delete()
     }
-}
+}