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 c6f5cf45a0ffd3e82f35b6dba8f3a72196bfd12e..a940711374fc1bac841879a3001b5766b4b0d580 100644 --- a/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java +++ b/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java @@ -34,7 +34,6 @@ import foundation.e.drive.account.AccountUtils; import foundation.e.drive.databinding.ActivityAccountsBinding; import foundation.e.drive.utils.CommonUtils; import foundation.e.drive.utils.DavClientProvider; -import foundation.e.drive.utils.AccessTokenProvider; import foundation.e.drive.widgets.EDriveWidget; import timber.log.Timber; @@ -76,7 +75,6 @@ public class AccountsActivity extends AppCompatActivity { final String totalQuota = accountManager.getUserData(account, ACCOUNT_DATA_TOTAL_QUOTA_KEY); final String email = accountManager.getUserData(account, ACCOUNT_DATA_EMAIL); String name = accountManager.getUserData(account, ACCOUNT_DATA_NAME); - final String token = AccessTokenProvider.getToken(accountManager, account); // For some reason if we cant get name use email as name if (name == null || name.isEmpty()) { @@ -139,7 +137,7 @@ public class AccountsActivity extends AppCompatActivity { binding.upgrade.setVisibility(View.VISIBLE); binding.upgrade.setOnClickListener(v -> { final Intent upgradeIntent = EDriveWidget.buildIntent(Intent.ACTION_VIEW, - EDriveWidget.buildUpgradeUrl(email, token, totalQuota)); + EDriveWidget.buildUpgradeUrl(email, totalQuota)); startActivity(upgradeIntent); }); diff --git a/app/src/main/java/foundation/e/drive/utils/AccessTokenProvider.kt b/app/src/main/java/foundation/e/drive/utils/AccessTokenProvider.kt deleted file mode 100644 index eecb67e48f758a77c9d93d5f2c47e45e3eba9666..0000000000000000000000000000000000000000 --- a/app/src/main/java/foundation/e/drive/utils/AccessTokenProvider.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright MURENA SAS 2024 - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package foundation.e.drive.utils - -import android.accounts.Account -import android.accounts.AccountManager -import com.owncloud.android.lib.common.accounts.AccountUtils -import net.openid.appauth.AuthState -import org.json.JSONException -import timber.log.Timber - -object AccessTokenProvider { - - private const val PLACEHOLDER_TOKEN = "placeholder" - - @JvmStatic - fun getToken(accountManager: AccountManager, account: Account?): String { - getAuthState(accountManager, account)?.let { authState -> - try { - return AuthState.jsonDeserialize(authState).accessToken ?: PLACEHOLDER_TOKEN - } catch (e: JSONException) { - Timber.e(e) - } - } - - return PLACEHOLDER_TOKEN - } - - private fun getAuthState(accountManager: AccountManager, account: Account?): String? { - var authState: String? = null - - if (account != null) { - authState = accountManager.getUserData(account, AccountUtils.Constants.KEY_AUTH_STATE) - } - - return if (authState.isNullOrBlank()) null else authState - } -} 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 38bc1b7bf3508945eed8ed80d21d557393e14ed9..df8a3aa8da380cf5b0031e78dd5681852626af86 100644 --- a/app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java +++ b/app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java @@ -42,7 +42,6 @@ import foundation.e.drive.R; import foundation.e.drive.account.AccountUtils; import foundation.e.drive.utils.AppConstants; import foundation.e.drive.utils.CommonUtils; -import foundation.e.drive.utils.AccessTokenProvider; import timber.log.Timber; /** @@ -69,11 +68,9 @@ public class EDriveWidget extends AppWidgetProvider { public static @NonNull String buildUpgradeUrl( @NonNull String email, - @NonNull String token, @NonNull String totalQuota) { return "https://murena.com/ecloud-subscriptions/" + "?username=" + email - + "&token=" + token + "¤t-quota=" + dataForWeb(totalQuota) + "&from=wp"; } @@ -223,7 +220,6 @@ public class EDriveWidget extends AppWidgetProvider { final String totalQuota = accountManager.getUserData(account, ACCOUNT_DATA_TOTAL_QUOTA_KEY); final String email = accountManager.getUserData(account, ACCOUNT_DATA_EMAIL); String name = accountManager.getUserData(account, ACCOUNT_DATA_NAME); - final String token = AccessTokenProvider.getToken(accountManager, account); if (email == null || email.trim().isEmpty()) { noAccountView(context); @@ -311,7 +307,7 @@ public class EDriveWidget extends AppWidgetProvider { views.setOnClickPendingIntent(R.id.settings, pendingIntentSettings); final PendingIntent pendingIntentUpgrade = PendingIntent.getActivity(context, 0, - buildIntent(Intent.ACTION_VIEW, buildUpgradeUrl(email, token, + buildIntent(Intent.ACTION_VIEW, buildUpgradeUrl(email, totalQuota)), PendingIntent.FLAG_IMMUTABLE); views.setOnClickPendingIntent(R.id.upgrade, pendingIntentUpgrade); }