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

Commit a997c2ff authored by Nihar Thakkar's avatar Nihar Thakkar
Browse files

Show account settings screen for 404 exceptions as well as 401 exceptions

parent beb3de63

app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt

+5 −5
Original line number Original line Diff line number Diff line
@@ -22,10 +22,7 @@ import android.provider.ContactsContract 
import android.support.v4.app.NotificationCompat

import android.support.v4.app.NotificationCompat

import android.support.v4.app.NotificationManagerCompat

import android.support.v4.app.NotificationManagerCompat

import at.bitfire.dav4android.DavResource

import at.bitfire.dav4android.DavResource

import at.bitfire.dav4android.exception.DavException

import at.bitfire.dav4android.exception.*

import at.bitfire.dav4android.exception.HttpException

import at.bitfire.dav4android.exception.ServiceUnavailableException

import at.bitfire.dav4android.exception.UnauthorizedException

import at.bitfire.davdroid.AccountSettings

import at.bitfire.davdroid.AccountSettings

import at.bitfire.davdroid.BuildConfig

import at.bitfire.davdroid.BuildConfig

import at.bitfire.davdroid.DavService

import at.bitfire.davdroid.DavService
@@ -369,7 +366,10 @@ abstract class SyncManager<out ResourceType: LocalResource<*>, out CollectionTyp 




        val contentIntent: Intent

        val contentIntent: Intent

        var viewItemAction: NotificationCompat.Action? = null

        var viewItemAction: NotificationCompat.Action? = null

        if (e is UnauthorizedException) {

        if ((account.type == context.getString(R.string.account_type) ||

                        account.type == context.getString(R.string.eelo_account_type) ||

                        account.type == context.getString(R.string.google_account_type)) &&

                (e is UnauthorizedException || e is NotFoundException)) {

            contentIntent = Intent(context, AccountSettingsActivity::class.java)

            contentIntent = Intent(context, AccountSettingsActivity::class.java)

            contentIntent.putExtra(AccountSettingsActivity.EXTRA_ACCOUNT, account)

            contentIntent.putExtra(AccountSettingsActivity.EXTRA_ACCOUNT, account)

        } else {

        } else {