Stage/dweb next merge

analytics/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 kotlin {

app/build.gradle.kts

@@ -10,6 +10,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
     alias(libs.plugins.navigation.safeargs)
+    alias(libs.plugins.androidx.room)
     alias(libs.plugins.detekt.plugin)
     alias(libs.plugins.google.gms.google.services)
     alias(libs.plugins.google.firebase.crashlytics)
@@ -153,6 +154,10 @@ android {
             exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
         }
     }
+
+    room {
+        schemaDirectory("$projectDir/schemas")
+    }
 }
 
 dependencies {
@@ -215,6 +220,11 @@ dependencies {
     implementation(libs.androidx.security.crypto)
     implementation(libs.androidx.work)
 
+    // Room Database
+    implementation(libs.androidx.room.runtime)
+    implementation(libs.androidx.room.ktx)
+    ksp(libs.androidx.room.compiler)
+
     // Dependency Injection - Koin
     implementation(libs.koin.core)
     implementation(libs.koin.android)
@@ -229,6 +239,7 @@ dependencies {
     implementation(libs.okhttp.logging)
     implementation(libs.retrofit)
     implementation(libs.retrofit.gson)
+    implementation(libs.retrofit.kotlinx.serialization)
     implementation(libs.guardianproject.sardine)
 
     // Images & Media
@@ -288,6 +299,10 @@ dependencies {
         exclude(group = "com.squareup.okio", module = "okio")
     }
 
+    // Barcode Scanning
+    implementation(libs.zxing.core)
+    implementation(libs.zxing.android.embedded)
+
     // Utilities
     implementation(libs.timber)
     implementation(libs.gson)

app/src/main/AndroidManifest.xml

@@ -11,8 +11,8 @@
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         tools:ignore="ScopedStorage" />
-    <!--    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
-    <!--    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />-->
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -130,11 +130,11 @@
             android:taskAffinity=""
             android:theme="@style/SaveAppTheme.NoActionBar" />
 
-<!--        <activity-->
-<!--            android:name=".features.main.QRScannerActivity"-->
-<!--            android:screenOrientation="portrait"-->
-<!--            android:theme="@style/zxing_CaptureTheme"-->
-<!--            android:windowSoftInputMode="stateAlwaysHidden" />-->
+        <activity
+            android:name=".features.main.QRScannerActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/zxing_CaptureTheme"
+            android:windowSoftInputMode="stateAlwaysHidden" />
 
         <activity
             android:name=".features.media.ReviewActivity"
@@ -209,9 +209,10 @@
 
         <meta-data
             android:name="VERSION"
-            android:value="37" />
+            android:value="38" />
         <!--        NOTE: Please do not write migrations for added columns, as they are not needed.-->
         <!--        Only upgrade the version number when you add a new column.-->
+        <!--        Version 38: Added 'hash' column to SNOWBIRD_REPO table-->
         <!--        migration sql causing duplicate column error:-->
         <!--            https://github.com/chennaione/sugar/issues/713  -->
 

app/src/main/assets/dweb/dweb_create_group_response.json

@@ -0,0 +1,5 @@
+{
+  "key": "A7c3ei6lejlBN3LIqHVOLbLwaICMVa1M1xbvNxvXB2o",
+  "name": "my grp",
+  "uri": "save+dweb::?dht=03b7377a2ea57a39413772c8a8754e2db2f068808c55ad4cd716ef371bd7076a&enc=c2157baf9f64ebd61aff7a204571bd97887d3c72706c1eb3622c8fbb98f67161&pk=cf3a57211dca6a993e8c2b322d50193d940baaed0eca5f17d1e02f41d6d8d7af&sk=85f46f8f3a4231210fc648b2a8ee4e71324190853b0df22381accc325392d191"
+}

app/src/main/assets/dweb/dweb_create_repo_response.json

@@ -0,0 +1,5 @@
+{
+  "key": "1KHp86Sv5asv7DWdCoXL6LmhLAvVOYOpQ-4EvmScXFM",
+  "name": "prathie",
+  "can_write": true
+}

app/src/main/assets/dweb/dweb_fetch_groups_response.json

@@ -0,0 +1,9 @@
+{
+  "groups": [
+    {
+      "key": "yvClq1HZNqD2y9tHH-7pYBcUZBUjFoNZ3OcvzbszlOM",
+      "name": "SaveWeb",
+      "uri": "save+dweb::?dht=caf0a5ab51d936a0f6cbdb471feee9601714641523168359dce72fcdbb3394e3&enc=5af9ad74efce749b9b2bed692ecb16f71016729a6b11ea021d20f5f9186a1a7d&pk=0f083d9391c5bddf199320014abc9ab3f5b51c9e41adf97c0261e5be6b1ba41d&sk=e1525c792b78cd3aca849b3e2a1b6d3f7e08dd9339f3e872513b88400196c398"
+    }
+  ]
+}

app/src/main/assets/dweb/dweb_fetch_medias_response.json

@@ -0,0 +1,14 @@
+{
+  "files": [
+    {
+      "hash": "4wtxbdhr7qcvfyha2joslvgfp237qmbvbab5hxr4q4te6w4ktkxq",
+      "is_downloaded": true,
+      "name": "download.jpeg"
+    },
+    {
+      "hash": "igibt6thvtgvzlh5dzigfjccbhxgvrejed4whcqucdftyu4d4zua",
+      "is_downloaded": true,
+      "name": "1747903650390.jpg"
+    }
+  ]
+}

app/src/main/assets/dweb/dweb_fetch_repos_response.json

@@ -0,0 +1,14 @@
+{
+  "repos": [
+    {
+      "can_write": false,
+      "key": "qPV1BjzjsomQa67_jNk0n4elKMa-c9FMSfs_FygHNWs",
+      "name": "Prathie"
+    },
+    {
+      "can_write": true,
+      "key": "_HP0fgWIA8gnibdSH37_akFwNs0goZz_bZN4AZk41hE",
+      "name": "Elelan"
+    }
+  ]
+}

app/src/main/assets/dweb/dweb_refresh_response.json

@@ -0,0 +1,78 @@
+[
+  {
+    "repos": [
+      {
+        "all_files": [
+          "1747903650390.jpg",
+          "download.jpeg"
+        ],
+        "can_write": true,
+        "name": "Elelan",
+        "refreshed_files": [],
+        "repo_hash": "wiuab7ulsfa4zhvim4fymp4xeyzec5kofjsxombq5vkhvx6z5voa",
+        "repo_id": "Snti-GUoge16L1V00oQ86BppenuZ5OvA40k5LxbPNQA"
+      },
+      {
+        "all_files": [],
+        "can_write": false,
+        "error": "Error getting repo hash from DHT: Unable to get DHT value for repo root hash",
+        "name": "Prathie",
+        "refreshed_files": [],
+        "repo_id": "WuXDAzC2mBlEKjrTdctrDt8KASSfHwjspGgIqOXAFpc"
+      }
+    ],
+    "status": "success"
+  },
+  {
+    "repos": [
+      {
+        "all_files": [
+          "download.jpeg",
+          "1747903650390.jpg"
+        ],
+        "can_write": true,
+        "name": "Elelan",
+        "refreshed_files": [],
+        "repo_hash": "jyr2k2xbzwei3ueopuhzoeu7kj6mouezoivxarxe4sez6nk27sca",
+        "repo_id": "_HP0fgWIA8gnibdSH37_akFwNs0goZz_bZN4AZk41hE"
+      },
+      {
+        "all_files": [
+          "IMG-20250527-WA0002.jpg"
+        ],
+        "can_write": false,
+        "name": "Prathie",
+        "refreshed_files": [
+          "IMG-20250527-WA0002.jpg"
+        ],
+        "repo_hash": "47rm2mhbxxnvdj2sodqhztykaehf3aaub5mopvoe25rzv6rxx24q",
+        "repo_id": "qPV1BjzjsomQa67_jNk0n4elKMa-c9FMSfs_FygHNWs"
+      }
+    ],
+    "status": "success"
+  },
+  {
+    "repos": [
+      {
+        "all_files": [
+          "1747903650390.jpg",
+          "download.jpeg"
+        ],
+        "can_write": false,
+        "name": "Elelan",
+        "refreshed_files": [],
+        "repo_hash": "jyr2k2xbzwei3ueopuhzoeu7kj6mouezoivxarxe4sez6nk27sca",
+        "repo_id": "qY00DJlYIQyPoCJt_EJZz7QhJqzQJqcpnYB23OPAWEs"
+      },
+      {
+        "all_files": [],
+        "can_write": true,
+        "error": "Error getting repo hash from DHT: Unable to get DHT value for repo root hash",
+        "name": "Upul",
+        "refreshed_files": [],
+        "repo_id": "Qa1DGd8PX_zU6X3SFubR1oMKklJw7zAGWiVhgvGkRuI"
+      }
+    ],
+    "status": "success"
+  }
+]

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

@@ -141,13 +141,13 @@ class SaveApp : SugarApp(), SingletonImageLoader.Factory, DefaultLifecycleObserv
     private fun createSnowbirdNotificationChannel() {
         val silentChannel = NotificationChannel(
             SNOWBIRD_SERVICE_CHANNEL_SILENT,
-            "Raven Service",
+            "Dweb Storage",
             NotificationManager.IMPORTANCE_LOW
         )
 
         val chimeChannel = NotificationChannel(
             SNOWBIRD_SERVICE_CHANNEL_CHIME,
-            "Raven Service",
+            "Dweb Storage",
             NotificationManager.IMPORTANCE_DEFAULT
         )
 

app/src/main/java/net/opendasharchive/openarchive/core/di/FeaturesModule.kt

@@ -26,19 +26,34 @@
     // TODO: have some registry of feature modules
 
 
+    single<ISnowbirdFileRepository> { SnowbirdFileRepository(get(named("retrofit"))) }
+    single<ISnowbirdGroupRepository> { SnowbirdGroupRepository(get(named("retrofit"))) }
+    single<ISnowbirdRepoRepository> { SnowbirdRepoRepository(get(named("retrofit"))) }
 
+//    single<ISnowbirdFileRepository> { SnowbirdFileRepository(get(named("unixSocket"))) }
+//    single<ISnowbirdGroupRepository> { SnowbirdGroupRepository(get(named("unixSocket"))) }
+//    single<ISnowbirdRepoRepository> { SnowbirdRepoRepository(get(named("unixSocket"))) }
 
-//    single<ISnowbirdFileRepository> { SnowbirdFileRepository(get(named("retrofit"))) }
-//    single<ISnowbirdGroupRepository> { SnowbirdGroupRepository(get(named("retrofit"))) }
-//    single<ISnowbirdRepoRepository> { SnowbirdRepoRepository(get(named("retrofit"))) }
+    viewModel { (application: Application) ->
+        SnowbirdGroupViewModel(
+            application = application,
+            repository = get()
+        )
+    }
 
-    single<ISnowbirdFileRepository> { SnowbirdFileRepository(get(named("unixSocket"))) }
-    single<ISnowbirdGroupRepository> { SnowbirdGroupRepository(get(named("unixSocket"))) }
-    single<ISnowbirdRepoRepository> { SnowbirdRepoRepository(get(named("unixSocket"))) }
-    viewModel { (application: Application) -> SnowbirdGroupViewModel(application, get()) }
-    viewModel { (application: Application) -> SnowbirdFileViewModel(application, get()) }
-    viewModel { (application: Application) -> SnowbirdRepoViewModel(application, get()) }
+    viewModel { (application: Application) ->
+        SnowbirdFileViewModel(
+            application = application,
+            repository = get()
+        )
+    }
 
+    viewModel { (application: Application) ->
+        SnowbirdRepoViewModel(
+            application = application,
+            repository = get()
+        )
+    }
 
     viewModelOf(::SpaceListViewModel)
 

app/src/main/java/net/opendasharchive/openarchive/core/di/RetrofitModule.kt

@@ -1,15 +1,17 @@
 package net.opendasharchive.openarchive.core.di
 
 import android.content.Context
+import kotlinx.serialization.json.Json
 import net.opendasharchive.openarchive.services.snowbird.service.ISnowbirdAPI
 import net.opendasharchive.openarchive.services.snowbird.service.RetrofitAPI
 import net.opendasharchive.openarchive.services.snowbird.service.RetrofitClient
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import java.util.concurrent.TimeUnit
 
 val retrofitModule = module {
@@ -33,7 +35,7 @@ val retrofitModule = module {
         Retrofit.Builder()
             .baseUrl("http://localhost:8080/api/")
             .client(get<OkHttpClient>())
-            .addConverterFactory(GsonConverterFactory.create())
+            .addConverterFactory(Json.asConverterFactory("application/json; charset=UTF8".toMediaType()))
             .build()
     }
 

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

@@ -0,0 +1,39 @@
+package net.opendasharchive.openarchive.db
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RefreshGroupResponse(
+    val status: String,
+    @SerialName("repos")
+    val refreshedRepos: List<RefreshedRepo>
+) : SerializableMarker
+
+
+@Serializable
+data class RefreshedRepo(
+    @SerialName("repo_id")
+    val repoId: String,
+    @SerialName("repo_hash")
+    val hash: String? = null,
+    val name: String,
+    @SerialName("can_write")
+    val canWrite: Boolean,
+    @SerialName("all_files")
+    val allFiles: List<String>,
+    @SerialName("refreshed_files")
+    val refreshedFiles: List<String>,
+    @SerialName("error")
+    val error: String? = null,
+)
+
+fun RefreshedRepo.toRepo(): SnowbirdRepo {
+    return SnowbirdRepo(
+        key = repoId,
+        name = name,
+        hash = hash,
+        permissions = if (canWrite) "READ_WRITE" else "READ_ONLY",
+        createdAt = null, // No createdAt in this response
+    )
+}