diff options
Diffstat (limited to 'src')
9 files changed, 15 insertions, 32 deletions
diff --git a/src/org/fox/ttrss/ArticlePager.java b/src/org/fox/ttrss/ArticlePager.java index 6ba4a1ef..2a502e4f 100644 --- a/src/org/fox/ttrss/ArticlePager.java +++ b/src/org/fox/ttrss/ArticlePager.java @@ -7,8 +7,6 @@ import org.fox.ttrss.types.ArticleList; import org.fox.ttrss.types.Feed;
import org.fox.ttrss.util.HeadlinesRequest;
-import com.google.gson.JsonElement;
-
import android.app.Activity;
import android.os.Bundle;
import android.support.v4.app.Fragment;
@@ -20,6 +18,8 @@ import android.view.LayoutInflater; import android.view.View;
import android.view.ViewGroup;
+import com.google.gson.JsonElement;
+
public class ArticlePager extends Fragment {
private final String TAG = "ArticlePager";
diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java index 18317caf..a235c645 100644 --- a/src/org/fox/ttrss/HeadlinesActivity.java +++ b/src/org/fox/ttrss/HeadlinesActivity.java @@ -1,7 +1,5 @@ package org.fox.ttrss;
-import java.util.ArrayList;
-
import org.fox.ttrss.types.Article;
import org.fox.ttrss.types.ArticleList;
import org.fox.ttrss.types.Feed;
@@ -13,8 +11,6 @@ import android.preference.PreferenceManager; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java index 31da1d0a..63429465 100644 --- a/src/org/fox/ttrss/OnlineActivity.java +++ b/src/org/fox/ttrss/OnlineActivity.java @@ -12,25 +12,19 @@ import org.fox.ttrss.types.ArticleList; import org.fox.ttrss.types.Feed;
import org.fox.ttrss.types.Label;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
-
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.DialogInterface.OnMultiChoiceClickListener;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
-import android.content.DialogInterface.OnClickListener;
-import android.content.DialogInterface.OnMultiChoiceClickListener;
import android.database.Cursor;
import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.ActionMode;
import android.view.Menu;
@@ -42,6 +36,11 @@ import android.widget.EditText; import android.widget.SearchView;
import android.widget.ShareActionProvider;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+
public class OnlineActivity extends CommonActivity {
private final String TAG = this.getClass().getSimpleName();
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;
|