FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganize matchers in a sub package

Browse Source
This commit is contained in:
Shinokuni 2019-11-10 18:24:00 +01:00
parent 6c8236d67d
commit bb4308e01f
12 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -9,7 +9,7 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:name=".utils.ReadropsApp"
android:name=".ReadropsApp"
android:allowBackup="true"
android:icon="@drawable/ic_readrops"
android:label="@string/app_name"

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

@ -1,4 +1,4 @@
package com.readrops.app.utils;
package com.readrops.app;
import android.app.Application;
import android.app.NotificationChannel;
@ -6,8 +6,6 @@ import android.app.NotificationManager;
import android.os.Build;
import com.facebook.stetho.Stetho;
import com.readrops.app.BuildConfig;
import com.readrops.app.R;
import io.reactivex.plugins.RxJavaPlugins;

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

@ -28,8 +28,8 @@ import com.readrops.app.activities.AddAccountActivity;
import com.readrops.app.activities.ManageFeedsFoldersActivity;
import com.readrops.app.database.entities.account.Account;
import com.readrops.app.database.entities.account.AccountType;
import com.readrops.app.utils.OPMLMatcher;
import com.readrops.app.utils.ReadropsApp;
import com.readrops.app.utils.matchers.OPMLMatcher;
import com.readrops.app.ReadropsApp;
import com.readrops.app.utils.Utils;
import com.readrops.app.viewmodels.AccountViewModel;
import com.readrops.readropslibrary.opml.OPMLParser;
@ -192,7 +192,7 @@ public class AccountSettingsFragment extends PreferenceFragmentCompat {
}
private void parseOPMLFile(Uri uri, MaterialDialog dialog) {
OPMLParser.parse(uri, getContext())
OPMLParser.read(uri, getContext())
.flatMapCompletable(opml -> viewModel.insertOPMLFoldersAndFeeds(opml))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())

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

@ -12,8 +12,8 @@ import com.readrops.app.database.entities.Folder;
import com.readrops.app.database.entities.Item;
import com.readrops.app.database.entities.account.Account;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.FeedMatcher;
import com.readrops.app.utils.ItemMatcher;
import com.readrops.app.utils.matchers.FeedMatcher;
import com.readrops.app.utils.matchers.ItemMatcher;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.utils.Utils;
import com.readrops.readropslibrary.services.SyncType;

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

@ -10,9 +10,9 @@ import com.readrops.app.database.entities.Feed;
import com.readrops.app.database.entities.Item;
import com.readrops.app.database.entities.account.Account;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.FeedMatcher;
import com.readrops.app.utils.matchers.FeedMatcher;
import com.readrops.app.utils.HtmlParser;
import com.readrops.app.utils.ItemMatcher;
import com.readrops.app.utils.matchers.ItemMatcher;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.utils.SharedPreferencesManager;
import com.readrops.app.utils.Utils;

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

@ -12,8 +12,8 @@ import com.readrops.app.database.entities.Folder;
import com.readrops.app.database.entities.Item;
import com.readrops.app.database.entities.account.Account;
import com.readrops.app.utils.FeedInsertionResult;
import com.readrops.app.utils.FeedMatcher;
import com.readrops.app.utils.ItemMatcher;
import com.readrops.app.utils.matchers.FeedMatcher;
import com.readrops.app.utils.matchers.ItemMatcher;
import com.readrops.app.utils.ParsingResult;
import com.readrops.app.utils.Utils;
import com.readrops.readropslibrary.services.SyncType;

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

@ -8,7 +8,7 @@ import androidx.core.content.ContextCompat
import com.readrops.app.R
import com.readrops.app.database.Database
import com.readrops.app.database.entities.Feed
import com.readrops.app.utils.ReadropsApp
import com.readrops.app.ReadropsApp
class FeedsColorsIntentService : IntentService("FeedsColorsIntentService") {

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

@ -1,4 +1,4 @@
package com.readrops.app.utils;
package com.readrops.app.utils.matchers;
import com.readrops.app.database.entities.Feed;
import com.readrops.app.database.entities.account.Account;

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

@ -1,7 +1,9 @@
package com.readrops.app.utils;
package com.readrops.app.utils.matchers;
import com.readrops.app.database.entities.Feed;
import com.readrops.app.database.entities.Item;
import com.readrops.app.utils.DateUtils;
import com.readrops.app.utils.Utils;
import com.readrops.readropslibrary.localfeed.atom.ATOMEntry;
import com.readrops.readropslibrary.localfeed.json.JSONItem;
import com.readrops.readropslibrary.localfeed.rss.RSSEnclosure;

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

@ -1,4 +1,4 @@
package com.readrops.app.utils
package com.readrops.app.utils.matchers
import android.content.Context
import com.readrops.app.R
@ -37,7 +37,6 @@ object OPMLMatcher {
return foldersAndFeeds
}
fun foldersAndFeedsToOPML(foldersAndFeeds: Map<Folder, List<Feed>>, context: Context): OPML {
val outlines = arrayListOf<Outline>()
for (folderAndFeeds in foldersAndFeeds) {

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

@ -12,7 +12,7 @@ import com.readrops.app.database.entities.Folder;
import com.readrops.app.database.entities.account.Account;
import com.readrops.app.database.entities.account.AccountType;
import com.readrops.app.repositories.ARepository;
import com.readrops.app.utils.OPMLMatcher;
import com.readrops.app.utils.matchers.OPMLMatcher;
import com.readrops.readropslibrary.opml.model.OPML;
import java.util.List;

2
readropslibrary/src/main/java/com/readrops/readropslibrary/opml/OPMLParser.kt
View File

@ -14,7 +14,7 @@ class OPMLParser {
companion object {
@JvmStatic
fun parse(uri: Uri, context: Context): Single<OPML> {
fun read(uri: Uri, context: Context): Single<OPML> {
return Single.create { emitter ->
val fileString = LibUtils.fileToString(uri, context)
val serializer: Serializer = Persister()