add support for dev app

[tobiasKaminsky]

Signed-off-by: tobiasKaminsky tobias@kaminsky.me

[tobiasKaminsky]

SSO has hard dependendcies to Nextcloud File app:

Android-SingleSignOn/src/main/java/com/nextcloud/android/sso/helper/VersionCheckHelper.java

Lines 35 to 40 in 2ffb234

	public static int getNextcloudFilesVersionCode(Activity activity) throws PackageManager.NameNotFoundException {
	PackageInfo pInfo = activity.getPackageManager().getPackageInfo("com.nextcloud.client", 0);
	int verCode = pInfo.versionCode;
	Log.e("VersionCheckHelper", "Version Code: " + verCode);
	return verCode;
	}

Android-SingleSignOn/src/main/java/com/nextcloud/android/sso/api/AidlNetworkRequest.java

Lines 79 to 84 in 53355e8

	Intent intentService = new Intent();
	intentService.setComponent(new ComponentName("com.nextcloud.client",
	"com.owncloud.android.services.AccountManagerService"));
	if (!mContext.bindService(intentService, mConnection, Context.BIND_AUTO_CREATE)) {
	Log.d(TAG, "Binding to AccountManagerService returned false");
	throw new IllegalStateException("Binding to AccountManagerService returned false");

Android-SingleSignOn/src/main/java/com/nextcloud/android/sso/AccountImporter.java

Lines 278 to 289 in c9dc53d

	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"));
	authIntent.putExtra(NEXTCLOUD_FILES_ACCOUNT, account);
	return authIntent;
	}

Question is how / if we can also support dev version there.

[David-Development]

For reference from our Telegram chat:

Es gibt wirklich noch einiges zu beachten da der Service entsprechend der jeweiligen App gebunden werden muss. Bin mir noch nicht über Seiteneffekte bei Verwendung von multi Accounts im klaren. Erste Idee ist, dass wir uns für jeden Account speichern müssen von welchem package er ist und dementsprechend den Service binden müssen. Tobi hatte ja bereits die entsprechenden Stellen im Code angegeben.

Der Vollständigkeit wegen: hier der Bug-Report der schon seit einigen Monaten offen ist: #46

@tobiasKaminsky Just thought about #49 .. this will make it quite hard to support both apps (normal and dev) as we need to connect to both apps and get an account list.

[tobiasKaminsky]

need to connect to both apps and get an account list.

as this is a "one time" action, only when adding an account, I think this is ok.

[tobiasKaminsky]

This should be ready to test

[tobiasKaminsky]

@stefan-niedermann @desperateCoder can you both include this in your app and test?

[David-Development]

as this is a "one time" action, only when adding an account, I think this is ok.

@tobiasKaminsky so for all the requests we'll just use the nextcloud files app? (and not the dev app?)

Does the normal app has access to the account data of the dev app? The actual account data is required for the actual network call to the nextcloud, isn't it?

[tobiasKaminsky]

as this is a "one time" action, only when adding an account, I think this is ok.

@tobiasKaminsky so for all the requests we'll just use the nextcloud files app? (and not the dev app?)

Does the normal app has access to the account data of the dev app? The actual account data is required for the actual network call to the nextcloud, isn't it?

No, I was referring to "fetch accounts from both apps". This is a "one time" action while adding accounts, which does not happen that offen.

As far as I tested, this PR allows to use both apps.
Please test it again so that it is really working as desired. I tested like this:

• official app: account on server A
• dev app: account on server B
• 3rd party app sees both accounts
• 3rd party app can switch between both accounts on the fly and do stuff
  (I tested it with deck)

[stefan-niedermann]

lgtm - looking forward to use it in deck :)

[David-Development]

@tobiasKaminsky I was a little confused at first how the network requests will be made but I just saw that you added some logic to whether to connect to the nextcloud service or the nextcloud dev service. This line made things much clearer to me:

Android-SingleSignOn/src/main/java/com/nextcloud/android/sso/api/AidlNetworkRequest.java

Line 79 in c67f4a2

String componentName = Constants.PACKAGE_NAME_PROD;

After running some tests, I couldn't select an account from the dev app as the line final Account[] accounts = accMgr.getAccountsByType("nextcloud"); in the AccountImporter was only returning accounts of the type "nextcloud". After changing it to final Account[] accounts = accMgr.getAccounts(); the login worked. How did you manage to get in running without that line?

This PR looks good to me! Great work! :) I created a PR with a few minor fixes in #65.

And sorry for the delay!..

[tobiasKaminsky]

How did you manage to get in running without that line?

Good question, :/
Maybe I tested it wrongly, but your fixes make sense.
Thanks for testing!

[desperateCoder]

Yay, thank you! When are you gonna build a release approximately?

[David-Development]

@desperateCoder right now! https://github.com/nextcloud/Android-SingleSignOn/releases/tag/0.4.0

[desperateCoder]

Thanks buddy! Hope you will be @ the NC conference, so I can offer you a beer for your support! Same for @tobiasKaminsky btw!

[desperateCoder]

@David-Development @tobiasKaminsky , just tested it for Deck, works great! Thanks again!