diff options
author | Andrew Dolgov <[email protected]> | 2021-01-18 23:01:40 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2021-01-18 23:01:40 +0300 |
commit | a99d2aaabb53e7a6d921f4663a78f35edc4ee2f8 (patch) | |
tree | 8727091aee709a6db8607680b0b0c4d500c2bec0 /org.fox.ttrss/src/main | |
parent | 19b892d3834c6d0a9417722c51bcf8ccb2427f91 (diff) |
catchupFeed: try to refresh after request has completed
Diffstat (limited to 'org.fox.ttrss/src/main')
3 files changed, 11 insertions, 15 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index fd57a336..6b1a19b1 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="529" - android:versionName="1.295"> + android:versionCode="530" + android:versionName="1.296"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index d2fb2cc1..121b836c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -551,11 +551,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList onArticleSelected(article, true); } - public void catchupFeed(final Feed feed, final String mode) { - super.catchupFeed(feed, mode); - refresh(); - } - @Override public void onHeadlinesLoaded(boolean appended) { // TODO Auto-generated method stub diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 3f12a1c6..04e31a99 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -31,9 +31,6 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.TextView; -import androidx.appcompat.view.ActionMode; -import androidx.appcompat.widget.Toolbar; - import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -53,6 +50,9 @@ import java.lang.reflect.Type; import java.util.HashMap; import java.util.List; +import androidx.appcompat.view.ActionMode; +import androidx.appcompat.widget.Toolbar; + public class OnlineActivity extends CommonActivity { private final String TAG = this.getClass().getSimpleName(); @@ -103,7 +103,7 @@ public class OnlineActivity extends CommonActivity { String[] catchupModes = { "all", "1day", "1week", "2week" }; String mode = catchupModes[position]; - catchupFeed(feed, mode); + catchupFeed(feed, mode, true); } } }) @@ -127,7 +127,7 @@ public class OnlineActivity extends CommonActivity { public void onClick(DialogInterface dialog, int which) { - catchupFeed(feed, "all"); + catchupFeed(feed, "all", true); } }) @@ -1323,13 +1323,14 @@ public class OnlineActivity extends CommonActivity { return super.onKeyUp(keyCode, event); } - - public void catchupFeed(final Feed feed, final String mode) { + + public void catchupFeed(final Feed feed, final String mode, final boolean refreshAfter) { Log.d(TAG, "catchupFeed=" + feed + "; mode=" + mode); ApiRequest req = new ApiRequest(getApplicationContext()) { protected void onPostExecute(JsonElement result) { - // refresh? + if (refreshAfter) + refresh(); } }; |