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

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

Rename AccountActivity2 to AccountActivity

parent 94a8c4c2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@
        </activity>

        <activity
            android:name=".ui.account.AccountActivity2"
            android:name=".ui.account.AccountActivity"
            android:parentActivityName=".ui.AccountsActivity"
            android:theme="@style/AppTheme.NoActionBar"/>
        <activity android:name=".ui.AccountSettingsActivity"/>
+0 −7
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)
+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.account.AccountActivity2
import at.bitfire.davdroid.ui.account.AccountActivity
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, AccountActivity2::class.java)
                    intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)
                    val intent = Intent(context, AccountActivity::class.java)
                    intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)
                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

                    notifyPermissions(intent)
+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import at.bitfire.davdroid.log.Logger
import at.bitfire.davdroid.settings.AccountSettings
import at.bitfire.davdroid.ui.AccountSettingsActivity
import at.bitfire.davdroid.ui.NotificationUtils
import at.bitfire.davdroid.ui.account.AccountActivity2
import at.bitfire.davdroid.ui.account.AccountActivity
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, AccountActivity2::class.java)
            intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)
            val intent = Intent(context, AccountActivity::class.java)
            intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)
            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

            notifyPermissions(intent)
+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
import at.bitfire.davdroid.R
import at.bitfire.davdroid.ui.account.AccountActivity2
import at.bitfire.davdroid.ui.account.AccountActivity
import kotlinx.android.synthetic.main.account_list_item.view.*

class AccountListFragment: ListFragment() {
@@ -51,8 +51,8 @@ class AccountListFragment: ListFragment() {
        listView.choiceMode = AbsListView.CHOICE_MODE_SINGLE
        listView.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ ->
            val account = listAdapter!!.getItem(position) as Account
            val intent = Intent(activity, AccountActivity2::class.java)
            intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)
            val intent = Intent(activity, AccountActivity::class.java)
            intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)
            startActivity(intent)
        }
    }
Loading