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

Commit ffe59915 authored May 04, 2019 by Ricki Hirner

Rename AccountActivity2 to AccountActivity

parent 94a8c4c2

app/src/main/AndroidManifest.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,7 @@
	</activity>		</activity>

	<activity		<activity
	android:name=".ui.account.AccountActivity2"		android:name=".ui.account.AccountActivity"
	android:parentActivityName=".ui.AccountsActivity"		android:parentActivityName=".ui.AccountsActivity"
	android:theme="@style/AppTheme.NoActionBar"/>		android:theme="@style/AppTheme.NoActionBar"/>
	<activity android:name=".ui.AccountSettingsActivity"/>		<activity android:name=".ui.AccountSettingsActivity"/>

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	package at.bitfire.davdroid		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.content.ContentProviderClient
	import android.os.Build		import android.os.Build
	import android.os.Bundle
	import android.os.Handler

	fun ContentProviderClient.closeCompat() {		fun ContentProviderClient.closeCompat() {
	if (Build.VERSION.SDK_INT >= 24)		if (Build.VERSION.SDK_INT >= 24)

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

+3 −3

Original line number	Original line	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.model.Service
	import at.bitfire.davdroid.resource.LocalAddressBook		import at.bitfire.davdroid.resource.LocalAddressBook
	import at.bitfire.davdroid.settings.AccountSettings		import at.bitfire.davdroid.settings.AccountSettings
	import at.bitfire.davdroid.ui.account.AccountActivity2		import at.bitfire.davdroid.ui.account.AccountActivity
	import okhttp3.HttpUrl		import okhttp3.HttpUrl
	import java.util.logging.Level		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")		Logger.log.info("No contacts permission, but no address book selected for synchronization")
	else {		else {
	// no contacts permission, but address books should be synchronized -> show notification		// no contacts permission, but address books should be synchronized -> show notification
	val intent = Intent(context, AccountActivity2::class.java)		val intent = Intent(context, AccountActivity::class.java)
	intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)		intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)
	intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

	notifyPermissions(intent)		notifyPermissions(intent)

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

+3 −3

Original line number	Original line	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.settings.AccountSettings
	import at.bitfire.davdroid.ui.AccountSettingsActivity		import at.bitfire.davdroid.ui.AccountSettingsActivity
	import at.bitfire.davdroid.ui.NotificationUtils		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.lang.ref.WeakReference
	import java.util.*		import java.util.*
	import java.util.logging.Level		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")		Logger.log.log(Level.WARNING, "Security exception when opening content provider for $authority")
	syncResult.databaseError = true		syncResult.databaseError = true

	val intent = Intent(context, AccountActivity2::class.java)		val intent = Intent(context, AccountActivity::class.java)
	intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)		intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)
	intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

	notifyPermissions(intent)		notifyPermissions(intent)

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,7 @@ import androidx.lifecycle.MutableLiveData
	import androidx.lifecycle.Observer		import androidx.lifecycle.Observer
	import androidx.lifecycle.ViewModelProviders		import androidx.lifecycle.ViewModelProviders
	import at.bitfire.davdroid.R		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.*		import kotlinx.android.synthetic.main.account_list_item.view.*

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