From 460fa4923d7416d8d7377c9a73213dbb69b66665 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 18 Sep 2012 15:45:22 +0400 Subject: decrease OFFLINE_SYNC_SEQ because of API limits --- src/org/fox/ttrss/offline/OfflineArticleFragment.java | 5 ++--- src/org/fox/ttrss/offline/OfflineArticlePager.java | 1 - src/org/fox/ttrss/offline/OfflineDownloadService.java | 4 ++-- src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java | 11 ++--------- src/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java | 1 - src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 2 -- 6 files changed, 6 insertions(+), 18 deletions(-) (limited to 'src/org/fox/ttrss/offline') diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index 266c89b2..e05f7581 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -3,7 +3,6 @@ package org.fox.ttrss.offline; import java.text.SimpleDateFormat; import java.util.Date; -import org.fox.ttrss.OnlineActivity; import org.fox.ttrss.R; import org.fox.ttrss.util.ImageCacheService; import org.jsoup.Jsoup; @@ -29,10 +28,10 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.webkit.WebSettings; -import android.webkit.WebView; import android.webkit.WebSettings.LayoutAlgorithm; -import android.widget.TextView; +import android.webkit.WebView; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.TextView; public class OfflineArticleFragment extends Fragment { @SuppressWarnings("unused") diff --git a/src/org/fox/ttrss/offline/OfflineArticlePager.java b/src/org/fox/ttrss/offline/OfflineArticlePager.java index 618e77db..3faf3415 100644 --- a/src/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/src/org/fox/ttrss/offline/OfflineArticlePager.java @@ -4,7 +4,6 @@ import org.fox.ttrss.R; import android.app.Activity; import android.database.Cursor; -import android.database.sqlite.SQLiteStatement; import android.os.Bundle; import android.provider.BaseColumns; import android.support.v4.app.Fragment; diff --git a/src/org/fox/ttrss/offline/OfflineDownloadService.java b/src/org/fox/ttrss/offline/OfflineDownloadService.java index 82f287f5..c7100ee0 100644 --- a/src/org/fox/ttrss/offline/OfflineDownloadService.java +++ b/src/org/fox/ttrss/offline/OfflineDownloadService.java @@ -46,8 +46,8 @@ public class OfflineDownloadService extends Service { public static final String INTENT_ACTION_SUCCESS = "org.fox.ttrss.intent.action.DownloadComplete"; public static final String INTENT_ACTION_CANCEL = "org.fox.ttrss.intent.action.Cancel"; - private static final int OFFLINE_SYNC_SEQ = 100; - private static final int OFFLINE_SYNC_MAX = 500; + private static final int OFFLINE_SYNC_SEQ = 50; + private static final int OFFLINE_SYNC_MAX = OFFLINE_SYNC_SEQ * 10; private SQLiteDatabase m_writableDb; private SQLiteDatabase m_readableDb; diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java index c086eafb..932a59e5 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesActivity.java @@ -100,15 +100,6 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline if (open) { OfflineHeadlinesFragment hf = (OfflineHeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); - /* OfflineArticlePager af = new OfflineArticlePager(articleId, hf.getFeedId(), hf.getFeedIsCat()); - af.setSearchQuery(hf.getSearchQuery()); - - FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - - ft.replace(R.id.article_fragment, af, FRAG_ARTICLE); - - ft.commit(); */ - OfflineArticlePager af = (OfflineArticlePager) getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); af.setArticleId(articleId); @@ -140,6 +131,8 @@ public class OfflineHeadlinesActivity extends OfflineActivity implements Offline Fragment af = getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); m_menu.setGroupVisible(R.id.menu_group_article, af != null); + + m_menu.findItem(R.id.search).setVisible(false); } } diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java b/src/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java index aa1ae46f..cdff5913 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesEventListener.java @@ -1,6 +1,5 @@ package org.fox.ttrss.offline; -import android.database.sqlite.SQLiteDatabase; public interface OfflineHeadlinesEventListener { void onArticleSelected(int articleId, boolean open); diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 0a4c416b..776df09c 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -7,8 +7,6 @@ import java.util.TimeZone; import org.fox.ttrss.GlobalState; import org.fox.ttrss.R; -import org.fox.ttrss.types.Article; -import org.fox.ttrss.types.ArticleList; import org.jsoup.Jsoup; import android.app.Activity; -- cgit v1.2.3-54-g00ecf