remove offline sync stuff
This commit is contained in:
Andrew Dolgov
parent
f7866f1207
commit
d9d778c565
|
|
@ -1,42 +0,0 @@
|
|||
<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" android:id="@+id/main_flipper">
|
||||
|
||||
<FrameLayout android:layout_gravity="center_vertical" android:id="@+id/sync_splash" android:layout_width="match_parent" android:layout_height="match_parent">
|
||||
<LinearLayout android:gravity="center" android:id="@+id/linearLayout1" android:layout_width="match_parent" android:layout_height="match_parent">
|
||||
<ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar>
|
||||
<TextView android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message" android:text="@string/loading_message"></TextView>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
||||
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:id="@+id/main">
|
||||
|
||||
<LinearLayout android:layout_weight="1.5" android:layout_height="match_parent" android:id="@+id/linearLayout4" android:layout_width="match_parent">
|
||||
|
||||
<LinearLayout android:layout_height="match_parent" android:id="@+id/feeds_container"
|
||||
android:layout_weight="1"
|
||||
|
||||
android:layout_width="match_parent">
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:background="?feedlistDivider"
|
||||
android:paddingLeft="2dip" android:paddingRight="2dip"
|
||||
android:layout_width="wrap_content" android:layout_height="match_parent"></ImageView>
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.5" android:id="@+id/headlines_wrapper">
|
||||
<LinearLayout android:layout_width="match_parent" android:layout_weight="1" android:id="@+id/headlines_container" android:layout_height="match_parent">
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView android:paddingRight="2dip" android:layout_height="match_parent" android:background="?feedlistDivider" android:layout_width="wrap_content" android:paddingLeft="2dip"></ImageView>
|
||||
|
||||
<LinearLayout android:layout_weight="1" android:visibility="gone" android:layout_width="match_parent" android:id="@+id/article_container" android:layout_height="match_parent"></LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</ViewFlipper>
|
||||
|
|
@ -1,21 +1,20 @@
|
|||
<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" android:id="@+id/main_flipper">
|
||||
<FrameLayout android:id="@+id/sync_splash" android:layout_height="match_parent" android:layout_gravity="center_vertical" android:layout_width="match_parent">
|
||||
<LinearLayout android:gravity="center" android:layout_width="match_parent" android:id="@+id/linearLayout1" android:layout_height="match_parent">
|
||||
<ProgressBar android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/loading_progress" style="?android:attr/progressBarStyleLarge"></ProgressBar>
|
||||
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message"></TextView>
|
||||
<FrameLayout android:layout_gravity="center_vertical" android:id="@+id/sync_splash" android:layout_width="match_parent" android:layout_height="match_parent">
|
||||
<LinearLayout android:layout_width="match_parent" android:id="@+id/linearLayout1" android:gravity="center" android:layout_height="match_parent">
|
||||
<ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar>
|
||||
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message"></TextView>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
<LinearLayout android:layout_height="fill_parent" android:id="@+id/main" android:layout_width="fill_parent" android:orientation="horizontal">
|
||||
<LinearLayout android:layout_weight="1.5" android:id="@+id/linearLayout4" android:layout_width="match_parent" android:layout_height="match_parent">
|
||||
<LinearLayout android:layout_weight="1" android:id="@+id/feeds_container" android:layout_width="match_parent" android:layout_height="match_parent"></LinearLayout>
|
||||
<ImageView android:background="?feedlistDivider" android:paddingLeft="2dip" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingRight="2dip"></ImageView>
|
||||
<LinearLayout android:id="@+id/main" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal">
|
||||
<LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/linearLayout4" android:layout_weight="1.5">
|
||||
<LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/feeds_container" android:layout_weight="1"></LinearLayout>
|
||||
<ImageView android:paddingLeft="2dip" android:layout_height="match_parent" android:layout_width="wrap_content" android:layout_weight="1" android:background="?feedlistDivider" android:paddingRight="2dip"></ImageView>
|
||||
</LinearLayout>
|
||||
<LinearLayout android:layout_weight="0.5" android:id="@+id/headlines_wrapper" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical">
|
||||
<LinearLayout android:layout_weight="1" android:id="@+id/headlines_container" android:layout_width="match_parent" android:layout_height="match_parent"></LinearLayout>
|
||||
<!-- <ImageView android:background="?feedlistDivider" android:paddingLeft="2dip" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingRight="2dip"></ImageView> -->
|
||||
<LinearLayout android:visibility="gone" android:layout_weight="1" android:id="@+id/article_container" android:layout_width="match_parent" android:layout_height="match_parent"></LinearLayout>
|
||||
<LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines_wrapper" android:layout_weight="0.5" android:orientation="vertical">
|
||||
<LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines_container" android:layout_weight="1"></LinearLayout>
|
||||
<LinearLayout android:visibility="gone" android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/article_container" android:layout_weight="1"></LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,4 @@
|
|||
android:icon="@android:drawable/ic_menu_preferences"
|
||||
android:title="@string/preferences"
|
||||
android:showAsAction="ifRoom|withText"/>
|
||||
|
||||
<item android:id="@+id/sync_status"
|
||||
android:title="@string/offline"
|
||||
android:icon="@android:drawable/presence_offline"
|
||||
android:showAsAction="ifRoom|withText"/>
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -31,33 +31,6 @@ public class ArticleFragment extends Fragment {
|
|||
}
|
||||
|
||||
View view = inflater.inflate(R.layout.article_fragment, container, false);
|
||||
|
||||
Log.d(TAG, "Opening article #" + m_articleId);
|
||||
|
||||
Cursor c = ((MainActivity)getActivity()).getReadableDb().query("articles", null, BaseColumns._ID + "=?",
|
||||
new String[] { String.valueOf(m_articleId) }, null, null, null);
|
||||
|
||||
c.moveToFirst();
|
||||
|
||||
Log.d(TAG, "Cursor count: " + c.getCount());
|
||||
|
||||
TextView title = (TextView)view.findViewById(R.id.title);
|
||||
|
||||
if (title != null) {
|
||||
title.setText(c.getString(c.getColumnIndex("title")));
|
||||
}
|
||||
|
||||
WebView content = (WebView)view.findViewById(R.id.content);
|
||||
|
||||
if (content != null) {
|
||||
String contentData = "<html><body>" + c.getString(c.getColumnIndex("content")) + "</body></html>";
|
||||
|
||||
Log.d(TAG, "content=" + contentData);
|
||||
|
||||
content.loadData(contentData, "text/html", "utf-8");
|
||||
}
|
||||
|
||||
c.close();
|
||||
|
||||
return view;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,67 +21,23 @@ import android.widget.SimpleCursorAdapter;
|
|||
|
||||
public class FeedsFragment extends Fragment implements OnItemClickListener {
|
||||
private final String TAG = this.getClass().getSimpleName();
|
||||
|
||||
protected FeedsListAdapter m_adapter;
|
||||
protected SharedPreferences m_prefs;
|
||||
protected int m_activeFeedId;
|
||||
protected Cursor m_cursor;
|
||||
protected SQLiteDatabase m_db;
|
||||
|
||||
/* private Timer m_timer;
|
||||
private TimerTask m_updateTask = new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
downloadFeeds();
|
||||
}
|
||||
}; */
|
||||
private SharedPreferences m_prefs;
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
|
||||
if (savedInstanceState != null) {
|
||||
m_activeFeedId = savedInstanceState.getInt("activeFeedId");
|
||||
//m_activeFeedId = savedInstanceState.getInt("activeFeedId");
|
||||
}
|
||||
|
||||
View view = inflater.inflate(R.layout.feeds_fragment, container, false);
|
||||
|
||||
DatabaseHelper helper = new DatabaseHelper(getActivity());
|
||||
|
||||
m_db = helper.getReadableDatabase();
|
||||
m_cursor = m_db.query("feeds_unread", null, null, null, null, null, "unread DESC, title");
|
||||
|
||||
m_adapter = new FeedsListAdapter(getActivity(), R.layout.feeds_row, m_cursor,
|
||||
new String[] { "title", "unread" }, new int[] { R.id.title, R.id.unread_counter }, 0);
|
||||
|
||||
ListView list = (ListView) view.findViewById(R.id.feeds);
|
||||
|
||||
if (list != null) {
|
||||
list.setAdapter(m_adapter);
|
||||
list.setOnItemClickListener(this);
|
||||
list.setEmptyView(view.findViewById(R.id.no_unread_feeds));
|
||||
list.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
|
||||
}
|
||||
|
||||
/* View pb = view.findViewById(R.id.loading_progress);
|
||||
|
||||
if (pb != null && m_cursor.getCount() == 0)
|
||||
pb.setVisibility(View.VISIBLE); */
|
||||
|
||||
// m_timer = new Timer("UpdateFeeds");
|
||||
// m_timer.schedule(m_updateTask, 1000L, 60*1000L);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
|
||||
m_cursor.close();
|
||||
m_db.close();
|
||||
|
||||
// m_timer.cancel();
|
||||
// m_timer = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -94,60 +50,11 @@ public class FeedsFragment extends Fragment implements OnItemClickListener {
|
|||
public void onSaveInstanceState (Bundle out) {
|
||||
super.onSaveInstanceState(out);
|
||||
|
||||
out.putInt("activeFeedId", m_activeFeedId);
|
||||
}
|
||||
|
||||
class FeedsListAdapter extends SimpleCursorAdapter {
|
||||
|
||||
private Context context;
|
||||
private int layout;
|
||||
|
||||
public FeedsListAdapter(Context context, int layout, Cursor c,
|
||||
String[] from, int[] to, int flags) {
|
||||
super(context, layout, c, from, to, flags);
|
||||
|
||||
this.context = context;
|
||||
this.layout = layout;
|
||||
}
|
||||
|
||||
//out.putInt("activeFeedId", m_activeFeedId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> av, View view, int position, long id) {
|
||||
ListView list = (ListView)getActivity().findViewById(R.id.feeds);
|
||||
|
||||
if (list != null) {
|
||||
Cursor cursor = (Cursor) list.getItemAtPosition(position);
|
||||
|
||||
if (cursor != null) {
|
||||
int feedId = (int) cursor.getLong(0);
|
||||
|
||||
Log.d(TAG, "clicked on feed " + feedId);
|
||||
|
||||
viewFeed(feedId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void viewFeed(int feedId) {
|
||||
m_activeFeedId = feedId;
|
||||
|
||||
FragmentTransaction ft = getFragmentManager().beginTransaction();
|
||||
HeadlinesFragment frag = new HeadlinesFragment();
|
||||
|
||||
frag.initialize(feedId);
|
||||
|
||||
ft.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);
|
||||
ft.replace(R.id.headlines_container, frag);
|
||||
ft.commit();
|
||||
|
||||
m_adapter.notifyDataSetChanged();
|
||||
|
||||
}
|
||||
|
||||
public synchronized void updateListView() {
|
||||
m_cursor.requery();
|
||||
m_adapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,38 +20,13 @@ import android.widget.SimpleCursorAdapter;
|
|||
|
||||
public class HeadlinesFragment extends Fragment implements OnItemClickListener {
|
||||
private final String TAG = this.getClass().getSimpleName();
|
||||
protected int m_feedId;
|
||||
protected SharedPreferences m_prefs;
|
||||
protected Cursor m_cursor;
|
||||
protected SimpleCursorAdapter m_adapter;
|
||||
protected int m_articleId;
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
|
||||
if (savedInstanceState != null) {
|
||||
m_feedId = savedInstanceState.getInt("feedId");
|
||||
m_articleId = savedInstanceState.getInt("articleId");
|
||||
}
|
||||
|
||||
View view = inflater.inflate(R.layout.headlines_fragment, container, false);
|
||||
|
||||
m_cursor = ((MainActivity)getActivity()).getReadableDb().query("articles", null, "feed_id = ?", new String[] { String.valueOf(m_feedId) }, null, null, "updated DESC");
|
||||
|
||||
m_adapter = new SimpleCursorAdapter(getActivity(), R.layout.headlines_row, m_cursor,
|
||||
new String[] { "title", "excerpt" }, new int[] { R.id.title, R.id.excerpt }, 0);
|
||||
|
||||
ListView list = (ListView) view.findViewById(R.id.headlines);
|
||||
|
||||
if (list != null) {
|
||||
list.setAdapter(m_adapter);
|
||||
list.setOnItemClickListener(this);
|
||||
list.setEmptyView(view.findViewById(R.id.no_headlines));
|
||||
list.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE);
|
||||
}
|
||||
|
||||
if (m_articleId != 0) viewArticle(m_articleId);
|
||||
|
||||
return view;
|
||||
}
|
||||
|
||||
|
|
@ -62,69 +37,15 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener {
|
|||
m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
|
||||
m_cursor.close();
|
||||
}
|
||||
|
||||
public void initialize(int feedId) {
|
||||
m_feedId = feedId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> av, View view, int position, long id) {
|
||||
ListView list = (ListView)getActivity().findViewById(R.id.headlines);
|
||||
|
||||
if (list != null) {
|
||||
Cursor cursor = (Cursor) list.getItemAtPosition(position);
|
||||
|
||||
if (cursor != null) {
|
||||
int articleId = (int) cursor.getLong(0);
|
||||
|
||||
Log.d(TAG, "clicked on article " + articleId);
|
||||
|
||||
viewArticle(articleId);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void viewArticle(int articleId) {
|
||||
FragmentTransaction ft = getFragmentManager().beginTransaction();
|
||||
ArticleFragment frag = new ArticleFragment();
|
||||
|
||||
frag.initialize(articleId);
|
||||
|
||||
/* LinearLayout v = (LinearLayout) getActivity().findViewById(R.id.headlines_container);
|
||||
|
||||
if (v != null) {
|
||||
ObjectAnimator anim = ObjectAnimator.ofFloat(v, "weightSum", 0f, 0.5f);
|
||||
anim.setDuration(1000);
|
||||
anim.start();
|
||||
|
||||
} */
|
||||
|
||||
ft.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);
|
||||
ft.replace(R.id.article_container, frag);
|
||||
ft.commit();
|
||||
|
||||
getActivity().findViewById(R.id.article_container).setVisibility(View.VISIBLE);
|
||||
|
||||
m_articleId = articleId;
|
||||
|
||||
//m_adapter.notifyDataSetChanged();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSaveInstanceState (Bundle out) {
|
||||
super.onSaveInstanceState(out);
|
||||
|
||||
out.putInt("feedId", m_feedId);
|
||||
out.putInt("articleId", m_articleId);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,37 +33,12 @@ import com.google.gson.reflect.TypeToken;
|
|||
public class MainActivity extends Activity {
|
||||
private final String TAG = this.getClass().getSimpleName();
|
||||
|
||||
private final static int UPDATE_INITIAL = 1;
|
||||
private final static int UPDATE_SEQUENTIAL = 2;
|
||||
private final static int UPDATE_OFFLINE = 3;
|
||||
|
||||
private final static int OFFSET_MAX = 100;
|
||||
|
||||
private SharedPreferences m_prefs;
|
||||
private String m_themeName = "";
|
||||
private boolean m_feedsOpened = false;
|
||||
private boolean m_splashDisabled = false;
|
||||
protected String m_sessionId;
|
||||
protected int m_offset = 0;
|
||||
protected int m_limit = 30;
|
||||
protected int m_maxId = 0;
|
||||
protected int m_updateMode = UPDATE_INITIAL;
|
||||
|
||||
private SQLiteDatabase m_readableDb;
|
||||
private SQLiteDatabase m_writableDb;
|
||||
|
||||
protected enum SyncStatus { SYNC_INITIAL, SYNC_ONLINE, SYNC_OFFLINE };
|
||||
|
||||
protected MenuItem m_syncStatus;
|
||||
|
||||
protected synchronized SQLiteDatabase getReadableDb() {
|
||||
return m_readableDb;
|
||||
}
|
||||
|
||||
protected synchronized SQLiteDatabase getWritableDb() {
|
||||
return m_writableDb;
|
||||
}
|
||||
|
||||
protected String getSessionId() {
|
||||
return m_sessionId;
|
||||
}
|
||||
|
|
@ -76,25 +51,6 @@ public class MainActivity extends Activity {
|
|||
editor.commit();
|
||||
}
|
||||
|
||||
private Timer m_articlesTimer;
|
||||
private Timer m_feedsTimer;
|
||||
private ArticlesTask m_articlesTask;
|
||||
private FeedsTask m_feedsTask;
|
||||
|
||||
private class ArticlesTask extends TimerTask {
|
||||
@Override
|
||||
public void run() {
|
||||
downloadArticles();
|
||||
}
|
||||
};
|
||||
|
||||
private class FeedsTask extends TimerTask {
|
||||
@Override
|
||||
public void run() {
|
||||
downloadFeeds();
|
||||
}
|
||||
};
|
||||
|
||||
/** Called when the activity is first created. */
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
|
|
@ -109,87 +65,26 @@ public class MainActivity extends Activity {
|
|||
}
|
||||
|
||||
m_themeName = m_prefs.getString("theme", "THEME_DARK");
|
||||
|
||||
m_sessionId = m_prefs.getString("last_session_id", null);
|
||||
|
||||
if (savedInstanceState != null) {
|
||||
m_feedsOpened = savedInstanceState.getBoolean("feedsOpened");
|
||||
m_sessionId = savedInstanceState.getString("sessionId");
|
||||
m_offset = savedInstanceState.getInt("offset");
|
||||
m_limit = savedInstanceState.getInt("limit");
|
||||
m_updateMode = savedInstanceState.getInt("updateMode");
|
||||
m_maxId = savedInstanceState.getInt("maxId");
|
||||
m_splashDisabled = savedInstanceState.getBoolean("splashDisabled");
|
||||
}
|
||||
|
||||
// allow database to upgrade before we do anything else
|
||||
DatabaseHelper dh = new DatabaseHelper(getApplicationContext());
|
||||
m_writableDb = dh.getWritableDatabase();
|
||||
m_readableDb = dh.getReadableDatabase();
|
||||
|
||||
if (m_updateMode == UPDATE_INITIAL && !m_splashDisabled) {
|
||||
m_writableDb.execSQL("DELETE FROM feeds;");
|
||||
//db.execSQL("DELETE FROM articles;");
|
||||
|
||||
if (m_maxId == 0) {
|
||||
Cursor c = m_readableDb.query("articles", new String[] { BaseColumns._ID } , null, null, null, null, BaseColumns._ID + " DESC LIMIT 1");
|
||||
if (c.getCount() == 1) {
|
||||
c.moveToFirst();
|
||||
//Log.i(TAG, "Last article # " + c.getInt(c.getColumnIndex(BaseColumns._ID)));
|
||||
m_maxId = c.getInt(c.getColumnIndex(BaseColumns._ID));
|
||||
}
|
||||
c.close();
|
||||
}
|
||||
}
|
||||
|
||||
setContentView(R.layout.main);
|
||||
|
||||
LinearLayout wrapper = (LinearLayout) findViewById(R.id.headlines_wrapper);
|
||||
ViewFlipper vf = (ViewFlipper) findViewById(R.id.main_flipper);
|
||||
|
||||
LayoutTransition transitioner = new LayoutTransition();
|
||||
wrapper.setLayoutTransition(transitioner);
|
||||
|
||||
if (!m_feedsOpened) {
|
||||
Log.d(TAG, "Opening feeds fragment...");
|
||||
|
||||
FragmentTransaction ft = getFragmentManager().beginTransaction();
|
||||
FeedsFragment frag = new FeedsFragment();
|
||||
|
||||
ft.setCustomAnimations(android.R.animator.fade_in, android.R.animator.fade_out);
|
||||
ft.replace(R.id.feeds_container, frag, "FEEDLIST");
|
||||
ft.commit();
|
||||
|
||||
m_feedsOpened = true;
|
||||
|
||||
if (vf != null) {
|
||||
vf.showNext();
|
||||
}
|
||||
|
||||
if (m_splashDisabled) {
|
||||
ViewFlipper vf = (ViewFlipper) findViewById(R.id.main_flipper);
|
||||
|
||||
if (vf != null && vf.getDisplayedChild() == 0)
|
||||
vf.showNext();
|
||||
|
||||
scheduleNextUpdate();
|
||||
} else {
|
||||
m_feedsTask = new FeedsTask();
|
||||
m_feedsTimer = new Timer("UpdateFeeds");
|
||||
m_feedsTimer.schedule(m_feedsTask, 1000L, 60*1000L);
|
||||
}
|
||||
|
||||
//scheduleNextUpdate();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSaveInstanceState (Bundle out) {
|
||||
super.onSaveInstanceState(out);
|
||||
|
||||
out.putBoolean("feedsOpened", m_feedsOpened);
|
||||
out.putString("sessionId", m_sessionId);
|
||||
out.putInt("offset", m_offset);
|
||||
out.putInt("limit", m_limit);
|
||||
out.putInt("updateMode", m_updateMode);
|
||||
out.putInt("maxId", m_maxId);
|
||||
out.putBoolean("splashDisabled", m_splashDisabled);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -207,17 +102,6 @@ public class MainActivity extends Activity {
|
|||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
|
||||
m_writableDb.close();
|
||||
m_readableDb.close();
|
||||
|
||||
if (m_feedsTask != null) m_feedsTask.cancel();
|
||||
if (m_articlesTask != null) m_articlesTask.cancel();
|
||||
|
||||
if (m_feedsTimer != null) m_feedsTimer.cancel();
|
||||
m_feedsTimer = null;
|
||||
|
||||
if (m_articlesTimer != null) m_articlesTimer.cancel();
|
||||
m_articlesTimer = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -225,39 +109,9 @@ public class MainActivity extends Activity {
|
|||
MenuInflater inflater = getMenuInflater();
|
||||
inflater.inflate(R.menu.main_menu, menu);
|
||||
|
||||
m_syncStatus = menu.findItem(R.id.sync_status);
|
||||
|
||||
switch (m_updateMode) {
|
||||
case UPDATE_INITIAL:
|
||||
setSyncStatus(SyncStatus.SYNC_INITIAL);
|
||||
break;
|
||||
case UPDATE_SEQUENTIAL:
|
||||
setSyncStatus(SyncStatus.SYNC_ONLINE);
|
||||
break;
|
||||
default:
|
||||
setSyncStatus(SyncStatus.SYNC_OFFLINE);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void setSyncStatus(SyncStatus status) {
|
||||
switch (status) {
|
||||
case SYNC_INITIAL:
|
||||
m_syncStatus.setTitle(R.string.synchronizing);
|
||||
m_syncStatus.setIcon(android.R.drawable.presence_online);
|
||||
break;
|
||||
case SYNC_ONLINE:
|
||||
m_syncStatus.setTitle(R.string.online);
|
||||
m_syncStatus.setIcon(android.R.drawable.presence_online);
|
||||
break;
|
||||
case SYNC_OFFLINE:
|
||||
m_syncStatus.setTitle(R.string.offline);
|
||||
m_syncStatus.setIcon(android.R.drawable.presence_offline);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
|
|
@ -269,268 +123,4 @@ public class MainActivity extends Activity {
|
|||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void downloadArticles() {
|
||||
ApiRequest api = new ApiRequest(m_sessionId,
|
||||
m_prefs.getString("ttrss_url", null),
|
||||
m_prefs.getString("login", null),
|
||||
m_prefs.getString("password", null));
|
||||
|
||||
JsonElement result = api.sendRequest(new HashMap<String,String>() {
|
||||
{
|
||||
put("sid", m_sessionId);
|
||||
put("op", "getHeadlines");
|
||||
put("feed_id", "-4");
|
||||
put("show_content", "1");
|
||||
put("limit", String.valueOf(m_limit));
|
||||
put("skip", String.valueOf(m_offset));
|
||||
put("view_mode", "unread");
|
||||
|
||||
if (m_offset == 0) {
|
||||
put("since_id", String.valueOf(m_maxId));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (result != null && api.getAuthStatus() == ApiRequest.STATUS_OK) {
|
||||
try {
|
||||
setSessionId(api.getSessionId());
|
||||
|
||||
int articlesFound = 0;
|
||||
|
||||
try {
|
||||
JsonArray feeds_object = (JsonArray) result.getAsJsonArray();
|
||||
|
||||
Type listType = new TypeToken<List<Article>>() {}.getType();
|
||||
List<Article> articles = api.m_gson.fromJson(feeds_object, listType);
|
||||
|
||||
/* db.execSQL("DELETE FROM articles"); */
|
||||
|
||||
SQLiteStatement stmtInsert = getWritableDb().compileStatement("INSERT INTO articles " +
|
||||
"("+BaseColumns._ID+", unread, marked, published, updated, is_updated, title, link, feed_id, tags, content, excerpt) " +
|
||||
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);");
|
||||
|
||||
SQLiteStatement stmtUpdate = getWritableDb().compileStatement("UPDATE articles SET " +
|
||||
"unread = ?, marked = ?, published = ?, updated = ?, is_updated = ?, title = ?, link = ?, feed_id = ?, " +
|
||||
"tags = ?, content = ?, excerpt = ? WHERE " + BaseColumns._ID + " = ?");
|
||||
|
||||
for (Article article : articles) {
|
||||
//Log.d(TAG, "Processing article #" + article.id);
|
||||
|
||||
m_maxId = Math.max(m_maxId, article.id);
|
||||
|
||||
++articlesFound;
|
||||
|
||||
Cursor c = getReadableDb().query("articles", new String[] { BaseColumns._ID } , BaseColumns._ID + "=?",
|
||||
new String[] { String.valueOf(article.id) }, null, null, null);
|
||||
|
||||
String excerpt = Jsoup.parse(article.content).text();
|
||||
|
||||
if (excerpt.length() > 250) {
|
||||
excerpt = excerpt.substring(0, 250) + "...";
|
||||
}
|
||||
|
||||
if (c.getCount() != 0) {
|
||||
stmtUpdate.bindLong(1, article.unread ? 1 : 0);
|
||||
stmtUpdate.bindLong(2, article.marked ? 1 : 0);
|
||||
stmtUpdate.bindLong(3, article.published ? 1 : 0);
|
||||
stmtUpdate.bindLong(4, article.updated);
|
||||
stmtUpdate.bindLong(5, article.is_updated ? 1 : 0);
|
||||
stmtUpdate.bindString(6, article.title);
|
||||
stmtUpdate.bindString(7, article.link);
|
||||
stmtUpdate.bindLong(8, article.feed_id);
|
||||
stmtUpdate.bindString(9, ""); // comma-separated tags
|
||||
stmtUpdate.bindString(10, article.content);
|
||||
stmtUpdate.bindString(11, excerpt);
|
||||
stmtUpdate.bindLong(12, article.id);
|
||||
stmtUpdate.execute();
|
||||
|
||||
} else {
|
||||
//Log.d(TAG, "article not found");
|
||||
|
||||
stmtInsert.bindLong(1, article.id);
|
||||
stmtInsert.bindLong(2, article.unread ? 1 : 0);
|
||||
stmtInsert.bindLong(3, article.marked ? 1 : 0);
|
||||
stmtInsert.bindLong(4, article.published ? 1 : 0);
|
||||
stmtInsert.bindLong(5, article.updated);
|
||||
stmtInsert.bindLong(6, article.is_updated ? 1 : 0);
|
||||
stmtInsert.bindString(7, article.title);
|
||||
stmtInsert.bindString(8, article.link);
|
||||
stmtInsert.bindLong(9, article.feed_id);
|
||||
stmtInsert.bindString(10, ""); // comma-separated tags
|
||||
stmtInsert.bindString(11, article.content);
|
||||
stmtInsert.bindString(12, excerpt);
|
||||
stmtInsert.execute();
|
||||
}
|
||||
|
||||
c.close();
|
||||
}
|
||||
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
FeedsFragment ff = (FeedsFragment) getFragmentManager().findFragmentByTag("FEEDLIST");
|
||||
if (ff != null) ff.updateListView();
|
||||
}
|
||||
});
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
Log.d(TAG, articlesFound + " articles processed");
|
||||
|
||||
if (articlesFound == m_limit && m_offset < OFFSET_MAX) {
|
||||
|
||||
m_offset += m_limit;
|
||||
|
||||
} else {
|
||||
m_offset = 0;
|
||||
|
||||
if (m_updateMode == UPDATE_INITIAL) {
|
||||
Log.i(TAG, "Switching to sequential mode...");
|
||||
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
setSyncStatus(SyncStatus.SYNC_ONLINE);
|
||||
}
|
||||
});
|
||||
m_updateMode = UPDATE_SEQUENTIAL;
|
||||
}
|
||||
}
|
||||
|
||||
m_splashDisabled = true;
|
||||
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
ViewFlipper vf = (ViewFlipper) findViewById(R.id.main_flipper);
|
||||
|
||||
if (vf != null && vf.getDisplayedChild() == 0) {
|
||||
vf.showNext();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
scheduleNextUpdate();
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else if (result != null && api.getAuthStatus() != ApiRequest.STATUS_OK) {
|
||||
// TODO handle error, e.g auth failed
|
||||
} else if (result == null) {
|
||||
// TODO could not parse result, server/network error?
|
||||
}
|
||||
}
|
||||
|
||||
private synchronized void downloadFeeds() {
|
||||
ApiRequest api = new ApiRequest(m_sessionId,
|
||||
m_prefs.getString("ttrss_url", null),
|
||||
m_prefs.getString("login", null),
|
||||
m_prefs.getString("password", null));
|
||||
|
||||
JsonElement result = api.sendRequest(new HashMap<String,String>() {
|
||||
{
|
||||
put("sid", m_sessionId);
|
||||
put("op", "getFeeds");
|
||||
put("cat_id", "-3");
|
||||
put("unread_only", "1");
|
||||
}
|
||||
});
|
||||
|
||||
if (result != null && api.getAuthStatus() == ApiRequest.STATUS_OK) {
|
||||
try {
|
||||
try {
|
||||
setSessionId(api.getSessionId());
|
||||
} catch (NullPointerException e) {
|
||||
//
|
||||
}
|
||||
|
||||
JsonArray feeds_object = (JsonArray) result.getAsJsonArray();
|
||||
|
||||
Type listType = new TypeToken<List<Feed>>() {}.getType();
|
||||
List<Feed> feeds = api.m_gson.fromJson(feeds_object, listType);
|
||||
|
||||
SQLiteStatement stmtUpdate = getWritableDb().compileStatement("UPDATE feeds SET " +
|
||||
"title = ?, feed_url = ?, has_icon = ?, cat_id = ?, last_updated = ? WHERE " +
|
||||
BaseColumns._ID + " = ?");
|
||||
|
||||
SQLiteStatement stmtInsert = getWritableDb().compileStatement("INSERT INTO feeds " +
|
||||
"("+BaseColumns._ID+", title, feed_url, has_icon, cat_id, last_updated) " +
|
||||
"VALUES (?, ?, ?, ?, ?, ?);");
|
||||
|
||||
for (Feed feed : feeds) {
|
||||
Cursor c = getReadableDb().query("feeds", new String[] { BaseColumns._ID } , BaseColumns._ID + "=?",
|
||||
new String[] { String.valueOf(feed.id) }, null, null, null);
|
||||
|
||||
if (c.getCount() != 0) {
|
||||
stmtUpdate.bindString(1, feed.title);
|
||||
stmtUpdate.bindString(2, feed.feed_url);
|
||||
stmtUpdate.bindLong(3, feed.has_icon ? 1 : 0);
|
||||
stmtUpdate.bindLong(4, feed.cat_id);
|
||||
stmtUpdate.bindLong(5, feed.last_updated);
|
||||
stmtUpdate.bindLong(6, feed.id);
|
||||
stmtUpdate.execute();
|
||||
|
||||
} else {
|
||||
stmtInsert.bindLong(1, feed.id);
|
||||
stmtInsert.bindString(2, feed.title);
|
||||
stmtInsert.bindString(3, feed.feed_url);
|
||||
stmtInsert.bindLong(4, feed.has_icon ? 1 : 0);
|
||||
stmtInsert.bindLong(5, feed.cat_id);
|
||||
stmtInsert.bindLong(6, feed.last_updated);
|
||||
stmtInsert.execute();
|
||||
}
|
||||
|
||||
c.close();
|
||||
}
|
||||
|
||||
// TODO delete not returned feeds which has no data here
|
||||
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
/* View pb = findViewById(R.id.loading_progress);
|
||||
if (pb != null) pb.setVisibility(View.INVISIBLE); */
|
||||
|
||||
FeedsFragment frag = (FeedsFragment)getFragmentManager().findFragmentByTag("FEEDLIST");
|
||||
|
||||
if (frag != null) {
|
||||
frag.updateListView();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
scheduleNextUpdate();
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
} else if (result != null && api.getAuthStatus() != ApiRequest.STATUS_OK) {
|
||||
// TODO handle error, e.g auth failed
|
||||
} else if (result == null) {
|
||||
// TODO could not parse result, server/network error?
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected void scheduleNextUpdate() {
|
||||
|
||||
if (m_articlesTask != null) m_articlesTask.cancel();
|
||||
|
||||
m_articlesTask = new ArticlesTask();
|
||||
|
||||
if (m_updateMode == UPDATE_INITIAL) {
|
||||
Log.i(TAG, "Scheduling initial update...");
|
||||
m_articlesTimer = new Timer("DownloadInitial");
|
||||
m_articlesTimer.schedule(m_articlesTask, 1000L);
|
||||
} else {
|
||||
Log.i(TAG, "Scheduling sequential update...");
|
||||
m_articlesTimer = new Timer("DownloadSequential");
|
||||
m_articlesTimer.schedule(m_articlesTask, 60*1000L);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue