Loading app/build.gradle +7 −2 Original line number Diff line number Diff line Loading @@ -95,12 +95,17 @@ ext { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4' implementation("com.github.nextcloud:android-library:3d422b28376339c0fbd772e480dbbdc56b7ae1a1") { implementation 'com.google.guava:guava:31.1-android' implementation ('commons-httpclient:commons-httpclient:3.1') { exclude group: 'commons-logging', module: 'commons-logging' } implementation("com.github.nextcloud:android-library:2.19.0") { exclude group: 'org.ogce', module: 'xpp3' } // Nextcloud SSO implementation 'com.github.nextcloud.android-common:ui:0.24.0' implementation 'com.github.nextcloud.android-common:ui:0.23.2' implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2' implementation 'com.github.stefan-niedermann:android-commons:1.0.2' implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion" Loading app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java 0 → 100644 +84 −0 Original line number Diff line number Diff line /* * Nextcloud - Android Client * * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com> * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only */ package it.niedermann.owncloud.notes.share.operations; import android.accounts.Account; import android.accounts.AuthenticatorException; import android.accounts.OperationCanceledException; import android.app.Activity; import android.content.Context; import android.net.Uri; import com.nextcloud.common.NextcloudClient; import com.nextcloud.common.PlainClient; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClientFactory; import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; import com.owncloud.android.lib.common.accounts.AccountUtils; import java.io.IOException; import it.niedermann.owncloud.notes.shared.user.User; public class ClientFactoryImpl implements ClientFactory { private Context context; public ClientFactoryImpl(Context context) { this.context = context; } @Override public OwnCloudClient create(User user) throws CreationException { try { return OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(user.toOwnCloudAccount(), context); } catch (OperationCanceledException | AuthenticatorException | IOException e) { throw new CreationException(e); } } @Override public NextcloudClient createNextcloudClient(User user) throws CreationException { try { return OwnCloudClientFactory.createNextcloudClient(user, context); } catch (AccountUtils.AccountNotFoundException e) { throw new CreationException(e); } } @Override public OwnCloudClient create(Account account) throws OperationCanceledException, AuthenticatorException, IOException, AccountUtils.AccountNotFoundException { return OwnCloudClientFactory.createOwnCloudClient(account, context); } @Override public OwnCloudClient create(Account account, Activity currentActivity) throws OperationCanceledException, AuthenticatorException, IOException, AccountUtils.AccountNotFoundException { return OwnCloudClientFactory.createOwnCloudClient(account, context, currentActivity); } @Override public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcloudUserAgent) { return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects); } @Override public OwnCloudClient create(Uri uri, boolean followRedirects) { return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects); } @Override public PlainClient createPlainClient() { return new PlainClient(context); } } Loading
app/build.gradle +7 −2 Original line number Diff line number Diff line Loading @@ -95,12 +95,17 @@ ext { dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4' implementation("com.github.nextcloud:android-library:3d422b28376339c0fbd772e480dbbdc56b7ae1a1") { implementation 'com.google.guava:guava:31.1-android' implementation ('commons-httpclient:commons-httpclient:3.1') { exclude group: 'commons-logging', module: 'commons-logging' } implementation("com.github.nextcloud:android-library:2.19.0") { exclude group: 'org.ogce', module: 'xpp3' } // Nextcloud SSO implementation 'com.github.nextcloud.android-common:ui:0.24.0' implementation 'com.github.nextcloud.android-common:ui:0.23.2' implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2' implementation 'com.github.stefan-niedermann:android-commons:1.0.2' implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion" Loading
app/src/main/java/it/niedermann/owncloud/notes/share/ClientFactoryImpl.java 0 → 100644 +84 −0 Original line number Diff line number Diff line /* * Nextcloud - Android Client * * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com> * SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only */ package it.niedermann.owncloud.notes.share.operations; import android.accounts.Account; import android.accounts.AuthenticatorException; import android.accounts.OperationCanceledException; import android.app.Activity; import android.content.Context; import android.net.Uri; import com.nextcloud.common.NextcloudClient; import com.nextcloud.common.PlainClient; import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClientFactory; import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; import com.owncloud.android.lib.common.accounts.AccountUtils; import java.io.IOException; import it.niedermann.owncloud.notes.shared.user.User; public class ClientFactoryImpl implements ClientFactory { private Context context; public ClientFactoryImpl(Context context) { this.context = context; } @Override public OwnCloudClient create(User user) throws CreationException { try { return OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(user.toOwnCloudAccount(), context); } catch (OperationCanceledException | AuthenticatorException | IOException e) { throw new CreationException(e); } } @Override public NextcloudClient createNextcloudClient(User user) throws CreationException { try { return OwnCloudClientFactory.createNextcloudClient(user, context); } catch (AccountUtils.AccountNotFoundException e) { throw new CreationException(e); } } @Override public OwnCloudClient create(Account account) throws OperationCanceledException, AuthenticatorException, IOException, AccountUtils.AccountNotFoundException { return OwnCloudClientFactory.createOwnCloudClient(account, context); } @Override public OwnCloudClient create(Account account, Activity currentActivity) throws OperationCanceledException, AuthenticatorException, IOException, AccountUtils.AccountNotFoundException { return OwnCloudClientFactory.createOwnCloudClient(account, context, currentActivity); } @Override public OwnCloudClient create(Uri uri, boolean followRedirects, boolean useNextcloudUserAgent) { return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects); } @Override public OwnCloudClient create(Uri uri, boolean followRedirects) { return OwnCloudClientFactory.createOwnCloudClient(uri, context, followRedirects); } @Override public PlainClient createPlainClient() { return new PlainClient(context); } }