Skip to content

Commit f4bc15c

Browse files
PhilippThalerPhilippThaler
committed
Merge upstream/main into feature/upload-subfolders-by-date
2 parents 68f5e5c + f653870 commit f4bc15c

78 files changed

Lines changed: 1541 additions & 390 deletions

File tree

Some content is hidden

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

‎.github/workflows/build-tester-apk.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
COMMIT_HASH=$(git rev-parse HEAD)
4646
echo "Commit hash: $COMMIT_HASH"
4747
echo "commit_hash=$COMMIT_HASH" >> $GITHUB_OUTPUT
48+
echo "commit_hash=$COMMIT_HASH" >> "$GITHUB_ENV"
4849
4950
- name: Setup JDK
5051
uses: actions/setup-java@v5
@@ -99,6 +100,9 @@ jobs:
99100
uses: softprops/action-gh-release@v2
100101
with:
101102
tag_name: build-tester-apk-${{ github.run_number }}
103+
target_commitish: ${{ env.commit_hash }}
102104
name: build-tester-apk build ${{ github.run_number }}
103105
files: ${{ steps.set_artifact.outputs.artifact_name }}
104106
prerelease: true
107+
generate_release_notes: false
108+
body: Built from ${{ env.commit_hash }}

‎gradle/libs.versions.toml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
androidGradlePlugin = "8.7.2"
3-
androidxActivity = "1.6.1"
3+
androidxActivity = "1.8.0"
44
androidxAnnotation = "1.6.0"
55
androidxAppCompat = "1.6.1"
66
androidxArch = "2.2.0"
@@ -9,17 +9,17 @@ androidxBrowser = "1.5.0"
99
androidxContraintLayout = "2.1.4"
1010
androidxCore = "1.10.1"
1111
androidxEnterpriseFeedback = "1.1.0"
12-
androidxEspresso = "3.5.1"
12+
androidxEspresso = "3.6.1"
1313
androidxFragment = "1.5.7"
1414
androidxLegacy = "1.0.0"
1515
androidxLifecycle = "2.5.1"
1616
androidxLifecycleExtensions = "2.2.0"
1717
androidxRoom = "2.5.1"
1818
androidxSqlite = "2.3.1"
19-
androidxTest = "1.4.0"
20-
androidxTestExt = "1.1.5"
21-
androidxTestMonitor = "1.6.1"
22-
androidxTestUiAutomator ="2.2.0"
19+
androidxTest = "1.6.1"
20+
androidxTestExt = "1.2.1"
21+
androidxTestMonitor = "1.7.2"
22+
androidxTestUiAutomator ="2.3.0"
2323
androidxWork = "2.8.1"
2424
coil = "2.2.2"
2525
detekt = "1.23.3"
@@ -30,6 +30,7 @@ floatingactionbutton = "1.10.1"
3030
glide = "4.15.1"
3131
glideToVectorYou = "v2.0.0"
3232
junit4 = "4.13.2"
33+
kaspresso = "1.6.0"
3334
koin = "3.3.3"
3435
kotlin = "1.9.20"
3536
kotlinxCoroutines = "1.6.4"
@@ -47,6 +48,7 @@ stetho = "1.6.0"
4748
timber = "5.0.1"
4849

