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

Unverified Commit 85f88d9d authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #270 from nextcloud/ssoToken 

Use SSO auth token to let files app detect if new account was requested via SSO
parents 1a1efa10 259c337f

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

+3 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class AccountImporter { 


    private static final String TAG = AccountImporter.class.getCanonicalName();

    private static final String PREF_ACCOUNT_STRING = "PREF_ACCOUNT_STRING";

    private static final String AUTH_TOKEN_SSO = "SSO";



    public static final int CHOOSE_ACCOUNT_SSO = 4242;

    public static final int REQUEST_AUTH_TOKEN_SSO = 4243;
@@ -85,7 +86,7 @@ public class AccountImporter { 
        

        if (appInstalledOrNot(activity)) {

            Intent intent = AccountManager.newChooseAccountIntent(null, null, ACCOUNT_TYPES,

                                                                  true, null, null, null, null);

                    true, null, AUTH_TOKEN_SSO, null, null);

            activity.startActivityForResult(intent, CHOOSE_ACCOUNT_SSO);

        } else {

            throw new NextcloudFilesAppNotInstalledException();
@@ -98,7 +99,7 @@ public class AccountImporter { 
        

        if (appInstalledOrNot(fragment.getContext())) {

            Intent intent = AccountManager.newChooseAccountIntent(null, null, ACCOUNT_TYPES,

                                                                  true, null, null, null, null);

                    true, null, AUTH_TOKEN_SSO, null, null);

            fragment.startActivityForResult(intent, CHOOSE_ACCOUNT_SSO);

        } else {

            throw new NextcloudFilesAppNotInstalledException();