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

Commit efa168b9 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Use AppBarLayout for AccountActivity

parent b8abc607

app/src/main/AndroidManifest.xml

+2 −4
Original line number Diff line number Diff line
@@ -81,10 +81,8 @@ 


        <activity

            android:name=".ui.account.AccountActivity2"

            android:parentActivityName=".ui.AccountsActivity"/>

        <activity

            android:name=".ui.AccountActivity"

            android:parentActivityName=".ui.AccountsActivity"/>

            android:parentActivityName=".ui.AccountsActivity"

            android:theme="@style/AppTheme.NoActionBar"/>

        <activity android:name=".ui.AccountSettingsActivity"/>

        <activity android:name=".ui.CreateAddressBookActivity"

            android:label="@string/create_addressbook"/>

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

+7 −0
Original line number Diff line number Diff line 
package at.bitfire.davdroid



import android.accounts.Account

import android.accounts.AccountManager

import android.accounts.AccountManagerCallback

import android.accounts.AccountManagerFuture

import android.app.Activity

import android.content.ContentProviderClient

import android.os.Build

import android.os.Bundle

import android.os.Handler



fun ContentProviderClient.closeCompat() {

    if (Build.VERSION.SDK_INT >= 24)

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

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import at.bitfire.davdroid.model.Collection 
import at.bitfire.davdroid.model.Service

import at.bitfire.davdroid.resource.LocalAddressBook

import at.bitfire.davdroid.settings.AccountSettings

import at.bitfire.davdroid.ui.AccountActivity

import at.bitfire.davdroid.ui.account.AccountActivity2

import okhttp3.HttpUrl

import java.util.logging.Level
@@ -74,8 +74,8 @@ class AddressBooksSyncAdapterService : SyncAdapterService() { 
                    Logger.log.info("No contacts permission, but no address book selected for synchronization")

                else {

                    // no contacts permission, but address books should be synchronized -> show notification

                    val intent = Intent(context, AccountActivity::class.java)

                    intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)

                    val intent = Intent(context, AccountActivity2::class.java)

                    intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)

                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)



                    notifyPermissions(intent)

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

+4 −4
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import androidx.core.content.ContextCompat 
import at.bitfire.davdroid.R

import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.settings.AccountSettings

import at.bitfire.davdroid.ui.AccountActivity

import at.bitfire.davdroid.ui.AccountSettingsActivity

import at.bitfire.davdroid.ui.NotificationUtils

import at.bitfire.davdroid.ui.account.AccountActivity2

import java.lang.ref.WeakReference

import java.util.*

import java.util.logging.Level
@@ -84,8 +84,8 @@ abstract class SyncAdapterService: Service() { 
            Logger.log.log(Level.WARNING, "Security exception when opening content provider for $authority")

            syncResult.databaseError = true



            val intent = Intent(context, AccountActivity::class.java)

            intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)

            val intent = Intent(context, AccountActivity2::class.java)

            intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)



            notifyPermissions(intent)
@@ -106,7 +106,7 @@ abstract class SyncAdapterService: Service() { 
                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 &&

                        ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {

                        val intent = Intent(context, AccountSettingsActivity::class.java)

                        intent.putExtra(AccountActivity.EXTRA_ACCOUNT, settings.account)

                        intent.putExtra(AccountSettingsActivity.EXTRA_ACCOUNT, settings.account)

                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)



                        notifyPermissions(intent)

app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.kt

deleted100644 → 0
+0 −766

File deleted.

Preview size limit exceeded, changes collapsed.