wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #641 from nextcloud/packageRenaming

Browse source 
Package renaming
This commit is contained in:
David Luhmer 2018-07-28 16:31:53 +02:00 committed by GitHub
commit f281bc8aa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
News-Android-App/build.gradle
View file

@ -101,7 +101,7 @@ dependencies {
// You must install or update the Google Repository through the SDK manager to use this dependency.
// The Google Repository (separate from the corresponding library) can be found in the Extras category.
// implementation 'com.google.android.gms:play-services:4.2.42'
implementation "com.github.nextcloud:android-SingleSignOn:sso-SNAPSHOT"
implementation "com.github.nextcloud:android-SingleSignOn:packageRenaming-SNAPSHOT"
implementation "com.android.support:support-v4:${SUPPORT_VERSION}"
implementation "com.android.support:support-compat:${SUPPORT_VERSION}"
implementation "com.android.support:appcompat-v7:${SUPPORT_VERSION}"

16
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogFragment.java
View file

@ -58,6 +58,14 @@ import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;
import com.nextcloud.android.sso.AccountImporter;
import com.nextcloud.android.sso.api.NextcloudAPI;
import com.nextcloud.android.sso.exceptions.NextcloudFilesAppNotInstalledException;
import com.nextcloud.android.sso.helper.SingleAccountHelper;
import com.nextcloud.android.sso.interfaces.IAccountImport;
import com.nextcloud.android.sso.model.SingleSignOnAccount;
import com.nextcloud.android.sso.ui.UiExceptionManager;
import java.net.MalformedURLException;
import java.net.URL;
@ -65,12 +73,6 @@ import javax.inject.Inject;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.luhmer.owncloud.accountimporter.AccountImporter;
import de.luhmer.owncloud.accountimporter.api.NextcloudAPI;
import de.luhmer.owncloud.accountimporter.exceptions.NextcloudFilesAppNotInstalledException;
import de.luhmer.owncloud.accountimporter.helper.SingleAccountHelper;
import de.luhmer.owncloud.accountimporter.model.SingleSignOnAccount;
import de.luhmer.owncloud.accountimporter.ui.UiExceptionManager;
import de.luhmer.owncloudnewsreader.authentication.AuthenticatorActivity;
import de.luhmer.owncloudnewsreader.database.DatabaseConnectionOrm;
import de.luhmer.owncloudnewsreader.di.ApiProvider;
@ -84,7 +86,7 @@ import io.reactivex.schedulers.Schedulers;
import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
import static de.luhmer.owncloud.accountimporter.AccountImporter.CHOOSE_ACCOUNT_SSO;
import static com.nextcloud.android.sso.AccountImporter.CHOOSE_ACCOUNT_SSO;
/**
* Activity which displays a login screen to the user, offering registration as

7
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
View file

@ -62,6 +62,10 @@ import android.widget.SearchView;
import android.widget.TextView;
import android.widget.Toast;
import com.nextcloud.android.sso.api.NextcloudAPI;
import com.nextcloud.android.sso.exceptions.SSOException;
import com.nextcloud.android.sso.ui.UiExceptionManager;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@ -72,9 +76,6 @@ import java.util.concurrent.TimeUnit;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.luhmer.owncloud.accountimporter.api.NextcloudAPI;
import de.luhmer.owncloud.accountimporter.exceptions.SSOException;
import de.luhmer.owncloud.accountimporter.ui.UiExceptionManager;
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
import de.luhmer.owncloudnewsreader.LoginDialogFragment.LoginSuccessfulListener;
import de.luhmer.owncloudnewsreader.adapter.NewsListRecyclerAdapter;

10
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/di/ApiProvider.java
View file

@ -6,16 +6,16 @@ import android.content.SharedPreferences;
import android.support.annotation.NonNull;
import android.util.Log;
import com.nextcloud.android.sso.AccountImporter;
import com.nextcloud.android.sso.api.NextcloudAPI;
import com.nextcloud.android.sso.exceptions.SSOException;
import com.nextcloud.android.sso.helper.SingleAccountHelper;
import com.nextcloud.android.sso.model.SingleSignOnAccount;
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import de.luhmer.owncloud.accountimporter.AccountImporter;
import de.luhmer.owncloud.accountimporter.api.NextcloudAPI;
import de.luhmer.owncloud.accountimporter.exceptions.SSOException;
import de.luhmer.owncloud.accountimporter.helper.SingleAccountHelper;
import de.luhmer.owncloud.accountimporter.model.SingleSignOnAccount;
import de.luhmer.owncloudnewsreader.SettingsActivity;
import de.luhmer.owncloudnewsreader.helper.GsonConfig;
import de.luhmer.owncloudnewsreader.reader.OkHttpImageDownloader;

10
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/API_SSO.java
View file

@ -1,15 +1,14 @@
package de.luhmer.owncloudnewsreader.reader.nextcloud;
import com.google.gson.reflect.TypeToken;
import com.nextcloud.android.sso.aidl.NextcloudRequest;
import com.nextcloud.android.sso.api.NextcloudAPI;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import de.luhmer.owncloud.accountimporter.aidl.NextcloudRequest;
import de.luhmer.owncloud.accountimporter.api.NextcloudAPI;
import de.luhmer.owncloud.accountimporter.helper.Okhttp3Helper;
import de.luhmer.owncloud.accountimporter.helper.ReactivexHelper;
import de.luhmer.owncloud.accountimporter.helper.Retrofit2Helper;
@ -216,10 +215,5 @@ public class API_SSO implements API {
}
return Retrofit2Helper.WrapVoidCall(false);
}
} catch (Exception e) {
e.printStackTrace();
}
}
}

0
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/reader/nextcloud/API_SSO_Helper.java Normal file
View file