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

Unverified Commit 9ac17927 authored by David Luhmer's avatar David Luhmer Committed by GitHub
Browse files

Merge pull request #65 from nextcloud/allowDevAppFixes 

Allow dev app fixes
parents 9aec063c c67f4a25

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

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public class AccountImporter { 
    // Find all currently installed nextcloud accounts on the phone

    public static List<Account> findAccounts(final Context context) {

        final AccountManager accMgr = AccountManager.get(context);

        final Account[] accounts = accMgr.getAccountsByType("nextcloud");

        final Account[] accounts = accMgr.getAccounts();



        List<Account> accountsAvailable = new ArrayList<>();

        for (final Account account : accounts) {

src/main/java/com/nextcloud/android/sso/api/AidlNetworkRequest.java

+3 −4
Original line number Diff line number Diff line
@@ -76,12 +76,11 @@ public class AidlNetworkRequest extends NetworkRequest { 
            stop();

        }



        String componentName;

        if (type != null && type.equalsIgnoreCase(Constants.ACCOUNT_TYPE_DEV)) {

        String componentName = Constants.PACKAGE_NAME_PROD;

        if (type.equals(Constants.ACCOUNT_TYPE_DEV)) {

            componentName = Constants.PACKAGE_NAME_DEV;

        } else {

            componentName = Constants.PACKAGE_NAME_PROD;

        }



        try {

            Intent intentService = new Intent();

            intentService.setComponent(new ComponentName(componentName,

src/main/java/com/nextcloud/android/sso/api/NetworkRequest.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public abstract class NetworkRequest { 




    protected void connect(String type) {

        Log.v(TAG, "Nextcloud Single sign-on connect() called [" + Thread.currentThread().getName() + "]");

        Log.v(TAG, "Nextcloud Single sign-on connect() called [" + Thread.currentThread().getName() + "] Account-Type: [" + type + "]");

        if (mDestroyed) {

            throw new IllegalStateException("API already destroyed! You cannot reuse a stopped API instance");

        }