Skip to content

Commit 79daa11

Browse files
dbotvinAlexViseven
dbotvin
authored and
AlexViseven
committed
Merge branch 'release/ionos-1.1.0' into ionos-release/1.1.0
1 parent 46bfd89 commit 79daa11

File tree

191 files changed

+13449
-1239
lines changed

Some content is hidden

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

191 files changed

+13449
-1239
lines changed

‎.gitlab-ci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include:
2+
- project: ${CI_PROJECT_PATH}
3+
ref: ci_config
4+
file: '.gitlab-ci.yml'

‎.idea/copyright/IONOS_HiDrive_Next.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ android {
171171
gplay {
172172
applicationId "com.ionos.hidrivenext"
173173
dimension "default"
174-
versionCode 13
174+
versionCode 15
175175
isDefault = true
176176
resConfigs "en", "de", "es", "fr", "nl", "it"
177177
}
@@ -328,7 +328,6 @@ dependencies {
328328
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
329329

330330
// document scanner not available on FDroid (generic) due to OpenCV binaries
331-
gplayImplementation project(':appscan')
332331
huaweiImplementation project(':appscan')
333332
qaImplementation project(':appscan')
334333
implementation project(':scanbot')
@@ -344,6 +343,10 @@ dependencies {
344343

345344
implementation 'org.conscrypt:conscrypt-android:2.5.3'
346345

346+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.10.2"
347+
348+
implementation "androidx.media3:media3-common:$androidxMediaVersion"
349+
implementation "androidx.media3:media3-session:$androidxMediaVersion"
347350
implementation "androidx.media3:media3-ui:$androidxMediaVersion"
348351
implementation "androidx.media3:media3-session:$androidxMediaVersion"
349352
implementation "androidx.media3:media3-exoplayer:$androidxMediaVersion"
@@ -380,6 +383,9 @@ dependencies {
380383
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
381384
}
382385

386+
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
387+
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
388+
383389
// dependencies for local unit tests
384390
testImplementation 'junit:junit:4.13.2'
385391
testImplementation "org.mockito:mockito-core:$mockitoVersion"

‎app/src/gplay/AndroidManifest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@
9797
android:name="com.ionos.privacy.PrivacySettingsActivity"
9898
android:exported="false" />
9999

100+
<activity android:name=".ui.activity.ShareActivity"
101+
tools:remove="android:theme" />
102+
100103
<provider
101104
android:name="androidx.startup.InitializationProvider"
102105
android:authorities="${applicationId}.androidx-startup"

‎app/src/gplay/google-services.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"project_info": {
3-
"project_number": "",
4-
"project_id": ""
5-
},
6-
"client": [
7-
{
8-
"client_info": {
9-
"mobilesdk_app_id": "",
10-
"android_client_info": {
11-
"package_name": "com.nextcloud.client"
12-
}
13-
},
14-
"oauth_client": [],
15-
"api_key": [
2+
"project_info": {
3+
"project_number": "",
4+
"project_id": ""
5+
},
6+
"client": [
167
{
17-
"current_key": ""
18-
}
19-
],
20-
"services": {
21-
"analytics_service": {
22-
"status": 1
23-
},
24-
"appinvite_service": {
25-
"status": 1,
26-
"other_platform_oauth_client": []
27-
},
28-
"ads_service": {
29-
"status": 1
8+
"client_info": {
9+
"mobilesdk_app_id": "",
10+
"android_client_info": {
11+
"package_name": "com.nextcloud.client"
12+
}
13+
},
14+
"oauth_client": [],
15+
"api_key": [
16+
{
17+
"current_key": ""
18+
}
19+
],
20+
"services": {
21+
"analytics_service": {
22+
"status": 1
23+
},
24+
"appinvite_service": {
25+
"status": 1,
26+
"other_platform_oauth_client": []
27+
},
28+
"ads_service": {
29+
"status": 1
30+
}
31+
}
3032
}
31-
}
32-
}
33-
],
34-
"configuration_version": "1"
33+
],
34+
"configuration_version": "1"
3535
}

‎app/src/gplay/java/com/nextcloud/client/di/VariantModule.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
*/
99
package com.nextcloud.client.di
1010

11+
import androidx.activity.result.contract.ActivityResultContract
1112
import com.ionos.scanbot.availability.Availability
1213
import com.ionos.scanbot.di.qualifiers.Scanbot
1314
import com.ionos.scanbot.di.qualifiers.ScanbotLicense
14-
import com.nextcloud.appscan.ScanPageContract
1515
import com.nextcloud.client.documentscan.AppScanOptionalFeature
1616
import dagger.Module
1717
import dagger.Provides
@@ -26,7 +26,9 @@ internal class VariantModule {
2626
@ScanbotLicense licenseAvailability: Availability
2727
): AppScanOptionalFeature {
2828
return object : AppScanOptionalFeature() {
29-
override fun getScanContract() = ScanPageContract()
29+
override fun getScanContract(): ActivityResultContract<Unit, String?> {
30+
throw UnsupportedOperationException("Document scan is not available")
31+
}
3032
override val isAvailable: Boolean = featureAvailability.available() && licenseAvailability.available()
3133
}
3234
}

‎app/src/gplay/res/drawable-night/file_image.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
~ IONOS HiDrive Next - Android Client
3+
~
4+
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
5+
~ SPDX-License-Identifier: GPL-2.0
6+
-->
7+
8+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
9+
android:width="24dp"
10+
android:height="24dp"
11+
android:viewportWidth="48"
12+
android:viewportHeight="48">
13+
<group>
14+
<clip-path android:pathData="M0,0h48v48h-48z" />
15+
<path
16+
android:fillColor="@color/cornflower"
17+
android:pathData="M19.149,13.49L4,37.999H36L20.851,13.49C20.46,12.858 19.54,12.858 19.149,13.49Z" />
18+
<path
19+
android:fillColor="@color/curious_blue"
20+
android:pathData="M33.152,23.357L24,38H44L34.848,23.357C34.456,22.73 33.544,22.73 33.152,23.357Z" />
21+
<path
22+
android:fillColor="@color/white"
23+
android:pathData="M34,16C31.519,16 29.5,13.981 29.5,11.5C29.5,9.019 31.519,7 34,7C36.481,7 38.5,9.019 38.5,11.5C38.5,13.981 36.481,16 34,16ZM34,8C32.07,8 30.5,9.57 30.5,11.5C30.5,13.43 32.07,15 34,15C35.93,15 37.5,13.43 37.5,11.5C37.5,9.57 35.93,8 34,8Z" />
24+
</group>
25+
</vector>

‎app/src/gplay/res/drawable-night/file_movie.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--
2+
~ IONOS HiDrive Next - Android Client
3+
~
4+
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
5+
~ SPDX-License-Identifier: GPL-2.0
6+
-->
7+
8+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
9+
android:width="24dp"
10+
android:height="24dp"
11+
android:viewportWidth="48"
12+
android:viewportHeight="48">
13+
<group>
14+
<clip-path android:pathData="M0,0h48v48h-48z" />
15+
<path
16+
android:fillColor="@color/curious_blue"
17+
android:pathData="M45,8H3C2.448,8 2,8.448 2,9V39C2,39.552 2.448,40 3,40H45C45.552,40 46,39.552 46,39V9C46,8.448 45.552,8 45,8Z" />
18+
<path
19+
android:fillColor="@color/white"
20+
android:pathData="M24,36C30.627,36 36,30.627 36,24C36,17.373 30.627,12 24,12C17.373,12 12,17.373 12,24C12,30.627 17.373,36 24,36Z" />
21+
<path
22+
android:fillColor="@color/curious_blue"
23+
android:pathData="M28.5,24L21,19.5V28.5L28.5,24Z" />
24+
</group>
25+
</vector>

‎app/src/gplay/res/drawable-night/file_sound.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!--
2+
~ IONOS HiDrive Next - Android Client
3+
~
4+
~ SPDX-FileCopyrightText: 2025 STRATO GmbH.
5+
~ SPDX-License-Identifier: GPL-2.0
6+
-->
7+
8+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
9+
android:width="24dp"
10+
android:height="24dp"
11+
android:viewportWidth="48"
12+
android:viewportHeight="48">
13+
<group>
14+
<clip-path android:pathData="M0,0h48v48h-48z" />
15+
<path
16+
android:fillColor="@color/white"
17+
android:pathData="M15.5,11.294V21.983L39,13.689V3L15.5,11.294Z" />
18+
<path
19+
android:fillColor="@color/white"
20+
android:pathData="M38.487,31.102C38.211,31.102 37.987,30.878 37.987,30.602V6.602C37.987,6.326 38.211,6.102 38.487,6.102C38.763,6.102 38.987,6.326 38.987,6.602V30.602C38.987,30.878 38.763,31.102 38.487,31.102Z" />
21+
<path
22+
android:fillColor="@color/white"
23+
android:pathData="M38.239,28.161C39.797,30.306 38.887,33.623 36.206,35.571C33.525,37.519 30.089,37.359 28.531,35.214C26.973,33.069 27.883,29.752 30.564,27.804C33.245,25.856 36.681,26.016 38.239,28.161Z" />
24+
<path
25+
android:fillColor="@color/white"
26+
android:pathData="M15.987,39.102C15.711,39.102 15.487,38.878 15.487,38.602V14.602C15.487,14.326 15.711,14.102 15.987,14.102C16.263,14.102 16.487,14.326 16.487,14.602V38.602C16.487,38.878 16.263,39.102 15.987,39.102Z" />
27+
<path
28+
android:fillColor="@color/white"
29+
android:pathData="M15.739,36.161C17.297,38.306 16.387,41.623 13.706,43.571C11.025,45.519 7.589,45.359 6.031,43.214C4.473,41.069 5.383,37.752 8.064,35.804C10.745,33.856 14.181,34.016 15.739,36.161Z" />
30+
</group>
31+
</vector>

‎app/src/gplay/res/drawable/file_image.xml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,18 @@
88
<vector xmlns:android="http://schemas.android.com/apk/res/android"
99
android:width="24dp"
1010
android:height="24dp"
11-
android:viewportWidth="36"
12-
android:viewportHeight="36">
13-
<path
14-
android:pathData="M29,4H7C4.243,4 2,6.243 2,9V27C2,29.757 4.243,32 7,32H29C31.757,32 34,29.757 34,27V9C34,6.243 31.757,4 29,4ZM10.5,10C11.881,10 13,11.119 13,12.5C13,13.881 11.881,15 10.5,15C9.119,15 8,13.881 8,12.5C8,11.119 9.119,10 10.5,10ZM31,27C31,28.105 30.105,29 29,29H7C5.895,29 5,28.105 5,27V24.879L10.939,18.94C11.525,18.354 12.474,18.354 13.06,18.94L14.999,20.879L19.938,15.94C20.524,15.354 21.473,15.354 22.059,15.94L30.998,24.879V27H31Z"
15-
android:fillColor="@color/filelist_file_icon_color"/>
11+
android:viewportWidth="48"
12+
android:viewportHeight="48">
13+
<group>
14+
<clip-path android:pathData="M0,0h48v48h-48z" />
15+
<path
16+
android:fillColor="@color/dodger_blue"
17+
android:pathData="M19.149,13.49L4,37.999H36L20.851,13.49C20.46,12.858 19.54,12.858 19.149,13.49Z" />
18+
<path
19+
android:fillColor="@color/cornflower"
20+
android:pathData="M33.152,23.357L24,38H44L34.848,23.357C34.456,22.73 33.544,22.73 33.152,23.357Z" />
21+
<path
22+
android:fillColor="@color/navy"
23+
android:pathData="M34,16C31.519,16 29.5,13.981 29.5,11.5C29.5,9.019 31.519,7 34,7C36.481,7 38.5,9.019 38.5,11.5C38.5,13.981 36.481,16 34,16ZM34,8C32.07,8 30.5,9.57 30.5,11.5C30.5,13.43 32.07,15 34,15C35.93,15 37.5,13.43 37.5,11.5C37.5,9.57 35.93,8 34,8Z" />
24+
</group>
1625
</vector>

0 commit comments

Comments
 (0)