Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56659c64 authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Change default sync frequency of contacts and calendar.

parent dd35b324

app/src/main/java/at/bitfire/davdroid/AccountSettings.kt

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ class AccountSettings( 


        // request sync of new address book account

        ContentResolver.setIsSyncable(account, context.getString(R.string.address_books_authority), 1)

        setSyncInterval(context.getString(R.string.address_books_authority), Constants.DEFAULT_SYNC_INTERVAL)

        setSyncInterval(context.getString(R.string.address_books_authority), Constants.DEFAULT_CONTACTS_SYNC_INTERVAL)

    }



    /* Android 7.1.1 OpenTasks fix */

app/src/main/java/at/bitfire/davdroid/Constants.kt

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ object Constants { 


    const val DAVDROID_GREEN_RGBA = 0xFF8bc34a.toInt()



    const val DEFAULT_SYNC_INTERVAL = 4 * 3600L    // 4 hours

    // NOTE: Android 7 and up don't allow 2 min sync frequencies unless system frameworks are modified

    const val DEFAULT_CALENDAR_SYNC_INTERVAL = 2 * 60L // 2 minutes

    const val DEFAULT_CONTACTS_SYNC_INTERVAL = 15 * 60L // 15 minutes



}

app/src/main/java/at/bitfire/davdroid/PackageChangedReceiver.kt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class PackageChangedReceiver: BroadcastReceiver() { 
                            if (ContentResolver.getIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority) <= 0) {

                                ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 1)

                                ContentResolver.setSyncAutomatically(account, TaskProvider.ProviderName.OpenTasks.authority, true)

                                ContentResolver.addPeriodicSync(account, TaskProvider.ProviderName.OpenTasks.authority, Bundle(), Constants.DEFAULT_SYNC_INTERVAL)

                                ContentResolver.addPeriodicSync(account, TaskProvider.ProviderName.OpenTasks.authority, Bundle(), Constants.DEFAULT_CALENDAR_SYNC_INTERVAL)

                            }

                        } else

                            ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 0)

app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt

+3 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ class AccountDetailsFragment : Fragment(), LoaderManager.LoaderCallbacks<CreateS 
                    accountSettings.setGroupMethod(GroupMethod.valueOf(groupMethodName))



                    // contact sync is automatically enabled by isAlwaysSyncable="true" in res/xml/sync_address_books.xml

                    accountSettings.setSyncInterval(getString(R.string.address_books_authority), Constants.DEFAULT_SYNC_INTERVAL)

                    accountSettings.setSyncInterval(getString(R.string.address_books_authority), Constants.DEFAULT_CONTACTS_SYNC_INTERVAL)

                }

                else

                    ContentResolver.setIsSyncable(account, getString(R.string.address_books_authority), 0)
@@ -177,13 +177,13 @@ class AccountDetailsFragment : Fragment(), LoaderManager.LoaderCallbacks<CreateS 
                    requireActivity().startService(refreshIntent)



                    // calendar sync is automatically enabled by isAlwaysSyncable="true" in res/xml/sync_contacts.xml

                    accountSettings.setSyncInterval(CalendarContract.AUTHORITY, Constants.DEFAULT_SYNC_INTERVAL)

                    accountSettings.setSyncInterval(CalendarContract.AUTHORITY, Constants.DEFAULT_CALENDAR_SYNC_INTERVAL)



                    // enable task sync if OpenTasks is installed

                    // further changes will be handled by PackageChangedReceiver

                    if (LocalTaskList.tasksProviderAvailable(requireActivity())) {

                        ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 1)

                        accountSettings.setSyncInterval(TaskProvider.ProviderName.OpenTasks.authority, Constants.DEFAULT_SYNC_INTERVAL)

                        accountSettings.setSyncInterval(TaskProvider.ProviderName.OpenTasks.authority, Constants.DEFAULT_CALENDAR_SYNC_INTERVAL)

                    }

                }

                else

app/src/main/res/values-da/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
  <string name="settings_sync_interval_tasks">Synkroniseringsinterval for opgaver</string>

  <string-array name="settings_sync_interval_names">

    <item>Kun manuelt</item>

    <item>Hvert andet minut</item>

    <item>Hvert 15. minut</item>

    <item>Hver halve time</item>

    <item>Hver time</item>