From 5c79f8769ef6313f0d05f709fe74187fa24bb28a Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 21 Jun 2022 13:57:27 +0530 Subject: [PATCH 1/4] update URLs and added dav4jvm --- .gitmodules | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6a6b94f2b..4d6cf84e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,12 @@ [submodule "ical4android"] path = ical4android - url = https://github.com/bitfireAT/ical4android.git + url = https://gitlab.e.foundation/e/apps/ical4android.git [submodule "vcard4android"] path = vcard4android - url = https://github.com/bitfireAT/vcard4android.git + url = https://gitlab.e.foundation/e/apps/vcard4android.git [submodule "cert4android"] path = cert4android - url = https://github.com/bitfireAT/cert4android.git + url = https://gitlab.e.foundation/e/apps/cert4android.git +[submodule "dav4jvm"] + path = dav4jvm + url = https://gitlab.e.foundation/e/apps/dav4android.git -- GitLab From 97d7f1240bd71c8098c8807ac9943c95b9b2c093 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 22 Jun 2022 13:00:10 +0530 Subject: [PATCH 2/4] submodule: track sprint_freetown branch --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index 4d6cf84e8..a5552e3ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,16 @@ [submodule "ical4android"] path = ical4android url = https://gitlab.e.foundation/e/apps/ical4android.git + branch = sprint_freetown [submodule "vcard4android"] path = vcard4android url = https://gitlab.e.foundation/e/apps/vcard4android.git + branch = sprint_freetown [submodule "cert4android"] path = cert4android url = https://gitlab.e.foundation/e/apps/cert4android.git + branch = sprint_freetown [submodule "dav4jvm"] path = dav4jvm url = https://gitlab.e.foundation/e/apps/dav4android.git + branch = sprint_freetown -- GitLab From 6ec0148febe85d39186b46af182c46d05ffb1971 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 22 Jun 2022 13:43:03 +0530 Subject: [PATCH 3/4] update applicationId --- app/build.gradle | 3 ++- .../at/bitfire/davdroid/syncadapter/SyncManager.kt | 12 ++++++------ vcard4android | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e18f23fdb..37f6b6be6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { buildToolsVersion '32.0.0' defaultConfig { - applicationId "at.bitfire.davdroid" + applicationId "foundation.e.accountmanager" versionCode 402010002 versionName '4.2.1-rc.1-ose' @@ -30,6 +30,7 @@ android { arguments { arg("room.schemaLocation", "$projectDir/schemas") } + } } diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt index 374377d83..bde05a4ba 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt @@ -33,11 +33,10 @@ import at.bitfire.davdroid.settings.AccountSettings import at.bitfire.davdroid.ui.DebugInfoActivity import at.bitfire.davdroid.ui.NotificationUtils import at.bitfire.davdroid.ui.account.SettingsActivity -import at.bitfire.ical4android.CalendarStorageException -import at.bitfire.ical4android.Ical4Android -import at.bitfire.ical4android.TaskProvider -import at.bitfire.ical4android.UsesThreadContextClassLoader -import at.bitfire.vcard4android.ContactsStorageException + +import foundation.e.ical4android.CalendarStorageException +import foundation.e.ical4android.TaskProvider +import foundation.e.vcard4android.ContactsStorageException import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking @@ -815,7 +814,8 @@ abstract class SyncManager, out CollectionType: L is LocalEvent -> Intent(Intent.ACTION_VIEW, ContentUris.withAppendedId(CalendarContract.Events.CONTENT_URI, id)) is LocalTask -> - Intent(Intent.ACTION_VIEW, ContentUris.withAppendedId(TaskContract.Tasks.getContentUri(TaskProvider.ProviderName.OpenTasks.authority), id)) + Intent(Intent.ACTION_VIEW, ContentUris.withAppendedId(TaskContract.Tasks.getContentUri( + TaskProvider.ProviderName.OpenTasks.authority), id)) else -> null } diff --git a/vcard4android b/vcard4android index ab6167b92..294fca472 160000 --- a/vcard4android +++ b/vcard4android @@ -1 +1 @@ -Subproject commit ab6167b9213c2fe03ca159f6eb6bd1472ede1fab +Subproject commit 294fca472507f311c293d79caee3600f16f23d21 -- GitLab From 03c3ce5e7c4aab8faf37c53c108afe07ab5135ec Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 22 Jun 2022 13:48:17 +0530 Subject: [PATCH 4/4] build.gradle: set minSdkVersion to 24(Android 7.1) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 37f6b6be6..bc93ea75e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,7 +18,7 @@ android { versionName '4.2.1-rc.1-ose' buildConfigField "long", "buildTime", System.currentTimeMillis() + "L" - minSdkVersion 21 // Android 5 + minSdkVersion 24 // Android 7.1 targetSdkVersion 32 // Android 12 buildConfigField "String", "userAgent", "\"DAVx5\"" -- GitLab