Skip to content

Commit dbed7a1

Browse files
ElelanElelan
authored
Merge pull request #744 from OpenArchive/stage/dweb-next-merge
Stage/dweb next merge
2 parents 51d7b24 + b23b2e8 commit dbed7a1

File tree

71 files changed

+2579
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+2579
-655
lines changed

‎analytics/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
id("com.android.library")
3-
id("org.jetbrains.kotlin.android")
2+
alias(libs.plugins.android.library)
3+
alias(libs.plugins.kotlin.android)
44
}
55

66
kotlin {

‎app/build.gradle.kts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ plugins {
1010
alias(libs.plugins.kotlin.serialization)
1111
alias(libs.plugins.ksp)
1212
alias(libs.plugins.navigation.safeargs)
13+
alias(libs.plugins.androidx.room)
1314
alias(libs.plugins.detekt.plugin)
1415
alias(libs.plugins.google.gms.google.services)
1516
alias(libs.plugins.google.firebase.crashlytics)
@@ -153,6 +154,10 @@ android {
153154
exclude(group = "org.bouncycastle", module = "bcprov-jdk15on")
154155
}
155156
}
157+
158+
room {
159+
schemaDirectory("$projectDir/schemas")
160+
}
156161
}
157162

158163
dependencies {
@@ -215,6 +220,11 @@ dependencies {
215220
implementation(libs.androidx.security.crypto)
216221
implementation(libs.androidx.work)
217222

223+
// Room Database
224+
implementation(libs.androidx.room.runtime)
225+
implementation(libs.androidx.room.ktx)
226+
ksp(libs.androidx.room.compiler)
227+
218228
// Dependency Injection - Koin
219229
implementation(libs.koin.core)
220230
implementation(libs.koin.android)
@@ -229,6 +239,7 @@ dependencies {
229239
implementation(libs.okhttp.logging)
230240
implementation(libs.retrofit)
231241
implementation(libs.retrofit.gson)
242+
implementation(libs.retrofit.kotlinx.serialization)
232243
implementation(libs.guardianproject.sardine)
233244

234245
// Images & Media
@@ -288,6 +299,10 @@ dependencies {
288299
exclude(group = "com.squareup.okio", module = "okio")
289300
}
290301

302+
// Barcode Scanning
303+
implementation(libs.zxing.core)
304+
implementation(libs.zxing.android.embedded)
305+
291306
// Utilities
292307
implementation(libs.timber)
293308
implementation(libs.gson)

‎app/src/main/AndroidManifest.xml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<uses-permission
1212
android:name="android.permission.READ_EXTERNAL_STORAGE"
1313
tools:ignore="ScopedStorage" />
14-
<!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />-->
15-
<!-- <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />-->
14+
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
15+
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
1616
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
1717
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
1818
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -130,11 +130,11 @@
130130
android:taskAffinity=""
131131
android:theme="@style/SaveAppTheme.NoActionBar" />
132132

133-
<!-- <activity-->
134-
<!-- android:name=".features.main.QRScannerActivity"-->
135-
<!-- android:screenOrientation="portrait"-->
136-
<!-- android:theme="@style/zxing_CaptureTheme"-->
137-
<!-- android:windowSoftInputMode="stateAlwaysHidden" />-->
133+
<activity
134+
android:name=".features.main.QRScannerActivity"
135+
android:screenOrientation="portrait"
136+
android:theme="@style/zxing_CaptureTheme"
137+
android:windowSoftInputMode="stateAlwaysHidden" />
138138

139139
<activity
140140
android:name=".features.media.ReviewActivity"
@@ -209,9 +209,10 @@
209209

210210
<meta-data
211211
android:name="VERSION"
212-
android:value="37" />
212+
android:value="38" />
213213
<!-- NOTE: Please do not write migrations for added columns, as they are not needed.-->
214214
<!-- Only upgrade the version number when you add a new column.-->
215+
<!-- Version 38: Added 'hash' column to SNOWBIRD_REPO table-->
215216
<!-- migration sql causing duplicate column error:-->
216217
<!-- https://github.com/chennaione/sugar/issues/713 -->
217218

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"key": "A7c3ei6lejlBN3LIqHVOLbLwaICMVa1M1xbvNxvXB2o",
3+
"name": "my grp",
4+
"uri": "save+dweb::?dht=03b7377a2ea57a39413772c8a8754e2db2f068808c55ad4cd716ef371bd7076a&enc=c2157baf9f64ebd61aff7a204571bd97887d3c72706c1eb3622c8fbb98f67161&pk=cf3a57211dca6a993e8c2b322d50193d940baaed0eca5f17d1e02f41d6d8d7af&sk=85f46f8f3a4231210fc648b2a8ee4e71324190853b0df22381accc325392d191"
5+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"key": "1KHp86Sv5asv7DWdCoXL6LmhLAvVOYOpQ-4EvmScXFM",
3+
"name": "prathie",
4+
"can_write": true
5+
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"groups": [
3+
{
4+
"key": "yvClq1HZNqD2y9tHH-7pYBcUZBUjFoNZ3OcvzbszlOM",
5+
"name": "SaveWeb",
6+
"uri": "save+dweb::?dht=caf0a5ab51d936a0f6cbdb471feee9601714641523168359dce72fcdbb3394e3&enc=5af9ad74efce749b9b2bed692ecb16f71016729a6b11ea021d20f5f9186a1a7d&pk=0f083d9391c5bddf199320014abc9ab3f5b51c9e41adf97c0261e5be6b1ba41d&sk=e1525c792b78cd3aca849b3e2a1b6d3f7e08dd9339f3e872513b88400196c398"
7+
}
8+
]
9+
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"files": [
3+
{
4+
"hash": "4wtxbdhr7qcvfyha2joslvgfp237qmbvbab5hxr4q4te6w4ktkxq",
5+
"is_downloaded": true,
6+
"name": "download.jpeg"
7+
},
8+
{
9+
"hash": "igibt6thvtgvzlh5dzigfjccbhxgvrejed4whcqucdftyu4d4zua",
10+
"is_downloaded": true,
11+
"name": "1747903650390.jpg"
12+
}
13+
]
14+
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"repos": [
3+
{
4+
"can_write": false,
5+
"key": "qPV1BjzjsomQa67_jNk0n4elKMa-c9FMSfs_FygHNWs",
6+
"name": "Prathie"
7+
},
8+
{
9+
"can_write": true,
10+
"key": "_HP0fgWIA8gnibdSH37_akFwNs0goZz_bZN4AZk41hE",
11+
"name": "Elelan"
12+
}
13+
]
14+
}

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
[
2+
{
3+
"repos": [
4+
{
5+
"all_files": [
6+
"1747903650390.jpg",
7+
"download.jpeg"
8+
],
9+
"can_write": true,
10+
"name": "Elelan",
11+
"refreshed_files": [],
12+
"repo_hash": "wiuab7ulsfa4zhvim4fymp4xeyzec5kofjsxombq5vkhvx6z5voa",
13+
"repo_id": "Snti-GUoge16L1V00oQ86BppenuZ5OvA40k5LxbPNQA"
14+
},
15+
{
16+
"all_files": [],
17+
"can_write": false,
18+
"error": "Error getting repo hash from DHT: Unable to get DHT value for repo root hash",
19+
"name": "Prathie",
20+
"refreshed_files": [],
21+
"repo_id": "WuXDAzC2mBlEKjrTdctrDt8KASSfHwjspGgIqOXAFpc"
22+
}
23+
],
24+
"status": "success"
25+
},
26+
{
27+
"repos": [
28+
{
29+
"all_files": [
30+
"download.jpeg",
31+
"1747903650390.jpg"
32+
],
33+
"can_write": true,
34+
"name": "Elelan",
35+
"refreshed_files": [],
36+
"repo_hash": "jyr2k2xbzwei3ueopuhzoeu7kj6mouezoivxarxe4sez6nk27sca",
37+
"repo_id": "_HP0fgWIA8gnibdSH37_akFwNs0goZz_bZN4AZk41hE"
38+
},
39+
{
40+
"all_files": [
41+
"IMG-20250527-WA0002.jpg"
42+
],
43+
"can_write": false,
44+
"name": "Prathie",
45+
"refreshed_files": [
46+
"IMG-20250527-WA0002.jpg"
47+
],
48+
"repo_hash": "47rm2mhbxxnvdj2sodqhztykaehf3aaub5mopvoe25rzv6rxx24q",
49+
"repo_id": "qPV1BjzjsomQa67_jNk0n4elKMa-c9FMSfs_FygHNWs"
50+
}
51+
],
52+
"status": "success"
53+
},
54+
{
55+
"repos": [
56+
{
57+
"all_files": [
58+
"1747903650390.jpg",
59+
"download.jpeg"
60+
],
61+
"can_write": false,
62+
"name": "Elelan",
63+
"refreshed_files": [],
64+
"repo_hash": "jyr2k2xbzwei3ueopuhzoeu7kj6mouezoivxarxe4sez6nk27sca",
65+
"repo_id": "qY00DJlYIQyPoCJt_EJZz7QhJqzQJqcpnYB23OPAWEs"
66+
},
67+
{
68+
"all_files": [],
69+
"can_write": true,
70+
"error": "Error getting repo hash from DHT: Unable to get DHT value for repo root hash",
71+
"name": "Upul",
72+
"refreshed_files": [],
73+
"repo_id": "Qa1DGd8PX_zU6X3SFubR1oMKklJw7zAGWiVhgvGkRuI"
74+
}
75+
],
76+
"status": "success"
77+
}
78+
]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@ class SaveApp : SugarApp(), SingletonImageLoader.Factory, DefaultLifecycleObserv
141141
private fun createSnowbirdNotificationChannel() {
142142
val silentChannel = NotificationChannel(
143143
SNOWBIRD_SERVICE_CHANNEL_SILENT,
144-
"Raven Service",
144+
"Dweb Storage",
145145
NotificationManager.IMPORTANCE_LOW
146146
)
147147

148148
val chimeChannel = NotificationChannel(
149149
SNOWBIRD_SERVICE_CHANNEL_CHIME,
150-
"Raven Service",
150+
"Dweb Storage",
151151
NotificationManager.IMPORTANCE_DEFAULT
152152
)
153153

0 commit comments

Comments
 (0)