FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename module readropslibrary to api

This commit is contained in:
Shinokuni 2020-07-19 10:40:53 +02:00
parent 3e2c7e7558
commit 295a34203e
76 changed files with 152 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
readropslibrary/.gitignore → api/.gitignore vendored
View File

0
readropslibrary/build.gradle → api/build.gradle
View File

0
readropslibrary/proguard-rules.pro → api/proguard-rules.pro vendored
View File

2
readropslibrary/src/androidTest/java/com/readrops/readropslibrary/ExampleInstrumentedTest.java → api/src/androidTest/java/com/readrops/api/ExampleInstrumentedTest.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary;
package com.readrops.api;
import android.content.Context;
import androidx.test.InstrumentationRegistry;

2
readropslibrary/src/main/AndroidManifest.xml → api/src/main/AndroidManifest.xml
View File

@ -1,4 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.readrops.readropslibrary">
package="com.readrops.api">
</manifest>

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/AFeed.kt → api/src/main/java/com/readrops/api/localfeed/AFeed.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed
package com.readrops.api.localfeed
/*
A simple class to give an abstract level to rss/atom/json feed classes

16
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQuery.java → api/src/main/java/com/readrops/api/localfeed/RSSQuery.java
View File

@ -1,15 +1,15 @@
package com.readrops.readropslibrary.localfeed;
package com.readrops.api.localfeed;
import android.accounts.NetworkErrorException;
import android.util.Log;
import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
import com.readrops.readropslibrary.localfeed.json.JSONFeed;
import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
import com.readrops.readropslibrary.localfeed.rss.RSSLink;
import com.readrops.readropslibrary.utils.HttpManager;
import com.readrops.readropslibrary.utils.LibUtils;
import com.readrops.readropslibrary.utils.UnknownFormatException;
import com.readrops.api.localfeed.atom.ATOMFeed;
import com.readrops.api.localfeed.json.JSONFeed;
import com.readrops.api.localfeed.rss.RSSFeed;
import com.readrops.api.localfeed.rss.RSSLink;
import com.readrops.api.utils.HttpManager;
import com.readrops.api.utils.LibUtils;
import com.readrops.api.utils.UnknownFormatException;
import com.squareup.moshi.JsonAdapter;
import com.squareup.moshi.Moshi;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSQueryResult.java → api/src/main/java/com/readrops/api/localfeed/RSSQueryResult.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed;
package com.readrops.api.localfeed;
public class RSSQueryResult {

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMAuthor.java → api/src/main/java/com/readrops/api/localfeed/atom/ATOMAuthor.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.atom;
package com.readrops.api.localfeed.atom;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMEntry.java → api/src/main/java/com/readrops/api/localfeed/atom/ATOMEntry.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.atom;
package com.readrops.api.localfeed.atom;
import org.simpleframework.xml.Attribute;
import org.simpleframework.xml.Element;

4
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMFeed.java → api/src/main/java/com/readrops/api/localfeed/atom/ATOMFeed.java
View File

@ -1,6 +1,6 @@
package com.readrops.readropslibrary.localfeed.atom;
package com.readrops.api.localfeed.atom;
import com.readrops.readropslibrary.localfeed.AFeed;
import com.readrops.api.localfeed.AFeed;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/atom/ATOMLink.java → api/src/main/java/com/readrops/api/localfeed/atom/ATOMLink.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.atom;
package com.readrops.api.localfeed.atom;
import org.simpleframework.xml.Attribute;
import org.simpleframework.xml.Root;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONAuthor.kt → api/src/main/java/com/readrops/api/localfeed/json/JSONAuthor.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.json
package com.readrops.api.localfeed.json
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass

4
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONFeed.kt → api/src/main/java/com/readrops/api/localfeed/json/JSONFeed.kt
View File

@ -1,6 +1,6 @@
package com.readrops.readropslibrary.localfeed.json
package com.readrops.api.localfeed.json
import com.readrops.readropslibrary.localfeed.AFeed
import com.readrops.api.localfeed.AFeed
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/json/JSONItem.kt → api/src/main/java/com/readrops/api/localfeed/json/JSONItem.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.json
package com.readrops.api.localfeed.json
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSChannel.java → api/src/main/java/com/readrops/api/localfeed/rss/RSSChannel.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.rss;
package com.readrops.api.localfeed.rss;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSEnclosure.java → api/src/main/java/com/readrops/api/localfeed/rss/RSSEnclosure.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.rss;
package com.readrops.api.localfeed.rss;
import org.simpleframework.xml.Attribute;
import org.simpleframework.xml.Root;

4
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSFeed.java → api/src/main/java/com/readrops/api/localfeed/rss/RSSFeed.java
View File

@ -1,6 +1,6 @@
package com.readrops.readropslibrary.localfeed.rss;
package com.readrops.api.localfeed.rss;
import com.readrops.readropslibrary.localfeed.AFeed;
import com.readrops.api.localfeed.AFeed;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSItem.java → api/src/main/java/com/readrops/api/localfeed/rss/RSSItem.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.rss;
package com.readrops.api.localfeed.rss;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;

3
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSLink.java → api/src/main/java/com/readrops/api/localfeed/rss/RSSLink.java
View File

@ -1,7 +1,6 @@
package com.readrops.readropslibrary.localfeed.rss;
package com.readrops.api.localfeed.rss;
import org.simpleframework.xml.Attribute;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
import org.simpleframework.xml.Text;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/rss/RSSMediaContent.java → api/src/main/java/com/readrops/api/localfeed/rss/RSSMediaContent.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.localfeed.rss;
package com.readrops.api.localfeed.rss;
import org.simpleframework.xml.Attribute;
import org.simpleframework.xml.Root;

6
readropslibrary/src/main/java/com/readrops/readropslibrary/opml/OPMLParser.kt → api/src/main/java/com/readrops/api/opml/OPMLParser.kt
View File

@ -1,9 +1,9 @@
package com.readrops.readropslibrary.opml
package com.readrops.api.opml
import android.content.Context
import android.net.Uri
import com.readrops.readropslibrary.opml.model.OPML
import com.readrops.readropslibrary.utils.LibUtils
import com.readrops.api.opml.model.OPML
import com.readrops.api.utils.LibUtils
import io.reactivex.Completable
import io.reactivex.Single
import org.simpleframework.xml.Serializer

2
readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Body.kt → api/src/main/java/com/readrops/api/opml/model/Body.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.opml.model
package com.readrops.api.opml.model
import org.simpleframework.xml.ElementList
import org.simpleframework.xml.Root

2
readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Head.kt → api/src/main/java/com/readrops/api/opml/model/Head.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.opml.model
package com.readrops.api.opml.model
import org.simpleframework.xml.Element
import org.simpleframework.xml.Root

2
readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/OPML.kt → api/src/main/java/com/readrops/api/opml/model/OPML.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.opml.model
package com.readrops.api.opml.model
import org.simpleframework.xml.Attribute
import org.simpleframework.xml.Element

2
readropslibrary/src/main/java/com/readrops/readropslibrary/opml/model/Outline.kt → api/src/main/java/com/readrops/api/opml/model/Outline.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.opml.model
package com.readrops.api.opml.model
import org.simpleframework.xml.Attribute
import org.simpleframework.xml.ElementList

4
readropslibrary/src/main/java/com/readrops/readropslibrary/services/API.java → api/src/main/java/com/readrops/api/services/API.java
View File

@ -1,8 +1,8 @@
package com.readrops.readropslibrary.services;
package com.readrops.api.services;
import androidx.annotation.NonNull;
import com.readrops.readropslibrary.utils.HttpManager;
import com.readrops.api.utils.HttpManager;
import com.squareup.moshi.Moshi;
import retrofit2.Retrofit;

6
readropslibrary/src/main/java/com/readrops/readropslibrary/services/Credentials.java → api/src/main/java/com/readrops/api/services/Credentials.java
View File

@ -1,10 +1,10 @@
package com.readrops.readropslibrary.services;
package com.readrops.api.services;
import androidx.annotation.Nullable;
import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropslibrary.services.freshrss.FreshRSSCredentials;
import com.readrops.readropslibrary.services.nextcloudnews.NextNewsCredentials;
import com.readrops.api.services.freshrss.FreshRSSCredentials;
import com.readrops.api.services.nextcloudnews.NextNewsCredentials;
public abstract class Credentials {

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/SyncResult.kt → api/src/main/java/com/readrops/api/services/SyncResult.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services
package com.readrops.api.services
import com.readrops.readropsdb.entities.Feed
import com.readrops.readropsdb.entities.Folder

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/SyncType.java → api/src/main/java/com/readrops/api/services/SyncType.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services;
package com.readrops.api.services;
public enum SyncType {
INITIAL_SYNC,

18
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSAPI.java → api/src/main/java/com/readrops/api/services/freshrss/FreshRSSAPI.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.freshrss;
package com.readrops.api.services.freshrss;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -6,14 +6,14 @@ import androidx.annotation.Nullable;
import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropslibrary.services.API;
import com.readrops.readropslibrary.services.Credentials;
import com.readrops.readropslibrary.services.SyncResult;
import com.readrops.readropslibrary.services.SyncType;
import com.readrops.readropslibrary.services.freshrss.adapters.FreshRSSFeedsAdapter;
import com.readrops.readropslibrary.services.freshrss.adapters.FreshRSSFoldersAdapter;
import com.readrops.readropslibrary.services.freshrss.adapters.FreshRSSItemsAdapter;
import com.readrops.readropslibrary.services.freshrss.json.FreshRSSUserInfo;
import com.readrops.api.services.API;
import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncResult;
import com.readrops.api.services.SyncType;
import com.readrops.api.services.freshrss.adapters.FreshRSSFeedsAdapter;
import com.readrops.api.services.freshrss.adapters.FreshRSSFoldersAdapter;
import com.readrops.api.services.freshrss.adapters.FreshRSSItemsAdapter;
import com.readrops.api.services.freshrss.json.FreshRSSUserInfo;
import com.squareup.moshi.Moshi;
import com.squareup.moshi.Types;

4
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSCredentials.java → api/src/main/java/com/readrops/api/services/freshrss/FreshRSSCredentials.java
View File

@ -1,6 +1,6 @@
package com.readrops.readropslibrary.services.freshrss;
package com.readrops.api.services.freshrss;
import com.readrops.readropslibrary.services.Credentials;
import com.readrops.api.services.Credentials;
public class FreshRSSCredentials extends Credentials {

4
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSService.java → api/src/main/java/com/readrops/api/services/freshrss/FreshRSSService.java
View File

@ -1,9 +1,9 @@
package com.readrops.readropslibrary.services.freshrss;
package com.readrops.api.services.freshrss;
import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropslibrary.services.freshrss.json.FreshRSSUserInfo;
import com.readrops.api.services.freshrss.json.FreshRSSUserInfo;
import java.util.List;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/FreshRSSSyncData.java → api/src/main/java/com/readrops/api/services/freshrss/FreshRSSSyncData.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.freshrss;
package com.readrops.api.services.freshrss;
import java.util.ArrayList;
import java.util.List;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSFeedsAdapter.kt → api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFeedsAdapter.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.freshrss.adapters
package com.readrops.api.services.freshrss.adapters
import android.annotation.SuppressLint
import com.readrops.readropsdb.entities.Feed

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSFoldersAdapter.kt → api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSFoldersAdapter.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.freshrss.adapters
package com.readrops.api.services.freshrss.adapters
import android.annotation.SuppressLint
import com.readrops.readropsdb.entities.Folder

4
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/adapters/FreshRSSItemsAdapter.kt → api/src/main/java/com/readrops/api/services/freshrss/adapters/FreshRSSItemsAdapter.kt
View File

@ -1,8 +1,8 @@
package com.readrops.readropslibrary.services.freshrss.adapters
package com.readrops.api.services.freshrss.adapters
import android.util.TimingLogger
import com.readrops.readropsdb.entities.Item
import com.readrops.readropslibrary.services.freshrss.FreshRSSAPI.GOOGLE_READ
import com.readrops.api.services.freshrss.FreshRSSAPI.GOOGLE_READ
import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.JsonReader
import com.squareup.moshi.JsonWriter

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/freshrss/json/FreshRSSUserInfo.kt → api/src/main/java/com/readrops/api/services/freshrss/json/FreshRSSUserInfo.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.freshrss.json
package com.readrops.api.services.freshrss.json
import com.squareup.moshi.JsonClass

24
readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsAPI.java → api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsAPI.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.nextcloudnews;
package com.readrops.api.services.nextcloudnews;
import android.content.res.Resources;
@ -8,17 +8,17 @@ import androidx.annotation.Nullable;
import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropslibrary.services.API;
import com.readrops.readropslibrary.services.Credentials;
import com.readrops.readropslibrary.services.SyncResult;
import com.readrops.readropslibrary.services.SyncType;
import com.readrops.readropslibrary.services.nextcloudnews.adapters.NextNewsFeedsAdapter;
import com.readrops.readropslibrary.services.nextcloudnews.adapters.NextNewsFoldersAdapter;
import com.readrops.readropslibrary.services.nextcloudnews.adapters.NextNewsItemsAdapter;
import com.readrops.readropslibrary.services.nextcloudnews.json.NextNewsUser;
import com.readrops.readropslibrary.utils.ConflictException;
import com.readrops.readropslibrary.utils.LibUtils;
import com.readrops.readropslibrary.utils.UnknownFormatException;
import com.readrops.api.services.API;
import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncResult;
import com.readrops.api.services.SyncType;
import com.readrops.api.services.nextcloudnews.adapters.NextNewsFeedsAdapter;
import com.readrops.api.services.nextcloudnews.adapters.NextNewsFoldersAdapter;
import com.readrops.api.services.nextcloudnews.adapters.NextNewsItemsAdapter;
import com.readrops.api.services.nextcloudnews.json.NextNewsUser;
import com.readrops.api.utils.ConflictException;
import com.readrops.api.utils.LibUtils;
import com.readrops.api.utils.UnknownFormatException;
import com.squareup.moshi.Moshi;
import com.squareup.moshi.Types;

4
readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsCredentials.java → api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsCredentials.java
View File

@ -1,6 +1,6 @@
package com.readrops.readropslibrary.services.nextcloudnews;
package com.readrops.api.services.nextcloudnews;
import com.readrops.readropslibrary.services.Credentials;
import com.readrops.api.services.Credentials;
public class NextNewsCredentials extends Credentials {

4
readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsService.java → api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsService.java
View File

@ -1,9 +1,9 @@
package com.readrops.readropslibrary.services.nextcloudnews;
package com.readrops.api.services.nextcloudnews;
import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropslibrary.services.nextcloudnews.json.NextNewsUser;
import com.readrops.api.services.nextcloudnews.json.NextNewsUser;
import java.util.List;
import java.util.Map;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/NextNewsSyncData.java → api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsSyncData.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.nextcloudnews;
package com.readrops.api.services.nextcloudnews;
import java.util.ArrayList;
import java.util.List;

4
readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt → api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt
View File

@ -1,8 +1,8 @@
package com.readrops.readropslibrary.services.nextcloudnews.adapters
package com.readrops.api.services.nextcloudnews.adapters
import android.annotation.SuppressLint
import com.readrops.readropsdb.entities.Feed
import com.readrops.readropslibrary.utils.nextNullableString
import com.readrops.api.utils.nextNullableString
import com.squareup.moshi.FromJson
import com.squareup.moshi.JsonReader
import com.squareup.moshi.ToJson

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt → api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFoldersAdapter.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.nextcloudnews.adapters
package com.readrops.api.services.nextcloudnews.adapters
import android.annotation.SuppressLint
import com.readrops.readropsdb.entities.Folder

6
readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt → api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt
View File

@ -1,9 +1,9 @@
package com.readrops.readropslibrary.services.nextcloudnews.adapters
package com.readrops.api.services.nextcloudnews.adapters
import android.annotation.SuppressLint
import com.readrops.readropsdb.entities.Item
import com.readrops.readropslibrary.utils.LibUtils
import com.readrops.readropslibrary.utils.nextNullableString
import com.readrops.api.utils.LibUtils
import com.readrops.api.utils.nextNullableString
import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.JsonReader
import com.squareup.moshi.JsonWriter

2
readropslibrary/src/main/java/com/readrops/readropslibrary/services/nextcloudnews/json/NextNewsUser.kt → api/src/main/java/com/readrops/api/services/nextcloudnews/json/NextNewsUser.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.services.nextcloudnews.json
package com.readrops.api.services.nextcloudnews.json
import com.squareup.moshi.JsonClass

2
readropslibrary/src/main/java/com/readrops/readropslibrary/utils/ConflictException.java → api/src/main/java/com/readrops/api/utils/ConflictException.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.utils;
package com.readrops.api.utils;
public class ConflictException extends Exception {

4
readropslibrary/src/main/java/com/readrops/readropslibrary/utils/HttpManager.java → api/src/main/java/com/readrops/api/utils/HttpManager.java
View File

@ -1,8 +1,8 @@
package com.readrops.readropslibrary.utils;
package com.readrops.api.utils;
import androidx.annotation.Nullable;
import com.readrops.readropslibrary.services.Credentials;
import com.readrops.api.services.Credentials;
import java.io.IOException;
import java.util.concurrent.TimeUnit;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/utils/JsonReaderExtensions.kt → api/src/main/java/com/readrops/api/utils/JsonReaderExtensions.kt
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.utils
package com.readrops.api.utils
import com.squareup.moshi.JsonReader

2
readropslibrary/src/main/java/com/readrops/readropslibrary/utils/LibUtils.java → api/src/main/java/com/readrops/api/utils/LibUtils.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.utils;
package com.readrops.api.utils;
import android.content.Context;
import android.net.Uri;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/utils/ParseException.java → api/src/main/java/com/readrops/api/utils/ParseException.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.utils;
package com.readrops.api.utils;
public class ParseException extends Exception {

2
readropslibrary/src/main/java/com/readrops/readropslibrary/utils/UnknownFormatException.java → api/src/main/java/com/readrops/api/utils/UnknownFormatException.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary.utils;
package com.readrops.api.utils;
public class UnknownFormatException extends Exception {

0
readropslibrary/src/main/res/values/strings.xml → api/src/main/res/values/strings.xml
View File

2
readropslibrary/src/test/java/com/readrops/readropslibrary/ExampleUnitTest.java → api/src/test/java/com/readrops/api/ExampleUnitTest.java
View File

@ -1,4 +1,4 @@
package com.readrops.readropslibrary;
package com.readrops.api;
import org.junit.Test;

2
app/build.gradle
View File

@ -53,7 +53,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':readropslibrary')
implementation project(':api')
implementation project(':readropsdb')
implementation 'androidx.appcompat:appcompat:1.1.0'

8
app/proguard-rules.pro vendored
View File

@ -26,9 +26,9 @@
-keep class org.simpleframework.xml.** { *; }
-keep class com.readrops.readropslibrary.services.freshrss.json.** { *; }
-keep class com.readrops.readropslibrary.services.nextcloudnews.json.** { *; }
-keep class com.readrops.api.services.freshrss.json.** { *; }
-keep class com.readrops.api.services.nextcloudnews.json.** { *; }
-keep class com.readrops.readropslibrary.localfeed.** { *; }
-keep class com.readrops.api.localfeed.** { *; }
-keep class com.readrops.readropslibrary.opml.model.** { *; }
-keep class com.readrops.api.opml.model.** { *; }

2
app/src/androidTest/java/com/readrops/app/SyncResultAnalyserTest.kt
View File

@ -10,7 +10,7 @@ import com.readrops.readropsdb.entities.Feed
import com.readrops.readropsdb.entities.Item
import com.readrops.readropsdb.entities.account.Account
import com.readrops.readropsdb.entities.account.AccountType
import com.readrops.readropslibrary.services.SyncResult
import com.readrops.api.services.SyncResult
import org.joda.time.LocalDateTime
import org.junit.After
import org.junit.Assert.assertEquals

2
app/src/debug/java/com/readrops/app/ReadropsDebugApp.java
View File

@ -19,7 +19,7 @@ import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPl
import com.facebook.soloader.SoLoader;
import com.icapps.niddler.core.AndroidNiddler;
import com.icapps.niddler.interceptor.okhttp.NiddlerOkHttpInterceptor;
import com.readrops.readropslibrary.utils.HttpManager;
import com.readrops.api.utils.HttpManager;
public class ReadropsDebugApp extends ReadropsApp implements Configuration.Provider {

4
app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java
View File

@ -20,8 +20,8 @@ import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropslibrary.utils.ConflictException;
import com.readrops.readropslibrary.utils.UnknownFormatException;
import com.readrops.api.utils.ConflictException;
import com.readrops.api.utils.UnknownFormatException;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;

4
app/src/main/java/com/readrops/app/fragments/FoldersFragment.java
View File

@ -22,8 +22,8 @@ import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel;
import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropslibrary.utils.ConflictException;
import com.readrops.readropslibrary.utils.UnknownFormatException;
import com.readrops.api.utils.ConflictException;
import com.readrops.api.utils.UnknownFormatException;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.observers.DisposableSingleObserver;

4
app/src/main/java/com/readrops/app/fragments/settings/AccountSettingsFragment.java
View File

@ -34,8 +34,8 @@ import com.readrops.app.utils.matchers.OPMLMatcher;
import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropsdb.entities.account.AccountType;
import com.readrops.readropslibrary.opml.OPMLParser;
import com.readrops.readropslibrary.opml.model.OPML;
import com.readrops.api.opml.OPMLParser;
import com.readrops.api.opml.model.OPML;
import java.io.File;
import java.io.FileOutputStream;

2
app/src/main/java/com/readrops/app/repositories/ARepository.java
View File

@ -16,7 +16,7 @@ import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropsdb.entities.account.AccountType;
import com.readrops.readropslibrary.services.SyncResult;
import com.readrops.api.services.SyncResult;
import java.util.ArrayList;
import java.util.List;

10
app/src/main/java/com/readrops/app/repositories/FreshRSSRepository.java
View File

@ -14,11 +14,11 @@ import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropslibrary.services.Credentials;
import com.readrops.readropslibrary.services.SyncType;
import com.readrops.readropslibrary.services.freshrss.FreshRSSAPI;
import com.readrops.readropslibrary.services.freshrss.FreshRSSCredentials;
import com.readrops.readropslibrary.services.freshrss.FreshRSSSyncData;
import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncType;
import com.readrops.api.services.freshrss.FreshRSSAPI;
import com.readrops.api.services.freshrss.FreshRSSCredentials;
import com.readrops.api.services.freshrss.FreshRSSSyncData;
import org.joda.time.DateTime;

20
app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java
View File

@ -16,16 +16,16 @@ import com.readrops.app.utils.matchers.ItemMatcher;
import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropslibrary.localfeed.AFeed;
import com.readrops.readropslibrary.localfeed.RSSQuery;
import com.readrops.readropslibrary.localfeed.RSSQueryResult;
import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
import com.readrops.readropslibrary.localfeed.json.JSONFeed;
import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
import com.readrops.readropslibrary.services.SyncResult;
import com.readrops.readropslibrary.utils.LibUtils;
import com.readrops.readropslibrary.utils.ParseException;
import com.readrops.readropslibrary.utils.UnknownFormatException;
import com.readrops.api.localfeed.AFeed;
import com.readrops.api.localfeed.RSSQuery;
import com.readrops.api.localfeed.RSSQueryResult;
import com.readrops.api.localfeed.atom.ATOMFeed;
import com.readrops.api.localfeed.json.JSONFeed;
import com.readrops.api.localfeed.rss.RSSFeed;
import com.readrops.api.services.SyncResult;
import com.readrops.api.utils.LibUtils;
import com.readrops.api.utils.ParseException;
import com.readrops.api.utils.UnknownFormatException;
import org.jsoup.Jsoup;

14
app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java
View File

@ -14,13 +14,13 @@ import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Folder;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropslibrary.services.Credentials;
import com.readrops.readropslibrary.services.SyncResult;
import com.readrops.readropslibrary.services.SyncType;
import com.readrops.readropslibrary.services.nextcloudnews.NextNewsAPI;
import com.readrops.readropslibrary.services.nextcloudnews.NextNewsSyncData;
import com.readrops.readropslibrary.services.nextcloudnews.json.NextNewsUser;
import com.readrops.readropslibrary.utils.UnknownFormatException;
import com.readrops.api.services.Credentials;
import com.readrops.api.services.SyncResult;
import com.readrops.api.services.SyncType;
import com.readrops.api.services.nextcloudnews.NextNewsAPI;
import com.readrops.api.services.nextcloudnews.NextNewsSyncData;
import com.readrops.api.services.nextcloudnews.json.NextNewsUser;
import com.readrops.api.utils.UnknownFormatException;
import org.joda.time.LocalDateTime;

4
app/src/main/java/com/readrops/app/utils/HtmlParser.java
View File

@ -5,8 +5,8 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.readrops.readropslibrary.utils.HttpManager;
import com.readrops.readropslibrary.utils.LibUtils;
import com.readrops.api.utils.HttpManager;
import com.readrops.api.utils.LibUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;

2
app/src/main/java/com/readrops/app/utils/SyncResultAnalyser.kt
View File

@ -8,7 +8,7 @@ import com.readrops.readropsdb.Database
import com.readrops.readropsdb.entities.Feed
import com.readrops.readropsdb.entities.Item
import com.readrops.readropsdb.entities.account.Account
import com.readrops.readropslibrary.services.SyncResult
import com.readrops.api.services.SyncResult
/**
* Simple class to get synchro notification content (title, content and largeIcon) according to some rules

2
app/src/main/java/com/readrops/app/utils/SyncResultDebugData.kt
View File

@ -5,7 +5,7 @@ import com.readrops.readropsdb.Database
import com.readrops.readropsdb.entities.Item
import com.readrops.readropsdb.entities.account.Account
import com.readrops.readropsdb.entities.account.AccountType
import com.readrops.readropslibrary.services.SyncResult
import com.readrops.api.services.SyncResult
import org.jetbrains.annotations.TestOnly
class SyncResultDebugData {

2
app/src/main/java/com/readrops/app/utils/SyncWorker.kt
View File

@ -16,7 +16,7 @@ import com.readrops.app.repositories.ARepository
import com.readrops.readropsdb.Database
import com.readrops.readropsdb.entities.Item
import com.readrops.readropsdb.entities.account.Account
import com.readrops.readropslibrary.services.SyncResult
import com.readrops.api.services.SyncResult
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers

2
app/src/main/java/com/readrops/app/utils/Utils.java
View File

@ -15,7 +15,7 @@ import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import com.google.android.material.snackbar.Snackbar;
import com.readrops.readropslibrary.utils.HttpManager;
import com.readrops.api.utils.HttpManager;
import org.jsoup.Jsoup;

8
app/src/main/java/com/readrops/app/utils/matchers/FeedMatcher.java
View File

@ -1,10 +1,10 @@
package com.readrops.app.utils.matchers;
import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropslibrary.localfeed.atom.ATOMFeed;
import com.readrops.readropslibrary.localfeed.json.JSONFeed;
import com.readrops.readropslibrary.localfeed.rss.RSSChannel;
import com.readrops.readropslibrary.localfeed.rss.RSSFeed;
import com.readrops.api.localfeed.atom.ATOMFeed;
import com.readrops.api.localfeed.json.JSONFeed;
import com.readrops.api.localfeed.rss.RSSChannel;
import com.readrops.api.localfeed.rss.RSSFeed;
import org.jsoup.Jsoup;

12
app/src/main/java/com/readrops/app/utils/matchers/ItemMatcher.java
View File

@ -4,12 +4,12 @@ import com.readrops.app.utils.DateUtils;
import com.readrops.app.utils.Utils;
import com.readrops.readropsdb.entities.Feed;
import com.readrops.readropsdb.entities.Item;
import com.readrops.readropslibrary.localfeed.atom.ATOMEntry;
import com.readrops.readropslibrary.localfeed.json.JSONItem;
import com.readrops.readropslibrary.localfeed.rss.RSSEnclosure;
import com.readrops.readropslibrary.localfeed.rss.RSSItem;
import com.readrops.readropslibrary.localfeed.rss.RSSMediaContent;
import com.readrops.readropslibrary.utils.ParseException;
import com.readrops.api.localfeed.atom.ATOMEntry;
import com.readrops.api.localfeed.json.JSONItem;
import com.readrops.api.localfeed.rss.RSSEnclosure;
import com.readrops.api.localfeed.rss.RSSItem;
import com.readrops.api.localfeed.rss.RSSMediaContent;
import com.readrops.api.utils.ParseException;
import java.util.ArrayList;
import java.util.List;

8
app/src/main/java/com/readrops/app/utils/matchers/OPMLMatcher.kt
View File

@ -4,10 +4,10 @@ import android.content.Context
import com.readrops.app.R
import com.readrops.readropsdb.entities.Feed
import com.readrops.readropsdb.entities.Folder
import com.readrops.readropslibrary.opml.model.Body
import com.readrops.readropslibrary.opml.model.Head
import com.readrops.readropslibrary.opml.model.OPML
import com.readrops.readropslibrary.opml.model.Outline
import com.readrops.api.opml.model.Body
import com.readrops.api.opml.model.Head
import com.readrops.api.opml.model.OPML
import com.readrops.api.opml.model.Outline
object OPMLMatcher {

2
app/src/main/java/com/readrops/app/viewmodels/AccountViewModel.java
View File

@ -14,7 +14,7 @@ import com.readrops.readropsdb.entities.account.Account;
import com.readrops.readropsdb.entities.account.AccountType;
import com.readrops.app.repositories.ARepository;
import com.readrops.app.utils.matchers.OPMLMatcher;
import com.readrops.readropslibrary.opml.OPMLParser;
import com.readrops.api.opml.OPMLParser;
import java.util.List;
import java.util.Map;

2
app/src/main/java/com/readrops/app/viewmodels/AddFeedsViewModel.java
View File

@ -13,7 +13,7 @@ import com.readrops.app.repositories.ARepository;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.HtmlParser;
import com.readrops.app.utils.ParsingResult;
import com.readrops.readropslibrary.localfeed.RSSQuery;
import com.readrops.api.localfeed.RSSQuery;
import java.util.ArrayList;
import java.util.List;

2
settings.gradle
View File

@ -1 +1 @@
include ':app', ':readropslibrary', ':readropsdb'
include ':app', ':api', ':readropsdb'