From 03b253ab2d3375b796e680062ae4187141e4ade6 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Thu, 28 Jul 2022 13:49:10 +0530 Subject: [PATCH 1/2] update package name and application id --- app/build.gradle | 2 +- .../davdroid/resource/LocalAddressBookTest.kt | 2 +- .../bitfire/davdroid/settings/AccountSettingsTest.kt | 2 +- .../bitfire/davdroid/syncadapter/AccountUtilsTest.kt | 2 +- .../bitfire/davdroid/syncadapter/SyncAdapterTest.kt | 2 +- .../bitfire/davdroid/syncadapter/SyncManagerTest.kt | 2 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/at/bitfire/davdroid/App.kt | 2 ++ app/src/main/java/at/bitfire/davdroid/DavService.kt | 1 + app/src/main/java/at/bitfire/davdroid/DavUtils.kt | 2 +- .../java/at/bitfire/davdroid/ForegroundService.kt | 2 ++ app/src/main/java/at/bitfire/davdroid/HttpClient.kt | 1 + .../main/java/at/bitfire/davdroid/PermissionUtils.kt | 2 ++ .../java/at/bitfire/davdroid/StorageLowReceiver.kt | 1 + .../main/java/at/bitfire/davdroid/db/AppDatabase.kt | 2 +- app/src/main/java/at/bitfire/davdroid/log/Logger.kt | 5 +++-- .../at/bitfire/davdroid/resource/LocalAddressBook.kt | 2 +- .../at/bitfire/davdroid/resource/LocalContact.kt | 3 ++- .../java/at/bitfire/davdroid/resource/LocalEvent.kt | 2 +- .../at/bitfire/davdroid/settings/AccountSettings.kt | 2 +- .../davdroid/syncadapter/AccountsUpdatedListener.kt | 2 +- .../davdroid/syncadapter/CalendarSyncManager.kt | 2 +- .../davdroid/syncadapter/ContactsSyncManager.kt | 2 +- .../bitfire/davdroid/syncadapter/JtxSyncManager.kt | 2 +- .../at/bitfire/davdroid/syncadapter/SyncManager.kt | 1 + .../at/bitfire/davdroid/syncadapter/SyncUtils.kt | 2 +- .../bitfire/davdroid/syncadapter/TasksSyncManager.kt | 2 +- .../java/at/bitfire/davdroid/ui/AboutActivity.kt | 12 ++++++------ .../at/bitfire/davdroid/ui/AccountListFragment.kt | 6 +++--- .../java/at/bitfire/davdroid/ui/AccountsActivity.kt | 5 +++-- .../at/bitfire/davdroid/ui/AppSettingsActivity.kt | 4 ++-- .../bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt | 4 ++-- .../java/at/bitfire/davdroid/ui/DebugInfoActivity.kt | 7 ++++--- .../at/bitfire/davdroid/ui/ExceptionInfoFragment.kt | 2 +- .../java/at/bitfire/davdroid/ui/HomeSetAdapter.kt | 2 +- .../java/at/bitfire/davdroid/ui/NotificationUtils.kt | 2 +- .../bitfire/davdroid/ui/OseAccountsDrawerHandler.kt | 2 +- .../at/bitfire/davdroid/ui/PermissionsFragment.kt | 7 ++++--- .../java/at/bitfire/davdroid/ui/TasksFragment.kt | 5 +++-- app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt | 2 +- .../bitfire/davdroid/ui/account/AccountActivity.kt | 5 +++-- .../davdroid/ui/account/AddressBooksFragment.kt | 5 +++-- .../bitfire/davdroid/ui/account/CalendarsFragment.kt | 5 +++-- .../davdroid/ui/account/CollectionInfoFragment.kt | 3 ++- .../davdroid/ui/account/CollectionsFragment.kt | 5 +++-- .../davdroid/ui/account/CreateAddressBookActivity.kt | 5 +++-- .../davdroid/ui/account/CreateCalendarActivity.kt | 5 +++-- .../davdroid/ui/account/CreateCollectionFragment.kt | 2 +- .../davdroid/ui/account/DeleteCollectionFragment.kt | 3 ++- .../davdroid/ui/account/RenameAccountFragment.kt | 2 +- .../bitfire/davdroid/ui/account/SettingsActivity.kt | 2 +- .../at/bitfire/davdroid/ui/account/WebcalFragment.kt | 5 +++-- .../davdroid/ui/account/WifiPermissionsActivity.kt | 5 +++-- .../ui/intro/BatteryOptimizationsFragment.kt | 7 ++++--- .../at/bitfire/davdroid/ui/intro/IntroActivity.kt | 2 +- .../bitfire/davdroid/ui/intro/OpenSourceFragment.kt | 5 +++-- .../davdroid/ui/intro/PermissionsIntroFragment.kt | 2 +- .../bitfire/davdroid/ui/intro/TasksIntroFragment.kt | 4 ++-- .../at/bitfire/davdroid/ui/intro/WelcomeFragment.kt | 4 +--- .../davdroid/ui/setup/AccountDetailsFragment.kt | 5 +++-- .../ui/setup/DefaultLoginCredentialsFragment.kt | 5 +++-- .../ui/setup/DefaultLoginCredentialsModel.kt | 2 +- .../davdroid/ui/setup/DetectConfigurationFragment.kt | 2 +- .../at/bitfire/davdroid/ui/setup/LoginActivity.kt | 2 +- .../davdroid/ui/setup/NextcloudLoginFlowFragment.kt | 2 +- .../davdroid/ui/webdav/AddWebdavMountActivity.kt | 6 ++++-- .../davdroid/ui/webdav/WebdavMountsActivity.kt | 6 +++--- .../at/bitfire/davdroid/ui/widget/CropImageView.kt | 2 +- .../bitfire/davdroid/webdav/DavDocumentsProvider.kt | 2 +- .../bitfire/davdroid/webdav/RandomAccessCallback.kt | 1 + .../davdroid/webdav/StreamingFileDescriptor.kt | 2 +- 71 files changed, 129 insertions(+), 98 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dace8855f..d918d521b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { buildToolsVersion '32.0.0' defaultConfig { - applicationId "at.bitfire.davdroid" + applicationId "foundation.e.accountmanager" versionCode 402020000 versionName '4.2.2' diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalAddressBookTest.kt b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalAddressBookTest.kt index d8281384d..3bd04d94d 100644 --- a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalAddressBookTest.kt +++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalAddressBookTest.kt @@ -7,7 +7,7 @@ package at.bitfire.davdroid.resource import android.accounts.Account import android.accounts.AccountManager import androidx.test.platform.app.InstrumentationRegistry -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest import org.junit.After diff --git a/app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt b/app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt index 612f3899a..d17910d66 100644 --- a/app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt +++ b/app/src/androidTest/java/at/bitfire/davdroid/settings/AccountSettingsTest.kt @@ -11,7 +11,7 @@ import android.os.Build import android.provider.CalendarContract import android.provider.ContactsContract import androidx.test.platform.app.InstrumentationRegistry -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.Credentials import at.bitfire.davdroid.syncadapter.AccountUtils import dagger.hilt.android.testing.HiltAndroidRule diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt index bda06c6dc..0b255d139 100644 --- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt +++ b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/AccountUtilsTest.kt @@ -8,7 +8,7 @@ import android.accounts.Account import android.accounts.AccountManager import android.os.Bundle import androidx.test.platform.app.InstrumentationRegistry -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.settings.SettingsManager import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltAndroidTest diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt index a4a7f03b1..ef40e7e40 100644 --- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt +++ b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncAdapterTest.kt @@ -11,7 +11,7 @@ import android.content.SyncResult import android.os.Bundle import androidx.test.platform.app.InstrumentationRegistry import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.settings.SettingsManager import dagger.hilt.android.testing.HiltAndroidRule diff --git a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt index b494110cd..c9026a2d3 100644 --- a/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt +++ b/app/src/androidTestStandard/java/at/bitfire/davdroid/syncadapter/SyncManagerTest.kt @@ -15,7 +15,7 @@ import at.bitfire.dav4jvm.Response import at.bitfire.dav4jvm.Response.HrefRelation import at.bitfire.dav4jvm.property.GetETag import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.Credentials import at.bitfire.davdroid.db.SyncState import at.bitfire.davdroid.settings.AccountSettings diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 99f49fac6..4fe1888dd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - diff --git a/app/src/main/java/at/bitfire/davdroid/App.kt b/app/src/main/java/at/bitfire/davdroid/App.kt index c6aa1d245..569efeb51 100644 --- a/app/src/main/java/at/bitfire/davdroid/App.kt +++ b/app/src/main/java/at/bitfire/davdroid/App.kt @@ -18,6 +18,8 @@ import at.bitfire.davdroid.ui.DebugInfoActivity import at.bitfire.davdroid.ui.NotificationUtils import at.bitfire.davdroid.ui.UiUtils import dagger.hilt.android.HiltAndroidApp +import foundation.e.accountmanager.BuildConfig +import foundation.e.accountmanager.R import java.util.logging.Level import javax.inject.Inject import kotlin.concurrent.thread diff --git a/app/src/main/java/at/bitfire/davdroid/DavService.kt b/app/src/main/java/at/bitfire/davdroid/DavService.kt index eefa5c484..beecb5687 100644 --- a/app/src/main/java/at/bitfire/davdroid/DavService.kt +++ b/app/src/main/java/at/bitfire/davdroid/DavService.kt @@ -29,6 +29,7 @@ import at.bitfire.davdroid.settings.SettingsManager import at.bitfire.davdroid.ui.DebugInfoActivity import at.bitfire.davdroid.ui.NotificationUtils import dagger.hilt.android.AndroidEntryPoint +import foundation.e.accountmanager.R import okhttp3.HttpUrl import okhttp3.OkHttpClient import java.lang.ref.WeakReference diff --git a/app/src/main/java/at/bitfire/davdroid/DavUtils.kt b/app/src/main/java/at/bitfire/davdroid/DavUtils.kt index db9a195bc..4a265fe88 100644 --- a/app/src/main/java/at/bitfire/davdroid/DavUtils.kt +++ b/app/src/main/java/at/bitfire/davdroid/DavUtils.kt @@ -22,7 +22,7 @@ import okhttp3.MediaType.Companion.toMediaType import org.xbill.DNS.* import java.net.InetAddress import java.util.* - +import foundation.e.accountmanager.R /** * Some WebDAV and related network utility methods */ diff --git a/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt b/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt index b7460e95d..25b6be2d8 100644 --- a/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt +++ b/app/src/main/java/at/bitfire/davdroid/ForegroundService.kt @@ -20,6 +20,8 @@ import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors import dagger.hilt.components.SingletonComponent +import foundation.e.accountmanager.BuildConfig +import foundation.e.accountmanager.R class ForegroundService : Service() { diff --git a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt index 9e1863bce..1ebf22334 100644 --- a/app/src/main/java/at/bitfire/davdroid/HttpClient.kt +++ b/app/src/main/java/at/bitfire/davdroid/HttpClient.kt @@ -19,6 +19,7 @@ import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors import dagger.hilt.components.SingletonComponent +import foundation.e.accountmanager.BuildConfig import okhttp3.* import okhttp3.brotli.BrotliInterceptor import okhttp3.internal.tls.OkHostnameVerifier diff --git a/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt b/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt index 44529956d..ce11b15ef 100644 --- a/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt +++ b/app/src/main/java/at/bitfire/davdroid/PermissionUtils.kt @@ -19,6 +19,8 @@ import androidx.core.location.LocationManagerCompat import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.ui.NotificationUtils import at.bitfire.davdroid.ui.PermissionsActivity +import foundation.e.accountmanager.BuildConfig +import foundation.e.accountmanager.R object PermissionUtils { diff --git a/app/src/main/java/at/bitfire/davdroid/StorageLowReceiver.kt b/app/src/main/java/at/bitfire/davdroid/StorageLowReceiver.kt index e6b34d662..832d8f2ea 100644 --- a/app/src/main/java/at/bitfire/davdroid/StorageLowReceiver.kt +++ b/app/src/main/java/at/bitfire/davdroid/StorageLowReceiver.kt @@ -21,6 +21,7 @@ import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import javax.inject.Singleton +import foundation.e.accountmanager.R class StorageLowReceiver private constructor( val context: Context diff --git a/app/src/main/java/at/bitfire/davdroid/db/AppDatabase.kt b/app/src/main/java/at/bitfire/davdroid/db/AppDatabase.kt index 2ed99e26f..8f204dc5b 100644 --- a/app/src/main/java/at/bitfire/davdroid/db/AppDatabase.kt +++ b/app/src/main/java/at/bitfire/davdroid/db/AppDatabase.kt @@ -15,7 +15,7 @@ import androidx.core.database.getStringOrNull import androidx.room.* import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.TextTable import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.ui.AccountsActivity diff --git a/app/src/main/java/at/bitfire/davdroid/log/Logger.kt b/app/src/main/java/at/bitfire/davdroid/log/Logger.kt index 444eae921..8b2a647e1 100644 --- a/app/src/main/java/at/bitfire/davdroid/log/Logger.kt +++ b/app/src/main/java/at/bitfire/davdroid/log/Logger.kt @@ -14,11 +14,12 @@ import android.widget.Toast import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import androidx.preference.PreferenceManager -import at.bitfire.davdroid.BuildConfig -import at.bitfire.davdroid.R + +import foundation.e.accountmanager.R import at.bitfire.davdroid.ui.AppSettingsActivity import at.bitfire.davdroid.ui.DebugInfoActivity import at.bitfire.davdroid.ui.NotificationUtils +import foundation.e.accountmanager.BuildConfig import java.io.File import java.io.IOException import java.util.* diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt index dfeb7e727..ce61559b1 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt +++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt @@ -15,7 +15,7 @@ import android.provider.ContactsContract.Groups import android.provider.ContactsContract.RawContacts import android.util.Base64 import at.bitfire.davdroid.DavUtils -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.db.SyncState import at.bitfire.davdroid.log.Logger diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt index a1c6afc20..4588c4484 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt +++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalContact.kt @@ -10,11 +10,12 @@ import android.os.RemoteException import android.provider.ContactsContract import android.provider.ContactsContract.CommonDataKinds.GroupMembership import android.provider.ContactsContract.RawContacts.Data -import at.bitfire.davdroid.BuildConfig + import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.resource.contactrow.* import at.bitfire.vcard4android.* import ezvcard.Ezvcard +import foundation.e.accountmanager.BuildConfig import org.apache.commons.lang3.StringUtils import java.io.FileNotFoundException import java.util.* diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt b/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt index e5a64e026..38bc04ea2 100644 --- a/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt +++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalEvent.kt @@ -10,7 +10,7 @@ import android.content.ContentUris import android.content.ContentValues import android.provider.CalendarContract import android.provider.CalendarContract.Events -import at.bitfire.davdroid.BuildConfig +import foundation.e.accountmanager.BuildConfig import at.bitfire.ical4android.* import at.bitfire.ical4android.MiscUtils.UriHelper.asSyncAdapter import net.fortuna.ical4j.model.property.ProdId diff --git a/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt b/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt index 8d414c121..f616d0cea 100644 --- a/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt +++ b/app/src/main/java/at/bitfire/davdroid/settings/AccountSettings.kt @@ -22,7 +22,7 @@ import androidx.annotation.WorkerThread import androidx.core.content.ContextCompat import androidx.preference.PreferenceManager import at.bitfire.davdroid.InvalidAccountException -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.closeCompat import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Collection diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountsUpdatedListener.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountsUpdatedListener.kt index 68804cb70..039c93bbd 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountsUpdatedListener.kt +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountsUpdatedListener.kt @@ -9,7 +9,7 @@ import android.accounts.AccountManager import android.accounts.OnAccountsUpdateListener import android.content.Context import androidx.annotation.AnyThread -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.resource.LocalAddressBook diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt index c38400551..97b87abd9 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarSyncManager.kt @@ -15,7 +15,7 @@ import at.bitfire.dav4jvm.exception.DavException import at.bitfire.dav4jvm.property.* import at.bitfire.davdroid.DavUtils import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.SyncState import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.resource.LocalCalendar diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt index 2401a0a0d..394af0862 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncManager.kt @@ -19,7 +19,7 @@ import at.bitfire.dav4jvm.property.* import at.bitfire.davdroid.DavUtils import at.bitfire.davdroid.DavUtils.sameTypeAs import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.SyncState import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.resource.* diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt index 5ecdc496a..85898624a 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/JtxSyncManager.kt @@ -15,7 +15,7 @@ import at.bitfire.dav4jvm.exception.DavException import at.bitfire.dav4jvm.property.* import at.bitfire.davdroid.DavUtils import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.SyncState import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.resource.LocalJtxCollection 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 443f75ba7..adbc45f30 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt @@ -42,6 +42,7 @@ import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors import dagger.hilt.components.SingletonComponent +import foundation.e.accountmanager.R import kotlinx.coroutines.* import okhttp3.HttpUrl import okhttp3.RequestBody diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncUtils.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncUtils.kt index a808dd905..a327bb79e 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncUtils.kt +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncUtils.kt @@ -19,7 +19,7 @@ import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat import at.bitfire.davdroid.InvalidAccountException import at.bitfire.davdroid.PermissionUtils -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Service import at.bitfire.davdroid.log.Logger diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt index d1dbc363e..169966f02 100644 --- a/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt +++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncManager.kt @@ -15,7 +15,7 @@ import at.bitfire.dav4jvm.exception.DavException import at.bitfire.dav4jvm.property.* import at.bitfire.davdroid.DavUtils import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.SyncState import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.resource.LocalResource diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt index 036a648cd..c1497658f 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt @@ -26,12 +26,8 @@ import androidx.lifecycle.viewModelScope import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import at.bitfire.davdroid.App -import at.bitfire.davdroid.BuildConfig -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.AboutBinding -import at.bitfire.davdroid.databinding.AboutLanguagesBinding -import at.bitfire.davdroid.databinding.AboutTranslationBinding -import at.bitfire.davdroid.databinding.ActivityAboutBinding +import foundation.e.accountmanager.BuildConfig +import foundation.e.accountmanager.R import com.mikepenz.aboutlibraries.Libs import com.mikepenz.aboutlibraries.LibsBuilder import dagger.BindsOptionalOf @@ -39,6 +35,10 @@ import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.components.ActivityComponent +import foundation.e.accountmanager.databinding.AboutBinding +import foundation.e.accountmanager.databinding.AboutLanguagesBinding +import foundation.e.accountmanager.databinding.AboutTranslationBinding +import foundation.e.accountmanager.databinding.ActivityAboutBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.apache.commons.io.IOUtils diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt index a1fe1f1ae..291c00e97 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.kt @@ -29,12 +29,12 @@ import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import at.bitfire.davdroid.DavUtils import at.bitfire.davdroid.DavUtils.SyncStatus -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.StorageLowReceiver -import at.bitfire.davdroid.databinding.AccountListBinding -import at.bitfire.davdroid.databinding.AccountListItemBinding import at.bitfire.davdroid.ui.account.AccountActivity import dagger.hilt.android.AndroidEntryPoint +import foundation.e.accountmanager.databinding.AccountListBinding +import foundation.e.accountmanager.databinding.AccountListItemBinding import java.text.Collator import javax.inject.Inject diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt index a38d1d0ad..6012b4c9c 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt @@ -23,8 +23,8 @@ import androidx.core.view.GravityCompat import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import at.bitfire.davdroid.DavUtils -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityAccountsBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.ui.intro.IntroActivity import at.bitfire.davdroid.ui.setup.LoginActivity import com.google.android.material.navigation.NavigationView @@ -32,6 +32,7 @@ import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.ActivityAccountsBinding import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt index 78cdb1dda..e3aa6497f 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/AppSettingsActivity.kt @@ -17,9 +17,9 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.preference.* import at.bitfire.cert4android.CustomCertManager -import at.bitfire.davdroid.BuildConfig +import foundation.e.accountmanager.BuildConfig import at.bitfire.davdroid.ForegroundService -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.resource.TaskUtils import at.bitfire.davdroid.settings.Settings import at.bitfire.davdroid.settings.SettingsManager diff --git a/app/src/main/java/at/bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt b/app/src/main/java/at/bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt index fb8bb50f4..e11b5ead9 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/BaseAccountsDrawerHandler.kt @@ -12,8 +12,8 @@ import android.view.Menu import android.view.MenuItem import android.widget.Toast import androidx.annotation.CallSuper -import at.bitfire.davdroid.BuildConfig -import at.bitfire.davdroid.R +import foundation.e.accountmanager.BuildConfig +import foundation.e.accountmanager.R /** * Default menu items control diff --git a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt index 8573047d7..99ceb43c7 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt @@ -33,11 +33,11 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import at.bitfire.dav4jvm.exception.DavException import at.bitfire.dav4jvm.exception.HttpException -import at.bitfire.davdroid.BuildConfig +import foundation.e.accountmanager.BuildConfig import at.bitfire.davdroid.InvalidAccountException -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.TextTable -import at.bitfire.davdroid.databinding.ActivityDebugInfoBinding + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.resource.LocalAddressBook @@ -49,6 +49,7 @@ import at.techbee.jtx.JtxContract import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.ActivityDebugInfoBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt index 05df1bcf3..1f70d8d2f 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/ExceptionInfoFragment.kt @@ -9,7 +9,7 @@ import android.app.Dialog import android.os.Bundle import androidx.fragment.app.DialogFragment import at.bitfire.dav4jvm.exception.HttpException -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import com.google.android.material.dialog.MaterialAlertDialogBuilder import java.io.IOException diff --git a/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt b/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt index b8f50ca73..2e25e3f9b 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/HomeSetAdapter.kt @@ -14,7 +14,7 @@ import android.widget.ArrayAdapter import android.widget.Filter import android.widget.TextView import at.bitfire.davdroid.DavUtils -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.HomeSet class HomeSetAdapter( diff --git a/app/src/main/java/at/bitfire/davdroid/ui/NotificationUtils.kt b/app/src/main/java/at/bitfire/davdroid/ui/NotificationUtils.kt index 407f59a41..1b2474339 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/NotificationUtils.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/NotificationUtils.kt @@ -14,7 +14,7 @@ import androidx.core.app.NotificationCompat import androidx.core.content.getSystemService import androidx.core.content.res.ResourcesCompat import at.bitfire.davdroid.App -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R object NotificationUtils { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/OseAccountsDrawerHandler.kt b/app/src/main/java/at/bitfire/davdroid/ui/OseAccountsDrawerHandler.kt index dd15c7bfc..c93c3de14 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/OseAccountsDrawerHandler.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/OseAccountsDrawerHandler.kt @@ -9,7 +9,7 @@ import android.content.Intent import android.net.Uri import android.view.MenuItem import at.bitfire.davdroid.App -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.ui.webdav.WebdavMountsActivity import javax.inject.Inject diff --git a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt index 9a914b7ec..2a74ee9fc 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/PermissionsFragment.kt @@ -19,16 +19,17 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import at.bitfire.davdroid.BuildConfig +import foundation.e.accountmanager.BuildConfig import at.bitfire.davdroid.PackageChangedReceiver import at.bitfire.davdroid.PermissionUtils import at.bitfire.davdroid.PermissionUtils.CALENDAR_PERMISSIONS import at.bitfire.davdroid.PermissionUtils.CONTACT_PERMISSIONS import at.bitfire.davdroid.PermissionUtils.havePermissions -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityPermissionsBinding +import foundation.e.accountmanager.R + import at.bitfire.ical4android.TaskProvider import at.bitfire.ical4android.TaskProvider.ProviderName +import foundation.e.accountmanager.databinding.ActivityPermissionsBinding class PermissionsFragment: Fragment() { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/TasksFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/TasksFragment.kt index 110152ea7..57d58c46a 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/TasksFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/TasksFragment.kt @@ -19,8 +19,8 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import at.bitfire.davdroid.PackageChangedReceiver -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityTasksBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.resource.TaskUtils import at.bitfire.davdroid.settings.SettingsManager import at.bitfire.ical4android.TaskProvider.ProviderName @@ -28,6 +28,7 @@ import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.ActivityTasksBinding import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt b/app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt index 169520302..695d2d29c 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/UiUtils.kt @@ -15,7 +15,7 @@ import android.os.Build import android.widget.Toast import androidx.appcompat.app.AppCompatDelegate import androidx.core.content.getSystemService -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.settings.Settings import at.bitfire.davdroid.settings.SettingsManager diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt index 607f25afd..fd4d08c95 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt @@ -21,8 +21,8 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentStatePagerAdapter import androidx.lifecycle.* import at.bitfire.davdroid.DavUtils -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityAccountBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.db.Service @@ -35,6 +35,7 @@ import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.ActivityAccountBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt index 4a8e2da8b..786e6f005 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/AddressBooksFragment.kt @@ -8,9 +8,10 @@ import android.content.Intent import android.view.* import androidx.fragment.app.FragmentManager import at.bitfire.davdroid.PermissionUtils -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.AccountCarddavItemBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.db.Collection +import foundation.e.accountmanager.databinding.AccountCarddavItemBinding class AddressBooksFragment: CollectionsFragment() { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt index a74d53a48..28659840e 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CalendarsFragment.kt @@ -9,10 +9,11 @@ import android.view.* import androidx.fragment.app.FragmentManager import at.bitfire.davdroid.Constants import at.bitfire.davdroid.PermissionUtils -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.AccountCaldavItemBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.resource.TaskUtils +import foundation.e.accountmanager.databinding.AccountCaldavItemBinding class CalendarsFragment: CollectionsFragment() { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt index cecdf8f34..bab8d954d 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionInfoFragment.kt @@ -12,12 +12,13 @@ import androidx.fragment.app.DialogFragment import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import at.bitfire.davdroid.databinding.CollectionPropertiesBinding + import at.bitfire.davdroid.db.AppDatabase import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.hilt.android.AndroidEntryPoint +import foundation.e.accountmanager.databinding.CollectionPropertiesBinding import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt index f4e197b46..7edd76774 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CollectionsFragment.kt @@ -25,8 +25,8 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import androidx.viewbinding.ViewBinding import at.bitfire.davdroid.Constants import at.bitfire.davdroid.DavService -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.AccountCollectionsBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.resource.LocalAddressBook @@ -37,6 +37,7 @@ import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.AccountCollectionsBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.map diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt index 7611dfff1..367530300 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateAddressBookActivity.kt @@ -18,8 +18,8 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityCreateAddressBookBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.db.HomeSet @@ -29,6 +29,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.hilt.android.AndroidEntryPoint +import foundation.e.accountmanager.databinding.ActivityCreateAddressBookBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.apache.commons.lang3.StringUtils diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt index 830368e85..61a6d1cdb 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCalendarActivity.kt @@ -21,8 +21,8 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewModelScope import at.bitfire.davdroid.Constants -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityCreateCalendarBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.db.HomeSet @@ -35,6 +35,7 @@ import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.hilt.android.AndroidEntryPoint +import foundation.e.accountmanager.databinding.ActivityCreateCalendarBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import net.fortuna.ical4j.model.Calendar diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCollectionFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCollectionFragment.kt index 0414e0c61..5c149577e 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCollectionFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/CreateCollectionFragment.kt @@ -18,7 +18,7 @@ import at.bitfire.dav4jvm.XmlUtils import at.bitfire.davdroid.DavService import at.bitfire.davdroid.DavUtils import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.log.Logger diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/DeleteCollectionFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/DeleteCollectionFragment.kt index cfcec86c5..ed7d3f784 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/DeleteCollectionFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/DeleteCollectionFragment.kt @@ -15,7 +15,7 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.* import at.bitfire.dav4jvm.DavResource import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.databinding.DeleteCollectionBinding + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.settings.AccountSettings @@ -25,6 +25,7 @@ import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.DeleteCollectionBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/RenameAccountFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/RenameAccountFragment.kt index ca8c39859..a11ce4434 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/RenameAccountFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/RenameAccountFragment.kt @@ -29,7 +29,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import at.bitfire.davdroid.DavUtils import at.bitfire.davdroid.InvalidAccountException -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.closeCompat import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.log.Logger diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt index b4a58e02f..ed2fe490e 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/SettingsActivity.kt @@ -28,7 +28,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.preference.* import at.bitfire.davdroid.InvalidAccountException import at.bitfire.davdroid.PermissionUtils -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.Credentials import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.resource.TaskUtils diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/WebcalFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/WebcalFragment.kt index b89bc0ca3..ae5c64f47 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/WebcalFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/WebcalFragment.kt @@ -23,9 +23,9 @@ import androidx.room.Transaction import at.bitfire.dav4jvm.UrlUtils import at.bitfire.davdroid.Constants import at.bitfire.davdroid.PermissionUtils -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.closeCompat -import at.bitfire.davdroid.databinding.AccountCaldavItemBinding + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Collection import at.bitfire.davdroid.log.Logger @@ -35,6 +35,7 @@ import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.AccountCaldavItemBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import okhttp3.HttpUrl diff --git a/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt index 679ce8fb3..0c29d9688 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt @@ -27,9 +27,10 @@ import androidx.core.text.HtmlCompat import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import at.bitfire.davdroid.PermissionUtils -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityWifiPermissionsBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.log.Logger +import foundation.e.accountmanager.databinding.ActivityWifiPermissionsBinding class WifiPermissionsActivity: AppCompatActivity() { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt index c578b2c6f..1360d989c 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/BatteryOptimizationsFragment.kt @@ -21,9 +21,9 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import at.bitfire.davdroid.App -import at.bitfire.davdroid.BuildConfig -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.IntroBatteryOptimizationsBinding +import foundation.e.accountmanager.BuildConfig +import foundation.e.accountmanager.R + import at.bitfire.davdroid.settings.SettingsManager import at.bitfire.davdroid.ui.UiUtils import at.bitfire.davdroid.ui.intro.BatteryOptimizationsFragment.Model.Companion.HINT_AUTOSTART_PERMISSION @@ -36,6 +36,7 @@ import dagger.hilt.android.components.ActivityComponent import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import dagger.multibindings.IntoSet +import foundation.e.accountmanager.databinding.IntroBatteryOptimizationsBinding import org.apache.commons.text.WordUtils import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt index bb259812c..bc9a910ae 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt @@ -8,7 +8,7 @@ import android.app.Activity import android.os.Bundle import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.Fragment -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.log.Logger import com.github.appintro.AppIntro2 import dagger.hilt.EntryPoint diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/OpenSourceFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/OpenSourceFragment.kt index 30f01de01..d04e96119 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/intro/OpenSourceFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/OpenSourceFragment.kt @@ -14,14 +14,15 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModel import at.bitfire.davdroid.App -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.IntroOpenSourceBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.settings.SettingsManager import at.bitfire.davdroid.ui.UiUtils import at.bitfire.davdroid.ui.intro.OpenSourceFragment.Model.Companion.SETTING_NEXT_DONATION_POPUP import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.IntroOpenSourceBinding import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/PermissionsIntroFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/PermissionsIntroFragment.kt index a3ec5d2fa..85b0f1b35 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/intro/PermissionsIntroFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/PermissionsIntroFragment.kt @@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment import at.bitfire.davdroid.PermissionUtils import at.bitfire.davdroid.PermissionUtils.CALENDAR_PERMISSIONS import at.bitfire.davdroid.PermissionUtils.CONTACT_PERMISSIONS -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.ical4android.TaskProvider import dagger.Binds import dagger.Module diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt index c61697fb9..ae659ea1b 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/TasksIntroFragment.kt @@ -12,8 +12,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import at.bitfire.davdroid.App -import at.bitfire.davdroid.BuildConfig -import at.bitfire.davdroid.R +import foundation.e.accountmanager.BuildConfig +import foundation.e.accountmanager.R import at.bitfire.davdroid.resource.TaskUtils import at.bitfire.davdroid.settings.SettingsManager import at.bitfire.davdroid.ui.TasksFragment diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt index 6203fe8ac..3527fd531 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt @@ -10,14 +10,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import at.bitfire.davdroid.App -import at.bitfire.davdroid.BuildConfig -import at.bitfire.davdroid.databinding.IntroWelcomeBinding import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.android.components.ActivityComponent import dagger.multibindings.IntoSet +import foundation.e.accountmanager.databinding.IntroWelcomeBinding import javax.inject.Inject class WelcomeFragment: Fragment() { diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt index 074aabd3d..614ab209f 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt @@ -22,8 +22,8 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.* import at.bitfire.davdroid.DavService import at.bitfire.davdroid.InvalidAccountException -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.LoginAccountDetailsBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Credentials import at.bitfire.davdroid.db.HomeSet @@ -40,6 +40,7 @@ import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.LoginAccountDetailsBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt index 445079025..b182fce70 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsFragment.kt @@ -16,8 +16,8 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.LoginCredentialsFragmentBinding +import foundation.e.accountmanager.R + import at.bitfire.davdroid.db.Credentials import com.google.android.material.snackbar.Snackbar import dagger.Binds @@ -26,6 +26,7 @@ import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import dagger.multibindings.IntKey import dagger.multibindings.IntoMap +import foundation.e.accountmanager.databinding.LoginCredentialsFragmentBinding import java.net.URI import java.net.URISyntaxException import javax.inject.Inject diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsModel.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsModel.kt index 633310e9b..27dd2683a 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsModel.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DefaultLoginCredentialsModel.kt @@ -17,7 +17,7 @@ import android.widget.RadioGroup import androidx.annotation.MainThread import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import java.io.InputStreamReader import java.util.regex.Pattern diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt index 48afdcfe5..e10e3d8b1 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt @@ -17,7 +17,7 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.ui.DebugInfoActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt index 801f82729..62a92913a 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt @@ -11,7 +11,7 @@ import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment import at.bitfire.davdroid.App -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.ui.UiUtils import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt b/app/src/main/java/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt index 561d0d228..3c7295d73 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/setup/NextcloudLoginFlowFragment.kt @@ -25,7 +25,7 @@ import androidx.lifecycle.MutableLiveData import at.bitfire.dav4jvm.exception.DavException import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.Credentials import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.ui.DebugInfoActivity diff --git a/app/src/main/java/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivity.kt index d90fc6397..220785df9 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivity.kt @@ -19,8 +19,8 @@ import at.bitfire.dav4jvm.DavResource import at.bitfire.dav4jvm.UrlUtils import at.bitfire.davdroid.App import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityAddWebdavMountBinding + + import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.Credentials import at.bitfire.davdroid.db.WebDavMount @@ -32,6 +32,8 @@ import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.R +import foundation.e.accountmanager.databinding.ActivityAddWebdavMountBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import okhttp3.HttpUrl diff --git a/app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt index 149d76b94..aafe01d2e 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt @@ -20,9 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import at.bitfire.davdroid.App -import at.bitfire.davdroid.R -import at.bitfire.davdroid.databinding.ActivityWebdavMountsBinding -import at.bitfire.davdroid.databinding.WebdavMountsItemBinding +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.WebDavDocument import at.bitfire.davdroid.db.WebDavMount @@ -32,6 +30,8 @@ import at.bitfire.davdroid.webdav.DavDocumentsProvider import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext +import foundation.e.accountmanager.databinding.ActivityWebdavMountsBinding +import foundation.e.accountmanager.databinding.WebdavMountsItemBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.apache.commons.io.FileUtils diff --git a/app/src/main/java/at/bitfire/davdroid/ui/widget/CropImageView.kt b/app/src/main/java/at/bitfire/davdroid/ui/widget/CropImageView.kt index 29e843183..be7ad9afc 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/widget/CropImageView.kt +++ b/app/src/main/java/at/bitfire/davdroid/ui/widget/CropImageView.kt @@ -10,7 +10,7 @@ import android.graphics.RectF import android.util.AttributeSet import androidx.annotation.AttrRes import androidx.appcompat.widget.AppCompatImageView -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R /** * [android.widget.ImageView] that supports directional cropping in both vertical and diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavDocumentsProvider.kt b/app/src/main/java/at/bitfire/davdroid/webdav/DavDocumentsProvider.kt index 87b148239..0a2f9380c 100644 --- a/app/src/main/java/at/bitfire/davdroid/webdav/DavDocumentsProvider.kt +++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavDocumentsProvider.kt @@ -34,7 +34,7 @@ import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.dav4jvm.property.* import at.bitfire.davdroid.HttpClient import at.bitfire.davdroid.MemoryCookieStore -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.db.AppDatabase import at.bitfire.davdroid.db.DaoTools import at.bitfire.davdroid.db.WebDavDocument diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessCallback.kt b/app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessCallback.kt index e0406f795..9f625dd40 100644 --- a/app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessCallback.kt +++ b/app/src/main/java/at/bitfire/davdroid/webdav/RandomAccessCallback.kt @@ -25,6 +25,7 @@ import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.ui.NotificationUtils import at.bitfire.davdroid.webdav.cache.MemoryCache import at.bitfire.davdroid.webdav.cache.SegmentedCache +import foundation.e.accountmanager.R import okhttp3.Headers import okhttp3.HttpUrl import okhttp3.MediaType diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt b/app/src/main/java/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt index 4c91972ee..c2b47d6fa 100644 --- a/app/src/main/java/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt +++ b/app/src/main/java/at/bitfire/davdroid/webdav/StreamingFileDescriptor.kt @@ -14,7 +14,7 @@ import at.bitfire.dav4jvm.DavResource import at.bitfire.dav4jvm.exception.HttpException import at.bitfire.davdroid.DavUtils import at.bitfire.davdroid.HttpClient -import at.bitfire.davdroid.R +import foundation.e.accountmanager.R import at.bitfire.davdroid.log.Logger import at.bitfire.davdroid.ui.NotificationUtils import okhttp3.HttpUrl -- GitLab From 5249f096b252a85a656ba676b451a88539269eb0 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 29 Jul 2022 13:01:21 +0530 Subject: [PATCH 2/2] update classes link for resolved app crash issue --- app/src/main/AndroidManifest.xml | 84 ++++++++++++++++---------------- cert4android | 2 +- ical4android | 2 +- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4fe1888dd..cdae79e68 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -40,7 +40,7 @@ - - + + - + @@ -66,15 +66,15 @@ + android:parentActivityName="at.bitfire.davdroid.ui.AccountsActivity"/> @@ -82,8 +82,8 @@ @@ -92,18 +92,18 @@ + android:parentActivityName="at.bitfire.davdroid.ui.AppSettingsActivity" /> + android:parentActivityName="at.bitfire.davdroid.ui.AppSettingsActivity" /> @@ -121,38 +121,38 @@ + android:parentActivityName="at.bitfire.davdroid.ui.account.AccountActivity" /> + android:parentActivityName="at.bitfire.davdroid.ui.account.AccountActivity" /> + android:name="at.bitfire.davdroid.ui.account.SettingsActivity" + android:parentActivityName="at.bitfire.davdroid.ui.account.AccountActivity" /> + android:parentActivityName="at.bitfire.davdroid.ui.account.SettingsActivity" /> + android:parentActivityName="at.bitfire.davdroid.ui.webdav.WebdavMountsActivity" /> @@ -162,7 +162,7 @@ android:resource="@xml/account_authenticator"/> @@ -173,7 +173,7 @@ android:resource="@xml/sync_calendars"/> @@ -184,7 +184,7 @@ android:resource="@xml/sync_notes"/> @@ -195,7 +195,7 @@ android:resource="@xml/sync_opentasks"/> @@ -207,7 +207,7 @@ @@ -218,7 +218,7 @@ @@ -232,9 +232,9 @@ android:authorities="@string/address_books_authority" android:exported="false" android:label="@string/address_books_authority_title" - android:name=".syncadapter.AddressBookProvider" /> + android:name="at.bitfire.davdroid.syncadapter.AddressBookProvider" /> @@ -246,7 +246,7 @@ android:resource="@xml/sync_address_books"/> @@ -262,7 +262,7 @@ diff --git a/cert4android b/cert4android index 7ae958dbe..7814052ea 160000 --- a/cert4android +++ b/cert4android @@ -1 +1 @@ -Subproject commit 7ae958dbedacf81b48e29c07b0f5073e181a843b +Subproject commit 7814052eaf3072ad2c8ed29606cc9f18c3b7921d diff --git a/ical4android b/ical4android index 6dfe520be..41171b57f 160000 --- a/ical4android +++ b/ical4android @@ -1 +1 @@ -Subproject commit 6dfe520be1795f71db2a36aa6864953d68599e72 +Subproject commit 41171b57fdc5f045b17d09df85853a6cc13ef4fd -- GitLab