From 74d37434473c507f1adb18c5923c943b3876f6d1 Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Wed, 28 Sep 2022 14:45:48 +0530 Subject: [PATCH] eDrive: Adapt intents for latest accountmanager --- .../e/drive/activity/AccountsActivity.java | 8 ++++---- .../foundation/e/drive/widgets/EDriveWidget.java | 12 +++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java b/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java index 7acb1ea8..feebfa19 100644 --- a/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java +++ b/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java @@ -42,8 +42,8 @@ import timber.log.Timber; public class AccountsActivity extends AppCompatActivity { public static final String NON_OFFICIAL_AVATAR_PATH = "/index.php/avatar/"; - private static final String ACCOUNT_SETTINGS = - EDriveWidget.ACCOUNT_MANAGER_PACKAGE_NAME + ".ui.AccountsActivity"; + public static final String ACCOUNT_MANAGER_PACKAGE_NAME = "foundation.e.accountmanager"; + private static final String ACCOUNT_SETTINGS = "at.bitfire.davdroid.ui.AccountsActivity"; private ActivityAccountsBinding binding; @@ -59,9 +59,9 @@ public class AccountsActivity extends AppCompatActivity { binding.toolbar.setNavigationOnClickListener(v -> onBackPressed()); binding.settings.setOnClickListener(v -> { - final Intent settingsIntent = buildIntent(Intent.ACTION_VIEW, "") + final Intent settingsIntent = buildIntent("", "") .setComponent(new ComponentName( - EDriveWidget.ACCOUNT_MANAGER_PACKAGE_NAME, ACCOUNT_SETTINGS)); + ACCOUNT_MANAGER_PACKAGE_NAME, ACCOUNT_SETTINGS)); startActivity(settingsIntent); }); showDetails(); diff --git a/app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java b/app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java index 3eedd267..e7a24c11 100644 --- a/app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java +++ b/app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java @@ -47,13 +47,9 @@ public class EDriveWidget extends AppWidgetProvider { public static final String WEBPAGE = "https://esolutions.shop/ecloud-subscriptions/?username=%s&token=placeholder¤t-quota=%s&from=wp"; - public static final String ACCOUNT_MANAGER_PACKAGE_NAME = "foundation.e.accountmanager"; private static final String ADD_ACCOUNT_WEBPAGE = "https://e.foundation/e-email-invite/"; - private static final String GET_ACCOUNT_MANAGER_COMPONENT_NAME = ACCOUNT_MANAGER_PACKAGE_NAME + - ".ui.setup.LoginActivity"; - private static final String SETUP_ACCOUNT_PROVIDER_TYPE = "setup_account_provider_type"; - private static final String ACCOUNT_PROVIDER_EELO = "eelo"; + private static final String ACCOUNT_PROVIDER_EELO = "e.foundation.webdav.eelo"; private static final String SHOW_ALIAS = "show_alias"; private static final String HIDE_ALIAS = "hide_alias"; @@ -170,10 +166,8 @@ public class EDriveWidget extends AppWidgetProvider { views = new RemoteViews(context.getPackageName(), R.layout.e_drive_widget_login); } - Intent accountIntent = buildIntent("", "") - .setComponent(new ComponentName(ACCOUNT_MANAGER_PACKAGE_NAME, - GET_ACCOUNT_MANAGER_COMPONENT_NAME)) - .putExtra(SETUP_ACCOUNT_PROVIDER_TYPE, ACCOUNT_PROVIDER_EELO); + Intent accountIntent = buildIntent(Settings.ACTION_ADD_ACCOUNT, "") + .putExtra(Settings.EXTRA_ACCOUNT_TYPES, new String[]{ACCOUNT_PROVIDER_EELO}); PendingIntent addAccountIntent = PendingIntent.getActivity(context, 0, accountIntent, PendingIntent.FLAG_IMMUTABLE); views.setOnClickPendingIntent(R.id.login, addAccountIntent); -- GitLab