From 42f89868f245ea14b39f902eb8412e11b0fc483b Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 26 Apr 2022 19:14:29 +0530 Subject: [PATCH 1/9] test to finding text --- .../foundation/e/accountmanager/resource/LocalAddressBook.kt | 2 +- .../syncadapter/EeloAccountAuthenticatorService.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt b/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt index 5abbce9b8..3c0711e07 100644 --- a/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt +++ b/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt @@ -99,7 +99,7 @@ class LocalAddressBook( baos.write(info.url.hashCode()) val hash = Base64.encodeToString(baos.toByteArray(), Base64.NO_WRAP or Base64.NO_PADDING) - val sb = StringBuilder(info.displayName.let { + val sb = StringBuilder("Test :2: "+info.displayName.let { if (it.isNullOrEmpty()) DavUtils.lastSegmentOfUrl(info.url) else diff --git a/app/src/main/java/foundation/e/accountmanager/syncadapter/EeloAccountAuthenticatorService.kt b/app/src/main/java/foundation/e/accountmanager/syncadapter/EeloAccountAuthenticatorService.kt index a90e7db49..a1c4ce46c 100644 --- a/app/src/main/java/foundation/e/accountmanager/syncadapter/EeloAccountAuthenticatorService.kt +++ b/app/src/main/java/foundation/e/accountmanager/syncadapter/EeloAccountAuthenticatorService.kt @@ -105,7 +105,7 @@ class EeloAccountAuthenticatorService : Service(), OnAccountsUpdateListener { for (removedAccount in eeloAccounts) { val intent = Intent("drive.services.ResetService") intent.setPackage(getString(R.string.e_drive_package_name)) - intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, removedAccount.name) + intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, "Test :1: "+removedAccount.name) intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, removedAccount.type) startService(intent) } -- GitLab From c026e1b6f1ec907f95b1aa3f820b598b05d587c2 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 27 Apr 2022 07:15:37 +0530 Subject: [PATCH 2/9] revert- test to finding text --- .../foundation/e/accountmanager/resource/LocalAddressBook.kt | 2 +- .../syncadapter/EeloAccountAuthenticatorService.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt b/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt index 3c0711e07..5abbce9b8 100644 --- a/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt +++ b/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt @@ -99,7 +99,7 @@ class LocalAddressBook( baos.write(info.url.hashCode()) val hash = Base64.encodeToString(baos.toByteArray(), Base64.NO_WRAP or Base64.NO_PADDING) - val sb = StringBuilder("Test :2: "+info.displayName.let { + val sb = StringBuilder(info.displayName.let { if (it.isNullOrEmpty()) DavUtils.lastSegmentOfUrl(info.url) else diff --git a/app/src/main/java/foundation/e/accountmanager/syncadapter/EeloAccountAuthenticatorService.kt b/app/src/main/java/foundation/e/accountmanager/syncadapter/EeloAccountAuthenticatorService.kt index a1c4ce46c..a90e7db49 100644 --- a/app/src/main/java/foundation/e/accountmanager/syncadapter/EeloAccountAuthenticatorService.kt +++ b/app/src/main/java/foundation/e/accountmanager/syncadapter/EeloAccountAuthenticatorService.kt @@ -105,7 +105,7 @@ class EeloAccountAuthenticatorService : Service(), OnAccountsUpdateListener { for (removedAccount in eeloAccounts) { val intent = Intent("drive.services.ResetService") intent.setPackage(getString(R.string.e_drive_package_name)) - intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, "Test :1: "+removedAccount.name) + intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, removedAccount.name) intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, removedAccount.type) startService(intent) } -- GitLab From b2f5cfb673c92e68ff97815a05e306dd6633d36f Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 27 Apr 2022 07:52:45 +0530 Subject: [PATCH 3/9] test to finding text 2 --- app/src/main/java/foundation/e/accountmanager/DavService.kt | 2 +- .../main/java/foundation/e/accountmanager/model/Collection.kt | 2 +- .../foundation/e/accountmanager/resource/LocalAddressBook.kt | 2 +- .../main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/foundation/e/accountmanager/DavService.kt b/app/src/main/java/foundation/e/accountmanager/DavService.kt index a1c94980b..91b3bce1e 100644 --- a/app/src/main/java/foundation/e/accountmanager/DavService.kt +++ b/app/src/main/java/foundation/e/accountmanager/DavService.kt @@ -51,7 +51,7 @@ class DavService: android.app.Service() { val DAV_COLLECTION_PROPERTIES = arrayOf( ResourceType.NAME, CurrentUserPrivilegeSet.NAME, - DisplayName.NAME, + "Test 4 ::"+DisplayName.NAME, AddressbookDescription.NAME, SupportedAddressData.NAME, CalendarDescription.NAME, CalendarColor.NAME, SupportedCalendarComponentSet.NAME, Source.NAME diff --git a/app/src/main/java/foundation/e/accountmanager/model/Collection.kt b/app/src/main/java/foundation/e/accountmanager/model/Collection.kt index ede34873c..8bc4f3fc5 100644 --- a/app/src/main/java/foundation/e/accountmanager/model/Collection.kt +++ b/app/src/main/java/foundation/e/accountmanager/model/Collection.kt @@ -86,7 +86,7 @@ data class Collection( var displayName: String? = null dav[DisplayName::class.java]?.let { if (!it.displayName.isNullOrEmpty()) - displayName = it.displayName + displayName = "Test 5 :: "+it.displayName } var description: String? = null diff --git a/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt b/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt index 5abbce9b8..3c0711e07 100644 --- a/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt +++ b/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt @@ -99,7 +99,7 @@ class LocalAddressBook( baos.write(info.url.hashCode()) val hash = Base64.encodeToString(baos.toByteArray(), Base64.NO_WRAP or Base64.NO_PADDING) - val sb = StringBuilder(info.displayName.let { + val sb = StringBuilder("Test :2: "+info.displayName.let { if (it.isNullOrEmpty()) DavUtils.lastSegmentOfUrl(info.url) else diff --git a/app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt b/app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt index aedf65232..6cbc2492f 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt @@ -20,7 +20,7 @@ class HomeSetAdapter( val v: View if (!data.displayName.isNullOrBlank()) { v = convertView ?: LayoutInflater.from(context).inflate(R.layout.custom_simple_list_item_2, null, false) - v.findViewById(android.R.id.text1).text = data.displayName + v.findViewById(android.R.id.text1).text = "Test 3 :: "+data.displayName v.findViewById(android.R.id.text2).apply { text = data.url.toString() setSingleLine() -- GitLab From 5d7872dbadc3ccd7b029bf1ea0bcf4dce4de2d2c Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 27 Apr 2022 08:02:51 +0530 Subject: [PATCH 4/9] test to finding text 2: fix build --- app/src/main/java/foundation/e/accountmanager/DavService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/foundation/e/accountmanager/DavService.kt b/app/src/main/java/foundation/e/accountmanager/DavService.kt index 91b3bce1e..a1c94980b 100644 --- a/app/src/main/java/foundation/e/accountmanager/DavService.kt +++ b/app/src/main/java/foundation/e/accountmanager/DavService.kt @@ -51,7 +51,7 @@ class DavService: android.app.Service() { val DAV_COLLECTION_PROPERTIES = arrayOf( ResourceType.NAME, CurrentUserPrivilegeSet.NAME, - "Test 4 ::"+DisplayName.NAME, + DisplayName.NAME, AddressbookDescription.NAME, SupportedAddressData.NAME, CalendarDescription.NAME, CalendarColor.NAME, SupportedCalendarComponentSet.NAME, Source.NAME -- GitLab From 2fbdd9ab1491539e9bc8ce7b267e6a1c85be5bb4 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 27 Apr 2022 10:07:54 +0530 Subject: [PATCH 5/9] test to finding text 3 --- app/src/main/java/foundation/e/accountmanager/DavService.kt | 2 +- .../java/foundation/e/accountmanager/PackageChangedReceiver.kt | 2 +- .../main/java/foundation/e/accountmanager/model/Collection.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/foundation/e/accountmanager/DavService.kt b/app/src/main/java/foundation/e/accountmanager/DavService.kt index a1c94980b..47bcb0f7f 100644 --- a/app/src/main/java/foundation/e/accountmanager/DavService.kt +++ b/app/src/main/java/foundation/e/accountmanager/DavService.kt @@ -143,7 +143,7 @@ class DavService: android.app.Service() { val collectionDao = db.collectionDao() val service = db.serviceDao().get(serviceId) ?: throw IllegalArgumentException("Service not found") - val account = Account(service.accountName, service.accountType) + val account = Account("Test 6 :: "+service.accountName, service.accountType) val homeSets = homeSetDao.getByService(serviceId).associateBy { it.url }.toMutableMap() val collections = collectionDao.getByService(serviceId).associateBy { it.url }.toMutableMap() diff --git a/app/src/main/java/foundation/e/accountmanager/PackageChangedReceiver.kt b/app/src/main/java/foundation/e/accountmanager/PackageChangedReceiver.kt index 26540e117..793b9462a 100644 --- a/app/src/main/java/foundation/e/accountmanager/PackageChangedReceiver.kt +++ b/app/src/main/java/foundation/e/accountmanager/PackageChangedReceiver.kt @@ -34,7 +34,7 @@ class PackageChangedReceiver: BroadcastReceiver() { // check all accounts and (de)activate OpenTasks if a CalDAV service is defined val db = AppDatabase.getInstance(context) db.serviceDao().getByType(Service.TYPE_CALDAV).forEach { service -> - val account = Account(service.accountName, service.accountType) + val account = Account("Test 7 :: "+service.accountName, service.accountType) if (tasksInstalled) { if (ContentResolver.getIsSyncable(account, OpenTasks.authority) <= 0) { ContentResolver.setIsSyncable(account, OpenTasks.authority, 1) diff --git a/app/src/main/java/foundation/e/accountmanager/model/Collection.kt b/app/src/main/java/foundation/e/accountmanager/model/Collection.kt index 8bc4f3fc5..55afbbe1f 100644 --- a/app/src/main/java/foundation/e/accountmanager/model/Collection.kt +++ b/app/src/main/java/foundation/e/accountmanager/model/Collection.kt @@ -131,7 +131,7 @@ data class Collection( url = url, privWriteContent = privWriteContent, privUnbind = privUnbind, - displayName = displayName, + displayName ="Test 8 ::"+ displayName, description = description, color = color, timezone = timezone, -- GitLab From bf5d5f3da8feb359a6125a85d0f7a73f839a6c97 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 27 Apr 2022 12:05:54 +0530 Subject: [PATCH 6/9] test to finding text 4 --- .../foundation/e/accountmanager/ui/account/AccountActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt b/app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt index 0abe8d140..b5cd604c4 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt @@ -225,7 +225,7 @@ class AccountActivity: AppCompatActivity() { override fun getPageTitle(position: Int): String = when (position) { - idxCardDav -> activity.getString(R.string.account_carddav) + idxCardDav -> "Settings "+activity.getString(R.string.account_carddav) idxCalDav -> activity.getString(R.string.account_caldav) idxWebcal -> activity.getString(R.string.account_webcal) else -> throw IllegalArgumentException() -- GitLab From 807cd163ad8acbd94a2c1b1fa39e936398c447c5 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Wed, 27 Apr 2022 18:52:55 +0530 Subject: [PATCH 7/9] remove some of test number --- app/src/main/java/foundation/e/accountmanager/DavService.kt | 2 +- .../java/foundation/e/accountmanager/PackageChangedReceiver.kt | 2 +- .../main/java/foundation/e/accountmanager/model/Collection.kt | 2 +- .../main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt | 2 +- vcard4android | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/foundation/e/accountmanager/DavService.kt b/app/src/main/java/foundation/e/accountmanager/DavService.kt index 47bcb0f7f..a1c94980b 100644 --- a/app/src/main/java/foundation/e/accountmanager/DavService.kt +++ b/app/src/main/java/foundation/e/accountmanager/DavService.kt @@ -143,7 +143,7 @@ class DavService: android.app.Service() { val collectionDao = db.collectionDao() val service = db.serviceDao().get(serviceId) ?: throw IllegalArgumentException("Service not found") - val account = Account("Test 6 :: "+service.accountName, service.accountType) + val account = Account(service.accountName, service.accountType) val homeSets = homeSetDao.getByService(serviceId).associateBy { it.url }.toMutableMap() val collections = collectionDao.getByService(serviceId).associateBy { it.url }.toMutableMap() diff --git a/app/src/main/java/foundation/e/accountmanager/PackageChangedReceiver.kt b/app/src/main/java/foundation/e/accountmanager/PackageChangedReceiver.kt index 793b9462a..26540e117 100644 --- a/app/src/main/java/foundation/e/accountmanager/PackageChangedReceiver.kt +++ b/app/src/main/java/foundation/e/accountmanager/PackageChangedReceiver.kt @@ -34,7 +34,7 @@ class PackageChangedReceiver: BroadcastReceiver() { // check all accounts and (de)activate OpenTasks if a CalDAV service is defined val db = AppDatabase.getInstance(context) db.serviceDao().getByType(Service.TYPE_CALDAV).forEach { service -> - val account = Account("Test 7 :: "+service.accountName, service.accountType) + val account = Account(service.accountName, service.accountType) if (tasksInstalled) { if (ContentResolver.getIsSyncable(account, OpenTasks.authority) <= 0) { ContentResolver.setIsSyncable(account, OpenTasks.authority, 1) diff --git a/app/src/main/java/foundation/e/accountmanager/model/Collection.kt b/app/src/main/java/foundation/e/accountmanager/model/Collection.kt index 55afbbe1f..8bc4f3fc5 100644 --- a/app/src/main/java/foundation/e/accountmanager/model/Collection.kt +++ b/app/src/main/java/foundation/e/accountmanager/model/Collection.kt @@ -131,7 +131,7 @@ data class Collection( url = url, privWriteContent = privWriteContent, privUnbind = privUnbind, - displayName ="Test 8 ::"+ displayName, + displayName = displayName, description = description, color = color, timezone = timezone, diff --git a/app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt b/app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt index 6cbc2492f..aedf65232 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt @@ -20,7 +20,7 @@ class HomeSetAdapter( val v: View if (!data.displayName.isNullOrBlank()) { v = convertView ?: LayoutInflater.from(context).inflate(R.layout.custom_simple_list_item_2, null, false) - v.findViewById(android.R.id.text1).text = "Test 3 :: "+data.displayName + v.findViewById(android.R.id.text1).text = data.displayName v.findViewById(android.R.id.text2).apply { text = data.url.toString() setSingleLine() diff --git a/vcard4android b/vcard4android index ab6167b92..a5cb611b6 160000 --- a/vcard4android +++ b/vcard4android @@ -1 +1 @@ -Subproject commit ab6167b9213c2fe03ca159f6eb6bd1472ede1fab +Subproject commit a5cb611b62ad7ec5f5ed5c01ab3b818c77acc98f -- GitLab From d9af59cc06b1dc927184dc6a078265fd5b5b034c Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 29 Apr 2022 07:04:03 +0530 Subject: [PATCH 8/9] remove some of test number and add Setting --- .../main/java/foundation/e/accountmanager/model/Collection.kt | 2 +- .../foundation/e/accountmanager/resource/LocalAddressBook.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/foundation/e/accountmanager/model/Collection.kt b/app/src/main/java/foundation/e/accountmanager/model/Collection.kt index 8bc4f3fc5..ede34873c 100644 --- a/app/src/main/java/foundation/e/accountmanager/model/Collection.kt +++ b/app/src/main/java/foundation/e/accountmanager/model/Collection.kt @@ -86,7 +86,7 @@ data class Collection( var displayName: String? = null dav[DisplayName::class.java]?.let { if (!it.displayName.isNullOrEmpty()) - displayName = "Test 5 :: "+it.displayName + displayName = it.displayName } var description: String? = null diff --git a/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt b/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt index 3c0711e07..0afdbec90 100644 --- a/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt +++ b/app/src/main/java/foundation/e/accountmanager/resource/LocalAddressBook.kt @@ -99,7 +99,7 @@ class LocalAddressBook( baos.write(info.url.hashCode()) val hash = Base64.encodeToString(baos.toByteArray(), Base64.NO_WRAP or Base64.NO_PADDING) - val sb = StringBuilder("Test :2: "+info.displayName.let { + val sb = StringBuilder("Setting "+info.displayName.let { if (it.isNullOrEmpty()) DavUtils.lastSegmentOfUrl(info.url) else -- GitLab From 1c1930814d659d444254bdf85fc1fe24afb8e844 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Fri, 29 Apr 2022 07:08:44 +0530 Subject: [PATCH 9/9] code refine --- .../foundation/e/accountmanager/ui/account/AccountActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt b/app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt index b5cd604c4..0abe8d140 100644 --- a/app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt +++ b/app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt @@ -225,7 +225,7 @@ class AccountActivity: AppCompatActivity() { override fun getPageTitle(position: Int): String = when (position) { - idxCardDav -> "Settings "+activity.getString(R.string.account_carddav) + idxCardDav -> activity.getString(R.string.account_carddav) idxCalDav -> activity.getString(R.string.account_caldav) idxWebcal -> activity.getString(R.string.account_webcal) else -> throw IllegalArgumentException() -- GitLab