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

Commit 065b4e2e authored by David Luhmer's avatar David Luhmer
Browse files

add method to reauthenticate account

parent 8b590d80

src/main/java/com/nextcloud/android/sso/AccountImporter.java

+20 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.util.Log; 
import android.widget.Toast;



import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;

import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountPermissionNotGrantedException;

import com.nextcloud.android.sso.exceptions.NextcloudFilesAppNotInstalledException;

import com.nextcloud.android.sso.exceptions.NextcloudFilesAppNotSupportedException;

import com.nextcloud.android.sso.exceptions.SSOException;
@@ -184,7 +185,7 @@ public class AccountImporter { 
                        } else {

                            requestAuthToken(fragment, data);

                        }

                    } catch (NextcloudFilesAppNotSupportedException e) {

                    } catch (NextcloudFilesAppNotSupportedException | NextcloudFilesAppAccountPermissionNotGrantedException e) {

                        UiExceptionManager.showDialogForException(context, e);

                    }

                    break;
@@ -222,7 +223,19 @@ public class AccountImporter { 
        throw SSOException.parseNextcloudCustomException(new Exception(exception));

    }



    public static void requestAuthToken(Fragment fragment, Intent intent) throws NextcloudFilesAppNotSupportedException {

    public static void authenticateSingleSignAccount(Fragment fragment, SingleSignOnAccount account) throws NextcloudFilesAppNotSupportedException, NextcloudFilesAppAccountPermissionNotGrantedException {

        Intent intent = new Intent();

        intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, account.name);

        requestAuthToken(fragment, intent);

    }



    public static void authenticateSingleSignAccount(Activity activity, SingleSignOnAccount account) throws NextcloudFilesAppNotSupportedException, NextcloudFilesAppAccountPermissionNotGrantedException {

        Intent intent = new Intent();

        intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, account.name);

        requestAuthToken(activity, intent);

    }



    public static void requestAuthToken(Fragment fragment, Intent intent) throws NextcloudFilesAppNotSupportedException, NextcloudFilesAppAccountPermissionNotGrantedException {

        Intent authIntent = buildRequestAuthTokenIntent(fragment.getContext(), intent);

        try {

            fragment.startActivityForResult(authIntent, REQUEST_AUTH_TOKEN_SSO);
@@ -231,7 +244,7 @@ public class AccountImporter { 
        }

    }



    public static void requestAuthToken(Activity activity, Intent intent) throws NextcloudFilesAppNotSupportedException {

    public static void requestAuthToken(Activity activity, Intent intent) throws NextcloudFilesAppNotSupportedException, NextcloudFilesAppAccountPermissionNotGrantedException {

        Intent authIntent = buildRequestAuthTokenIntent(activity, intent);

        try {

            activity.startActivityForResult(authIntent, REQUEST_AUTH_TOKEN_SSO);
@@ -240,9 +253,12 @@ public class AccountImporter { 
        }

    }



    private static Intent buildRequestAuthTokenIntent(Context context, Intent intent) {

    private static Intent buildRequestAuthTokenIntent(Context context, Intent intent) throws NextcloudFilesAppAccountPermissionNotGrantedException {

        String accountName = intent.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);

        Account account = AccountImporter.getAccountForName(context, accountName);

        if(account == null) {

            throw new NextcloudFilesAppAccountPermissionNotGrantedException();

        }

        Intent authIntent = new Intent();

        authIntent.setComponent(new ComponentName("com.nextcloud.client",

                "com.owncloud.android.ui.activity.SsoGrantPermissionActivity"));

src/main/java/com/nextcloud/android/sso/helper/SingleAccountHelper.java

+12 −0
Original line number Diff line number Diff line
@@ -19,11 +19,15 @@ 


package com.nextcloud.android.sso.helper;



import android.app.Activity;

import android.content.Context;

import android.content.SharedPreferences;

import android.support.v4.app.Fragment;



import com.nextcloud.android.sso.AccountImporter;

import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;

import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountPermissionNotGrantedException;

import com.nextcloud.android.sso.exceptions.NextcloudFilesAppNotSupportedException;

import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;

import com.nextcloud.android.sso.model.SingleSignOnAccount;
@@ -52,4 +56,12 @@ public final class SingleAccountHelper { 
        SharedPreferences mPrefs = AccountImporter.getSharedPreferences(context);

        mPrefs.edit().putString(PREF_CURRENT_ACCOUNT_STRING, accountName).commit();

    }



    public static void reauthenticateCurrentAccount(Fragment fragment) throws NoCurrentAccountSelectedException, NextcloudFilesAppAccountNotFoundException, NextcloudFilesAppNotSupportedException, NextcloudFilesAppAccountPermissionNotGrantedException {

        AccountImporter.authenticateSingleSignAccount(fragment, getCurrentSingleSignOnAccount(fragment.getContext()));

    }



    public static void reauthenticateCurrentAccount(Activity activity) throws NoCurrentAccountSelectedException, NextcloudFilesAppAccountNotFoundException, NextcloudFilesAppNotSupportedException, NextcloudFilesAppAccountPermissionNotGrantedException {

        AccountImporter.authenticateSingleSignAccount(activity, getCurrentSingleSignOnAccount(activity));

    }

}