4950
[libraries]
51+
androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "androidxActivity" }
5052
androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidxAnnotation" }
5153
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }
5254
androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidxArch" }
@@ -91,6 +93,7 @@ floatingactionbutton = { group = "com.getbase", name = "floatingactionbutton", v
9193
glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
9294
glide-vector = { group = "com.github.2coffees1team", name = "GlideToVectorYou", version.ref = "glideToVectorYou" }
9395
junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
96+
kaspresso = { group = "com.kaspersky.android-components", name = "kaspresso", version.ref = "kaspresso" }
9497
koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
9598
koin-androidx-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin" }
9699
koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" }

‎opencloudApp/build.gradle‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
implementation libs.kotlinx.coroutines.core
1717

1818
// Android X
19+
implementation libs.androidx.activity
1920
implementation libs.androidx.annotation
2021
implementation libs.androidx.appcompat
2122
implementation libs.androidx.biometric
@@ -81,6 +82,9 @@ dependencies {
8182
androidTestImplementation libs.dexopener
8283
androidTestImplementation(libs.mockk.android) { exclude module: "objenesis" }
8384

85+
// Kaspresso
86+
androidTestImplementation libs.kaspresso
87+
8488
// Debug
8589
debugImplementation libs.androidx.fragment.testing
8690
debugImplementation libs.androidx.test.monitor
@@ -91,6 +95,17 @@ dependencies {
9195
detektPlugins libs.detekt.libraries
9296
}
9397

98+
configurations.all {
99+
resolutionStrategy {
100+
force "androidx.test:core:1.6.1"
101+
force "androidx.test:core-ktx:1.6.1"
102+
force "androidx.test:monitor:1.7.2"
103+
force "androidx.test:runner:1.6.2"
104+
force "androidx.test:rules:1.6.1"
105+
force "androidx.test.espresso:espresso-core:3.6.1"
106+
}
107+
}
108+
94109
android {
95110
compileSdkVersion sdkCompileVersion
96111

@@ -100,8 +115,8 @@ android {
100115

101116
testInstrumentationRunner "eu.opencloud.android.utils.OCTestAndroidJUnitRunner"
102117

103-
versionCode = 4
104-
versionName = "1.2.0"
118+
versionCode = 6
119+
versionName = "1.2.1"
105120

106121
buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\""
107122
buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\""
@@ -124,6 +139,10 @@ android {
124139
sourceSets {
125140
androidTest.java.srcDirs += "src/test-common/java"
126141
test.java.srcDirs += "src/test-common/java"
142+
143+
androidTest {
144+
java.srcDirs += ['src/integrationTest/java']
145+
}
127146
}
128147

129148
lint {

‎opencloudApp/src/androidTest/java/eu/opencloud/android/authentication/LoginActivityTest.kt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
package eu.opencloud.android.authentication
2424

25+
import android.accounts.AccountManager
2526
import android.accounts.AccountManager.KEY_ACCOUNT_NAME
2627
import android.accounts.AccountManager.KEY_ACCOUNT_TYPE
2728
import android.app.Activity.RESULT_OK
@@ -88,13 +89,15 @@ import eu.opencloud.android.utils.scrollAndClick
8889
import eu.opencloud.android.utils.typeText
8990
import io.mockk.every
9091
import io.mockk.mockk
92+
import io.mockk.mockkStatic
9193
import io.mockk.unmockkAll
9294
import io.mockk.verify
9395
import org.hamcrest.Matchers.allOf
9496
import org.junit.After
9597
import org.junit.Assert.assertEquals
9698
import org.junit.Assert.assertNotNull
9799
import org.junit.Before
100+
import org.junit.Ignore
98101
import org.junit.Test
99102
import org.koin.androidx.viewmodel.dsl.viewModel
100103
import org.koin.core.context.startKoin
@@ -127,6 +130,12 @@ class LoginActivityTest {
127130
settingsViewModel = mockk(relaxUnitFun = true)
128131
ocContextProvider = mockk(relaxed = true)
129132
mdmProvider = mockk(relaxed = true)
133+
val accountManager = mockk<AccountManager>(relaxed = true)
134+
every { accountManager.getUserData(any(), any()) } returns null
135+
every { accountManager.getPassword(any()) } returns null
136+
137+
mockkStatic(AccountManager::class)
138+
every { AccountManager.get(any()) } returns accountManager
130139

131140
loginResultLiveData = MutableLiveData()
132141
serverInfoLiveData = MutableLiveData()
@@ -464,6 +473,7 @@ class LoginActivityTest {
464473
}
465474
}
466475

476+
@Ignore
467477
@Test
468478
fun loginBasic_callLoginBasic() {
469479
launchTest()
@@ -482,6 +492,7 @@ class LoginActivityTest {
482492
verify(exactly = 1) { authenticationViewModel.loginBasic(OC_BASIC_USERNAME, OC_BASIC_PASSWORD, null) }
483493
}
484494

495+
@Ignore
485496
@Test
486497
fun loginBasic_callLoginBasic_trimUsername() {
487498
launchTest()
@@ -533,6 +544,7 @@ class LoginActivityTest {
533544
}
534545
}
535546

547+
@Ignore
536548
@Test
537549
fun login_isSuccess_finishResultCode() {
538550
launchTest()
@@ -550,6 +562,7 @@ class LoginActivityTest {
550562
assertEquals("opencloud", accountType)
551563
}
552564

565+
@Ignore
553566
@Test
554567
fun login_isSuccess_finishResultCodeBrandedAccountType() {
555568
launchTest(accountType = "notOpenCloud")

‎opencloudApp/src/androidTest/java/eu/opencloud/android/files/details/FileDetailsFragmentTest.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ import io.mockk.every
2828
import io.mockk.mockk
2929
import kotlinx.coroutines.flow.MutableStateFlow
3030
import org.junit.Before
31+
import org.junit.Ignore
3132
import org.junit.Test
3233
import org.koin.androidx.viewmodel.dsl.viewModel
3334
import org.koin.core.context.startKoin
3435
import org.koin.core.context.stopKoin
3536
import org.koin.dsl.module
3637

38+
@Ignore
3739
class FileDetailsFragmentTest {
3840

3941
private lateinit var fileDetailsViewModel: FileDetailsViewModel

‎opencloudApp/src/androidTest/java/eu/opencloud/android/settings/advanced/SettingsAdvancedFragmentTest.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import org.junit.After
3939
import org.junit.Assert.assertFalse
4040
import org.junit.Assert.assertNotNull
4141
import org.junit.Before
42+
import org.junit.Ignore
4243
import org.junit.Test
4344
import org.koin.androidx.viewmodel.dsl.viewModel
4445
import org.koin.core.context.startKoin
@@ -98,6 +99,7 @@ class SettingsAdvancedFragmentTest {
9899
)
99100
}
100101

102+
@Ignore
101103
@Test
102104
fun disableShowHiddenFiles() {
103105
prefShowHiddenFiles?.isChecked = advancedViewModel.isHiddenFilesShown()

‎opencloudApp/src/androidTest/java/eu/opencloud/android/settings/logs/SettingsLogsFragmentTest.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import org.junit.After
4747
import org.junit.Assert.assertFalse
4848
import org.junit.Assert.assertTrue
4949
import org.junit.Before
50+
import org.junit.Ignore
5051
import org.junit.Test
5152
import org.koin.androidx.viewmodel.dsl.viewModel
5253
import org.koin.core.context.startKoin
@@ -162,6 +163,7 @@ class SettingsLogsFragmentTest {
162163
)
163164
}
164165

166+
@Ignore
165167
@Test
166168
fun enableLoggingMakesSettingsEnable() {
167169
launchTest(enabledLogging = false)

‎opencloudApp/src/androidTest/java/eu/opencloud/android/settings/more/SettingsMoreFragmentTest.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import org.junit.After
5454
import org.junit.Assert.assertNotNull
5555
import org.junit.Assert.assertNull
5656
import org.junit.Before
57+
import org.junit.Ignore
5758
import org.junit.Test
5859
import org.koin.androidx.viewmodel.dsl.viewModel
5960
import org.koin.core.context.startKoin
@@ -237,6 +238,7 @@ class SettingsMoreFragmentTest {
237238
assertNull(prefImprint)
238239
}
239240

241+
@Ignore
240242
@Test
241243
fun helpOpensNotEmptyUrl() {
242244
every { moreViewModel.getHelpUrl() } returns context.getString(R.string.url_help)

‎opencloudApp/src/androidTest/java/eu/opencloud/android/settings/security/PassCodeActivityTest.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import io.mockk.mockk
5252
import org.junit.After
5353
import org.junit.Assert.assertEquals
5454
import org.junit.Before
55+
import org.junit.Ignore
5556
import org.junit.Test
5657
import org.koin.androidx.viewmodel.dsl.viewModel
5758
import org.koin.core.context.startKoin
@@ -217,6 +218,7 @@ class PassCodeActivityTest {
217218
R.id.error.isDisplayed(false)
218219
}
219220

221+
@Ignore
220222
@Test
221223
fun secondTryCorrect() {
222224
every { biometricViewModel.isBiometricLockAvailable() } returns true
@@ -273,6 +275,7 @@ class PassCodeActivityTest {
273275
R.id.lock_time.isDisplayed(false)
274276
}
275277

278+
@Ignore
276279
@Test
277280
fun deletePasscodeCorrect() {
278281
// Open Activity in passcode deletion mode
@@ -304,6 +307,7 @@ class PassCodeActivityTest {
304307
R.id.lock_time.isDisplayed(false)
305308
}
306309

310+
@Ignore
307311
@Test
308312
fun checkEnableBiometricDialogIsVisible() {
309313
every { biometricViewModel.isBiometricLockAvailable() } returns true
@@ -318,6 +322,7 @@ class PassCodeActivityTest {
318322
onView(withText(R.string.common_no)).check(matches(isDisplayed()))
319323
}
320324

325+
@Ignore
321326
@Test
322327
fun checkEnableBiometricDialogYesOption() {
323328
every { biometricViewModel.isBiometricLockAvailable() } returns true
@@ -333,6 +338,7 @@ class PassCodeActivityTest {
333338
assertEquals(activityScenario.result.resultCode, Activity.RESULT_OK)
334339
}
335340

341+
@Ignore
336342
@Test
337343
fun checkEnableBiometricDialogNoOption() {
338344
every { biometricViewModel.isBiometricLockAvailable() } returns true

‎opencloudApp/src/androidTest/java/eu/opencloud/android/settings/security/SettingsSecurityFragmentTest.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import org.junit.Assert.assertNotNull
6060
import org.junit.Assert.assertNull
6161
import org.junit.Assert.assertTrue
6262
import org.junit.Before
63+
import org.junit.Ignore
6364
import org.junit.Test
6465
import org.koin.androidx.viewmodel.dsl.viewModel
6566
import org.koin.core.context.startKoin
@@ -200,6 +201,7 @@ class SettingsSecurityFragmentTest {
200201
assertNull(prefBiometric)
201202
}
202203

204+
@Ignore
203205
@Test
204206
fun passcodeOpen() {
205207
every { securityViewModel.isPatternSet() } returns false
@@ -221,6 +223,7 @@ class SettingsSecurityFragmentTest {
221223
intended(hasComponent(PatternActivity::class.java.name))
222224
}
223225

226+
@Ignore
224227
@Test
225228
fun passcodeLockEnabledOk() {
226229
every { securityViewModel.isPatternSet() } returns false
@@ -248,6 +251,7 @@ class SettingsSecurityFragmentTest {
248251
assertTrue(prefPattern.isChecked)
249252
}
250253

254+
@Ignore
251255
@Test
252256
fun enablePasscodeEnablesBiometricLockAndLockApplication() {
253257
launchTest()
@@ -270,6 +274,7 @@ class SettingsSecurityFragmentTest {
270274
assertTrue(prefLockApplication.isEnabled)
271275
}
272276

277+
@Ignore
273278
@Test
274279
fun onlyOneMethodEnabledPattern() {
275280
every { securityViewModel.isPatternSet() } returns true
@@ -324,6 +329,7 @@ class SettingsSecurityFragmentTest {
324329
assertFalse(prefLockApplication.isEnabled)
325330
}
326331

332+
@Ignore
327333
@Test
328334
fun enableBiometricLockWithPasscodeEnabled() {
329335
every { BiometricManager.hasEnrolledBiometric() } returns true
@@ -346,6 +352,7 @@ class SettingsSecurityFragmentTest {
346352
assertTrue(prefBiometric!!.isChecked)
347353
}
348354

355+
@Ignore
349356
@Test
350357
fun enableBiometricLockNoEnrolledBiometric() {
351358
every { BiometricManager.hasEnrolledBiometric() } returns false
@@ -450,6 +457,7 @@ class SettingsSecurityFragmentTest {
450457
assertTrue(prefPattern.isVisible)
451458
}
452459

460+
@Ignore
453461
@Test
454462
fun checkIfUserEnabledBiometricRecommendation() {
455463
every { securityViewModel.getBiometricsState() } returns true

0 commit comments

Comments
 (0)