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

Commit 33c0e58d authored by dev-12's avatar dev-12
Browse files

refactor: remove mail from file name it will used to notify other apps as well.

parent 695a1ccd

app/src/main/kotlin/at/bitfire/davdroid/MailAccountSyncHelper.kt→app/src/main/kotlin/at/bitfire/davdroid/AccountSyncHelper.kt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.content.ComponentName 
import android.content.Context

import android.content.Intent



object MailAccountSyncHelper {

object AccountSyncHelper {



    private const val MAIL_PACKAGE = "foundation.e.mail"

    private const val MAIL_RECEIVER_CLASS = "com.fsck.k9.account.AccountSyncReceiver"

app/src/main/kotlin/at/bitfire/davdroid/receiver/AccountRemovedReceiver.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.accounts.AccountManager 
import android.content.BroadcastReceiver

import android.content.Context

import android.content.Intent

import at.bitfire.davdroid.MailAccountSyncHelper

import at.bitfire.davdroid.AccountSyncHelper

import at.bitfire.davdroid.settings.AccountSettings

import at.bitfire.davdroid.syncadapter.AccountUtils

import at.bitfire.davdroid.ui.signout.OpenIdEndSessionActivity
@@ -44,7 +44,7 @@ class AccountRemovedReceiver : BroadcastReceiver() { 
            context = context,

            accountName = accountName

        )

        MailAccountSyncHelper.notifyAccountRemoved(context.applicationContext, intent)

        AccountSyncHelper.notifyAccountRemoved(context.applicationContext, intent)

    }



    private fun clearOidcSession(

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/MailSyncer.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.accounts.Account 
import android.content.ContentProviderClient

import android.content.Context

import android.content.SyncResult

import at.bitfire.davdroid.MailAccountSyncHelper

import at.bitfire.davdroid.AccountSyncHelper

import at.bitfire.davdroid.network.HttpClient



class MailSyncer (context: Context): Syncer(context) {
@@ -32,6 +32,6 @@ class MailSyncer (context: Context): Syncer(context) { 
        provider: ContentProviderClient,

        syncResult: SyncResult

    ) {

        MailAccountSyncHelper.syncMailAccounts(context.applicationContext)

        AccountSyncHelper.syncMailAccounts(context.applicationContext)

    }

}

app/src/main/kotlin/at/bitfire/davdroid/ui/account/SettingsActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import androidx.preference.PreferenceFragmentCompat 
import androidx.preference.PreferenceGroup

import androidx.preference.SwitchPreferenceCompat

import at.bitfire.davdroid.InvalidAccountException

import at.bitfire.davdroid.MailAccountSyncHelper

import at.bitfire.davdroid.AccountSyncHelper

import at.bitfire.davdroid.R

import at.bitfire.davdroid.db.Credentials

import at.bitfire.davdroid.log.Logger
@@ -574,7 +574,7 @@ class SettingsActivity: AppCompatActivity() { 
            accountSettings?.credentials(credentials)

            clearOwnCloudData()

            reload()

            MailAccountSyncHelper.syncMailAccounts(getApplication())

            AccountSyncHelper.syncMailAccounts(getApplication())

        }



        private fun clearOwnCloudData() {

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

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import androidx.lifecycle.Observer 
import androidx.lifecycle.viewModelScope

import at.bitfire.davdroid.Constants

import at.bitfire.davdroid.InvalidAccountException

import at.bitfire.davdroid.MailAccountSyncHelper

import at.bitfire.davdroid.AccountSyncHelper

import at.bitfire.davdroid.R

import at.bitfire.davdroid.databinding.LoginAccountDetailsBinding

import at.bitfire.davdroid.db.AppDatabase
@@ -256,7 +256,7 @@ class AccountDetailsFragment : Fragment() { 
    }



    private fun syncMailToUseOAuth() {

        MailAccountSyncHelper.syncMailAccounts(requireContext())

        AccountSyncHelper.syncMailAccounts(requireContext())

    }



    private fun stopMurenaSsoMigrationService() {