Skip to content

Commit d8aad54

Browse files
ArnyminerZArnyminerZ
committed
Merge branch 'migrate-main-activity' into migrate-intro-about
# Conflicts: # app/src/main/kotlin/at/bitfire/davdroid/ui/MainActivity.kt
2 parents 52fde0c + 5b93526 commit d8aad54

File tree

113 files changed

+1050
-922
lines changed

Some content is hidden

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

113 files changed

+1050
-922
lines changed

‎.idea/copyright/LICENSE.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/copyright/profiles_settings.xml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AUTHORS‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
# This is the list of significant contributors to DAVx5.
2-
#
3-
# This does not necessarily list everyone who has contributed work.
4-
# To see the full list of contributors, see the revision history in
5-
# source control.
1+
You can view the list of people who have contributed to the code base in the version control history:
2+
https://github.com/bitfireAT/davx5-ose/graphs/contributors
63

7-
Ricki Hirner (bitfire.at)
8-
Bernhard Stockmann (bitfire.at)
4+
Translators are not mentioned in the history explicitly.
5+
The list of translators can be found in the About screen.
96

10-
Sunik Kupfer (bitfire.at)
11-
Patrick Lang (techbee.at)
7+
Every contribution is welcome. There are many other forms of contributing besides writing code!

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android {
1919
defaultConfig {
2020
applicationId = "at.bitfire.davdroid"
2121

22-
versionCode = 404060000
23-
versionName = "4.4.6-alpha.1"
22+
versionCode = 404060001
23+
versionName = "4.4.6-beta.1"
2424

2525
setProperty("archivesBaseName", "davx5-ose-$versionName")
2626

‎app/src/androidTest/AndroidManifest.xml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,4 @@
77
<uses-permission android:name="android.permission.GET_ACCOUNTS" android:maxSdkVersion="22"/>
88
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" android:maxSdkVersion="22"/>
99

10-
<application>
11-
12-
<!-- test account type (without associated sync adapters) -->
13-
<service
14-
android:name="at.bitfire.davdroid.sync.account.TestAccountAuthenticator"
15-
android:exported="false">
16-
<intent-filter>
17-
<action android:name="android.accounts.AccountAuthenticator"/>
18-
</intent-filter>
19-
20-
<meta-data
21-
android:name="android.accounts.AccountAuthenticator"
22-
android:resource="@xml/test_account_authenticator"/>
23-
</service>
24-
25-
</application>
26-
2710
</manifest>

‎app/src/androidTest/kotlin/at/bitfire/davdroid/Dav4jvm.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/***************************************************************************************************
1+
/*
22
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
3-
**************************************************************************************************/
3+
*/
44

55
package at.bitfire.davdroid
66

‎app/src/androidTest/kotlin/at/bitfire/davdroid/TestModules.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
3+
*/
4+
15
package at.bitfire.davdroid
26

37
import at.bitfire.davdroid.push.PushRegistrationWorkerManager

‎app/src/androidTest/kotlin/at/bitfire/davdroid/repository/DavCollectionRepositoryTest.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
3+
*/
4+
15
package at.bitfire.davdroid.repository
26

37
import android.content.Context

‎app/src/androidTest/kotlin/at/bitfire/davdroid/repository/DavHomeSetRepositoryTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ class DavHomeSetRepositoryTest {
4141
val entry1 = HomeSet(id=0, serviceId=serviceId, personal=true, url="https://example.com/1".toHttpUrl())
4242
val insertId1 = repository.insertOrUpdateByUrl(entry1)
4343
assertEquals(1L, insertId1)
44-
assertEquals(entry1.apply { id = 1L }, repository.getById(1L))
44+
assertEquals(entry1.copy(id = 1L), repository.getById(1L))
4545

4646
val updatedEntry1 = HomeSet(id=0, serviceId=serviceId, personal=true, url="https://example.com/1".toHttpUrl(), displayName="Updated Entry")
4747
val updateId1 = repository.insertOrUpdateByUrl(updatedEntry1)
4848
assertEquals(1L, updateId1)
49-
assertEquals(updatedEntry1.apply { id = 1L }, repository.getById(1L))
49+
assertEquals(updatedEntry1.copy(id = 1L), repository.getById(1L))
5050

5151
val entry2 = HomeSet(id=0, serviceId=serviceId, personal=true, url= "https://example.com/2".toHttpUrl())
5252
val insertId2 = repository.insertOrUpdateByUrl(entry2)
5353
assertEquals(2L, insertId2)
54-
assertEquals(entry2.apply { id = 2L }, repository.getById(2L))
54+
assertEquals(entry2.copy(id = 2L), repository.getById(2L))
5555
}
5656

5757
@Test

‎app/src/androidTest/kotlin/at/bitfire/davdroid/resource/LocalAddressBookStoreTest.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
3+
*/
4+
15
package at.bitfire.davdroid.resource
26

37
import android.accounts.Account

0 commit comments

Comments
 (0)