diff options
Diffstat (limited to 'org.fox.ttrss/src')
4 files changed, 22 insertions, 99 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java index adc0881d..b6a9ff32 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java @@ -19,6 +19,7 @@ import com.google.gson.JsonParser; import java.io.IOException; import java.util.HashMap; import java.util.Locale; +import java.util.concurrent.TimeUnit; import okhttp3.Credentials; import okhttp3.MediaType; @@ -137,9 +138,13 @@ public class ApiCommon { Request request = requestBuilder.build(); - Response response = new OkHttpClient() - .newCall(request) - .execute(); + OkHttpClient client = new OkHttpClient.Builder() + .connectTimeout(10, TimeUnit.SECONDS) + .writeTimeout(10, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .build(); + + Response response = client.newCall(request).execute(); if (response.isSuccessful()) { String payloadReceived = response.body().string(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index f66758ee..353d965c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -101,56 +101,13 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL List<Feed> feeds = new ArrayList<>(); - // int catUnread = 0; - - /* for (Feed f : feeds) - if (f.id > -10 || m_catId != -4) { // skip labels for flat feedlist for now - if (m_activeCategory != null || f.id >= 0) { - m_feeds.add(f); - catUnread += f.unread; - } - - if (m_activeCategory != null && m_activeCategory.id == -1) - f.title = Feed.getSpecialFeedTitleById(m_activity, f.id); - } - - sortFeeds(); - - if (m_activeCategory == null) { - Feed feed = new Feed(-1, "Special", true); - feed.unread = catUnread; - - m_feeds.add(0, feed); - - } - - if (m_enableParentBtn && m_activeCategory != null && m_activeCategory.id >= 0 && !m_feeds.isEmpty()) { - Feed feed = new Feed(m_activeCategory.id, m_activeCategory.title, true); - feed.unread = catUnread; - feed.always_display_as_feed = true; - feed.display_title = getString(R.string.feed_all_articles); - - m_feeds.add(0, feed); - } - - m_adapter.notifyDataSetChanged(); */ - - // m_adapter.sortFeeds(feedsJson); - - //List<Feed> feedsJsonFiltered = feedsJson.stream().filter(a -> a.id >= -10).collect(Collectors.toList()); - - if (m_feed.id == Feed.ALL_ARTICLES) - feedsJson = feedsJson.stream().filter(a -> a.id > -10).collect(Collectors.toList()); - sortFeeds(feedsJson, m_feed); - // feeds.add(new Feed(Feed.TYPE_HEADER)); - if (m_enableParentBtn) { feeds.add(0, new Feed(Feed.TYPE_GOBACK)); if (m_feed.id >= 0 && !feedsJson.isEmpty()) { - Feed feed = new Feed(m_feed.id, m_feed.title, true); + Feed feed = new Feed(m_feed.id, getString(R.string.feed_all_articles), true); feed.unread = feedsJson.stream().map(a -> a.unread).reduce(0, Integer::sum); feed.always_open_headlines = true; @@ -282,7 +239,6 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL return true; } else if (itemId == R.id.browse_feeds) { m_activity.onFeedSelected(feed); - //m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread), false); return true; } else if (itemId == R.id.unsubscribe_feed) { MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext()) 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 c92123dd..a12c5c44 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 @@ -42,7 +42,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList protected long m_lastRefresh = 0; protected long m_lastWidgetRefresh = 0; - protected boolean m_feedIsSelected = false; + protected Feed m_activeFeed; private ActionBarDrawerToggle m_drawerToggle; private DrawerLayout m_drawerLayout; @@ -185,13 +185,11 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList ft.commit(); - m_feedIsSelected = true; - } else { // savedInstanceState != null - m_feedIsSelected = savedInstanceState.getBoolean("m_feedIsSelected"); + m_activeFeed = savedInstanceState.getParcelable("m_activeFeed"); - if (m_drawerLayout != null && !m_feedIsSelected) { + if (m_drawerLayout != null && m_activeFeed == null) { m_drawerLayout.openDrawer(GravityCompat.START); } } @@ -238,6 +236,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); + // Sync the toggle state after onRestoreInstanceState has occurred. if (m_drawerToggle != null) m_drawerToggle.syncState(); } @@ -257,6 +256,8 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList public void onFeedSelected(Feed feed) { + m_activeFeed = feed; + if (isSmallScreen()) setTitle(feed.title); @@ -298,46 +299,9 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList ft.commit(); } - - /* FragmentTransaction ft = getSupportFragmentManager() - .beginTransaction(); - - HeadlinesFragment hf = new HeadlinesFragment(); - hf.initialize(feed); - hf.refresh(false); - - ft.replace(R.id.headlines_fragment, hf, FRAG_HEADLINES); - - ft.commit(); - - m_feedIsSelected = true; - - Date date = new Date(); - - if (date.getTime() - m_lastRefresh > 30 * 1000) { - m_lastRefresh = date.getTime(); - refresh(false); - } */ } } - - /* public void onCatSelected(Feed cat) { - FeedCategoriesFragment fc = (FeedCategoriesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_CATS); - - if (fc != null) { - fc.setSelectedCategory(null); - } - - FragmentTransaction ft = getSupportFragmentManager() - .beginTransaction(); - - FeedsFragment ff = new FeedsFragment(); - ff.initialize(, true); - ft.replace(R.id.feeds_fragment, ff, FRAG_FEEDS); - ft.addToBackStack(null); - ft.commit(); - } */ @Override public void logout() { @@ -428,7 +392,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList public void onSaveInstanceState(Bundle out) { super.onSaveInstanceState(out); - out.putBoolean("m_feedIsSelected", m_feedIsSelected); + out.putParcelable("m_activeFeed", m_activeFeed); Application.getInstance().save(out); } @@ -470,10 +434,6 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList intent.putExtra("searchQuery", hf.getSearchQuery()); intent.putExtra("openedArticleId", article.id); - // we use shared article list, but detail activity does not use special footers - // we will append those back (if needed) in onActivityResult() - // Application.getArticles().stripFooters(); - startActivityForResult(intent, HEADLINES_REQUEST); overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); } @@ -507,10 +467,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } @Override - public void onHeadlinesLoaded(boolean appended) { - // TODO Auto-generated method stub - - } + public void onHeadlinesLoaded(boolean appended) { } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { @@ -549,4 +506,8 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } + public Feed getActiveFeed() { + return m_activeFeed; + } + } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/FeedCategoryList.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/FeedCategoryList.java index ba8caaec..b5a3a935 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/FeedCategoryList.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/FeedCategoryList.java @@ -5,6 +5,7 @@ import android.os.Parcelable; import java.util.ArrayList; +@Deprecated public class FeedCategoryList extends ArrayList<FeedCategory> implements Parcelable { public FeedCategoryList() { } |