mirror of
https://github.com/bitfireAT/davx5-ose
synced 2024-10-15 15:59:18 +00:00
Add stats parameters for Web site calls, rename AccountActivity2 back to AccountActivity
This commit is contained in:
parent
4486c0862a
commit
45d6b33023
|
@ -139,7 +139,7 @@
|
|||
</activity>
|
||||
|
||||
<activity
|
||||
android:name=".ui.account.AccountActivity2"
|
||||
android:name=".ui.account.AccountActivity"
|
||||
android:parentActivityName=".ui.AccountsActivity"
|
||||
android:theme="@style/AppTheme.NoActionBar"
|
||||
android:exported="true">
|
||||
|
@ -147,14 +147,14 @@
|
|||
<activity
|
||||
android:name=".ui.account.CreateAddressBookActivity"
|
||||
android:theme="@style/AppTheme.NoActionBar"
|
||||
android:parentActivityName=".ui.account.AccountActivity2" />
|
||||
android:parentActivityName=".ui.account.AccountActivity" />
|
||||
<activity
|
||||
android:name=".ui.account.CreateCalendarActivity"
|
||||
android:label="@string/create_calendar"
|
||||
android:parentActivityName=".ui.account.AccountActivity2" />
|
||||
android:parentActivityName=".ui.account.AccountActivity" />
|
||||
<activity
|
||||
android:name=".ui.account.SettingsActivity"
|
||||
android:parentActivityName=".ui.account.AccountActivity2" />
|
||||
android:parentActivityName=".ui.account.AccountActivity" />
|
||||
<activity
|
||||
android:name=".ui.account.WifiPermissionsActivity"
|
||||
android:theme="@style/AppTheme.NoActionBar"
|
||||
|
|
|
@ -85,7 +85,7 @@ import at.bitfire.davdroid.db.AppDatabase
|
|||
import at.bitfire.davdroid.servicedetection.RefreshCollectionsWorker
|
||||
import at.bitfire.davdroid.syncadapter.SyncUtils
|
||||
import at.bitfire.davdroid.syncadapter.SyncWorker
|
||||
import at.bitfire.davdroid.ui.account.AccountActivity2
|
||||
import at.bitfire.davdroid.ui.account.AccountActivity
|
||||
import at.bitfire.davdroid.ui.intro.IntroActivity
|
||||
import at.bitfire.davdroid.ui.setup.LoginActivity
|
||||
import at.bitfire.davdroid.ui.widget.ActionCard
|
||||
|
@ -223,8 +223,8 @@ class AccountsActivity: AppCompatActivity() {
|
|||
accounts = accounts ?: emptyList(),
|
||||
onClickAccount = { account ->
|
||||
val activity = this@AccountsActivity
|
||||
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)
|
||||
activity.startActivity(intent)
|
||||
},
|
||||
modifier = Modifier
|
||||
|
|
|
@ -22,11 +22,16 @@ import at.bitfire.davdroid.Constants
|
|||
import at.bitfire.davdroid.Constants.COMMUNITY_URL
|
||||
import at.bitfire.davdroid.Constants.FEDIVERSE_URL
|
||||
import at.bitfire.davdroid.Constants.MANUAL_URL
|
||||
import at.bitfire.davdroid.Constants.withStatParams
|
||||
import at.bitfire.davdroid.R
|
||||
import javax.inject.Inject
|
||||
|
||||
open class OseAccountsDrawerHandler @Inject constructor(): AccountsDrawerHandler() {
|
||||
|
||||
companion object {
|
||||
const val WEB_CONTEXT = "AccountsDrawerHandler"
|
||||
}
|
||||
|
||||
@Composable
|
||||
override fun MenuEntries(
|
||||
snackbarHostState: SnackbarHostState
|
||||
|
@ -55,6 +60,7 @@ open class OseAccountsDrawerHandler @Inject constructor(): AccountsDrawerHandler
|
|||
uriHandler.openUri(
|
||||
Constants.HOMEPAGE_URL.buildUpon()
|
||||
.appendPath(Constants.HOMEPAGE_PATH_OPEN_SOURCE)
|
||||
.withStatParams(WEB_CONTEXT)
|
||||
.build().toString()
|
||||
)
|
||||
})
|
||||
|
@ -73,7 +79,10 @@ open class OseAccountsDrawerHandler @Inject constructor(): AccountsDrawerHandler
|
|||
icon = Icons.Default.Home,
|
||||
title = stringResource(R.string.navigation_drawer_website),
|
||||
onClick = {
|
||||
uriHandler.openUri(Constants.HOMEPAGE_URL.toString())
|
||||
uriHandler.openUri(Constants.HOMEPAGE_URL
|
||||
.buildUpon()
|
||||
.withStatParams(WEB_CONTEXT)
|
||||
.build().toString())
|
||||
}
|
||||
)
|
||||
MenuEntry(
|
||||
|
@ -90,6 +99,7 @@ open class OseAccountsDrawerHandler @Inject constructor(): AccountsDrawerHandler
|
|||
uriHandler.openUri(
|
||||
Constants.HOMEPAGE_URL.buildUpon()
|
||||
.appendPath(Constants.HOMEPAGE_PATH_FAQ)
|
||||
.withStatParams(WEB_CONTEXT)
|
||||
.build().toString()
|
||||
)
|
||||
}
|
||||
|
@ -101,6 +111,7 @@ open class OseAccountsDrawerHandler @Inject constructor(): AccountsDrawerHandler
|
|||
uriHandler.openUri(
|
||||
Constants.HOMEPAGE_URL.buildUpon()
|
||||
.appendPath(Constants.HOMEPAGE_PATH_PRIVACY)
|
||||
.withStatParams(WEB_CONTEXT)
|
||||
.build().toString()
|
||||
)
|
||||
}
|
||||
|
|
|
@ -90,7 +90,7 @@ import kotlinx.coroutines.launch
|
|||
import javax.inject.Inject
|
||||
|
||||
@AndroidEntryPoint
|
||||
class AccountActivity2 : AppCompatActivity() {
|
||||
class AccountActivity : AppCompatActivity() {
|
||||
|
||||
companion object {
|
||||
const val EXTRA_ACCOUNT = "account"
|
||||
|
@ -185,10 +185,10 @@ class AccountActivity2 : AppCompatActivity() {
|
|||
installIcsx5 = installIcsx5,
|
||||
onRefreshCollections = {
|
||||
cardDavSvc?.let { svc ->
|
||||
RefreshCollectionsWorker.enqueue(this@AccountActivity2, svc.id)
|
||||
RefreshCollectionsWorker.enqueue(this@AccountActivity, svc.id)
|
||||
}
|
||||
calDavSvc?.let { svc ->
|
||||
RefreshCollectionsWorker.enqueue(this@AccountActivity2, svc.id)
|
||||
RefreshCollectionsWorker.enqueue(this@AccountActivity, svc.id)
|
||||
}
|
||||
},
|
||||
onSync = {
|
||||
|
|
|
@ -107,7 +107,7 @@ class CreateAddressBookActivity: AppCompatActivity() {
|
|||
override fun supportShouldUpRecreateTask(targetIntent: Intent) = true
|
||||
|
||||
override fun onPrepareSupportNavigateUpTaskStack(builder: TaskStackBuilder) {
|
||||
builder.editIntentAt(builder.intentCount - 1)?.putExtra(AccountActivity2.EXTRA_ACCOUNT, model.account)
|
||||
builder.editIntentAt(builder.intentCount - 1)?.putExtra(AccountActivity.EXTRA_ACCOUNT, model.account)
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -120,8 +120,8 @@ class CreateCalendarActivity: AppCompatActivity(), ColorPickerDialogListener {
|
|||
|
||||
override fun onOptionsItemSelected(item: MenuItem) =
|
||||
if (item.itemId == android.R.id.home) {
|
||||
val intent = Intent(this, AccountActivity2::class.java)
|
||||
intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, model.account)
|
||||
val intent = Intent(this, AccountActivity::class.java)
|
||||
intent.putExtra(AccountActivity.EXTRA_ACCOUNT, model.account)
|
||||
NavUtils.navigateUpTo(this, intent)
|
||||
true
|
||||
} else
|
||||
|
|
|
@ -82,7 +82,7 @@ class SettingsActivity: AppCompatActivity() {
|
|||
override fun supportShouldUpRecreateTask(targetIntent: Intent) = true
|
||||
|
||||
override fun onPrepareSupportNavigateUpTaskStack(builder: TaskStackBuilder) {
|
||||
builder.editIntentAt(builder.intentCount - 1)?.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)
|
||||
builder.editIntentAt(builder.intentCount - 1)?.putExtra(AccountActivity.EXTRA_ACCOUNT, account)
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ import at.bitfire.davdroid.settings.AccountSettings
|
|||
import at.bitfire.davdroid.settings.Settings
|
||||
import at.bitfire.davdroid.settings.SettingsManager
|
||||
import at.bitfire.davdroid.syncadapter.AccountUtils
|
||||
import at.bitfire.davdroid.ui.account.AccountActivity2
|
||||
import at.bitfire.davdroid.ui.account.AccountActivity
|
||||
import at.bitfire.vcard4android.GroupMethod
|
||||
import com.google.android.material.snackbar.Snackbar
|
||||
import dagger.hilt.android.AndroidEntryPoint
|
||||
|
@ -113,9 +113,9 @@ class AccountDetailsFragment : Fragment() {
|
|||
// close Create account activity
|
||||
requireActivity().finish()
|
||||
// open Account activity for created account
|
||||
val intent = Intent(requireActivity(), AccountActivity2::class.java)
|
||||
val intent = Intent(requireActivity(), AccountActivity::class.java)
|
||||
val account = Account(name, getString(R.string.account_type))
|
||||
intent.putExtra(AccountActivity2.EXTRA_ACCOUNT, account)
|
||||
intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account)
|
||||
startActivity(intent)
|
||||
} else {
|
||||
Snackbar.make(requireActivity().findViewById(android.R.id.content), R.string.login_account_not_created, Snackbar.LENGTH_LONG).show()
|
||||
|
|
Loading…
Reference in a new issue