summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/menu/main_menu.xml17
-rw-r--r--res/menu/offline_menu.xml6
-rw-r--r--res/values/strings.xml1
-rw-r--r--src/org/fox/ttrss/MainActivity.java157
-rw-r--r--src/org/fox/ttrss/OfflineFeedsFragment.java4
5 files changed, 101 insertions, 84 deletions
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 378e0fbd..72f05555 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -5,12 +5,6 @@
<group android:id="@+id/menu_group_feeds" >
<item
- android:id="@+id/go_offline"
- android:icon="@drawable/ic_menu_cloud"
- android:showAsAction="ifRoom|withText"
- android:title="@string/go_offline"/>
-
- <item
android:id="@+id/back_to_categories"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:showAsAction="ifRoom|withText"
@@ -25,10 +19,16 @@
<item
android:id="@+id/update_feeds"
android:icon="@android:drawable/ic_menu_rotate"
- android:showAsAction=""
+ android:showAsAction="ifRoom|"
android:title="@string/update_feeds"/>
<item
+ android:id="@+id/go_offline"
+ android:icon="@drawable/ic_menu_cloud"
+ android:showAsAction="ifRoom|withText"
+ android:title="@string/go_offline"/>
+
+ <item
android:id="@+id/logout"
android:icon="@drawable/ic_menu_exit"
android:showAsAction=""
@@ -36,7 +36,7 @@
</group>
<group android:id="@+id/menu_group_headlines" >
-
+
<item
android:id="@+id/go_offline"
android:icon="@drawable/ic_menu_cloud"
@@ -46,6 +46,7 @@
<item
android:id="@+id/headlines_mark_as_read"
android:icon="@drawable/ic_menu_tick"
+ android:showAsAction=""
android:title="@string/headlines_mark_as_read"/>
<item
diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index 4cb744f3..c4027d6b 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -20,12 +20,6 @@
android:icon="@android:drawable/ic_menu_agenda"
android:showAsAction=""
android:title="@string/menu_all_feeds"/>
-
- <item
- android:id="@+id/logout"
- android:icon="@drawable/ic_menu_exit"
- android:showAsAction=""
- android:title="@string/logout"/>
</group>
<group android:id="@+id/menu_group_headlines" >
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3a508cc5..ea69bd1c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,4 +101,5 @@
<string name="dialog_offline_go">Go offline</string>
<string name="dialog_cancel">Cancel</string>
<string name="syncing_offline_data">Synchronizing offline data...</string>
+ <string name="dialog_offline_switch_prompt">Download unread articles and go offline?</string>
</resources> \ No newline at end of file
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 4111b03f..2f0f6e24 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -42,6 +42,9 @@ import com.google.gson.reflect.TypeToken;
public class MainActivity extends FragmentActivity implements FeedsFragment.OnFeedSelectedListener, ArticleOps, FeedCategoriesFragment.OnCatSelectedListener {
private final String TAG = this.getClass().getSimpleName();
+
+ private final int OFFLINE_SYNC_SEQ = 60;
+ private final int OFFLINE_SYNC_MAX = 500;
private SharedPreferences m_prefs;
private String m_themeName = "";
@@ -466,7 +469,7 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
put("view_mode", "unread");
put("show_content", "true");
put("skip", String.valueOf(m_articleOffset));
- put("limit", "30");
+ put("limit", String.valueOf(OFFLINE_SYNC_SEQ));
}
};
@@ -475,76 +478,93 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
@SuppressWarnings("unchecked")
public void switchOffline() {
- Log.d(TAG, "offline: starting");
-
- if (m_sessionId != null) {
- findViewById(R.id.loading_container).setVisibility(View.VISIBLE);
- findViewById(R.id.main).setVisibility(View.INVISIBLE);
-
- setLoadingStatus(R.string.offline_downloading, true);
-
- // Download feeds
-
- getWritableDb().execSQL("DELETE FROM feeds;");
-
- ApiRequest req = new ApiRequest(getApplicationContext()) {
- @Override
- protected void onPostExecute(JsonElement content) {
- if (content != null) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(this).
+ setMessage(R.string.dialog_offline_switch_prompt).
+ setPositiveButton(R.string.dialog_offline_go, new Dialog.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+
+ Log.d(TAG, "offline: starting");
+
+ if (m_sessionId != null) {
+
+ findViewById(R.id.loading_container).setVisibility(View.VISIBLE);
+ findViewById(R.id.main).setVisibility(View.INVISIBLE);
- try {
- Type listType = new TypeToken<List<Feed>>() {}.getType();
- List<Feed> feeds = new Gson().fromJson(content, listType);
-
- SQLiteStatement stmtInsert = getWritableDb().compileStatement("INSERT INTO feeds " +
- "("+BaseColumns._ID+", title, feed_url, has_icon, cat_id) " +
- "VALUES (?, ?, ?, ?, ?);");
-
- for (Feed feed : feeds) {
- 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.execute();
- }
+ setLoadingStatus(R.string.offline_downloading, true);
+
+ // Download feeds
+
+ getWritableDb().execSQL("DELETE FROM feeds;");
+
+ ApiRequest req = new ApiRequest(getApplicationContext()) {
+ @Override
+ protected void onPostExecute(JsonElement content) {
+ if (content != null) {
+
+ try {
+ Type listType = new TypeToken<List<Feed>>() {}.getType();
+ List<Feed> feeds = new Gson().fromJson(content, listType);
+
+ SQLiteStatement stmtInsert = getWritableDb().compileStatement("INSERT INTO feeds " +
+ "("+BaseColumns._ID+", title, feed_url, has_icon, cat_id) " +
+ "VALUES (?, ?, ?, ?, ?);");
+
+ for (Feed feed : feeds) {
+ 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.execute();
+ }
- stmtInsert.close();
+ stmtInsert.close();
- Log.d(TAG, "offline: done downloading feeds");
-
- m_articleOffset = 0;
-
- getWritableDb().execSQL("DELETE FROM articles;");
-
- offlineGetArticles();
- } catch (Exception e) {
- e.printStackTrace();
- setLoadingStatus(R.string.offline_switch_error, false);
- }
-
+ Log.d(TAG, "offline: done downloading feeds");
+
+ m_articleOffset = 0;
+
+ getWritableDb().execSQL("DELETE FROM articles;");
+
+ offlineGetArticles();
+ } catch (Exception e) {
+ e.printStackTrace();
+ setLoadingStatus(R.string.offline_switch_error, false);
+ }
+
+ } else {
+ setLoadingStatus(getErrorMessage(), false);
+ // TODO error, could not download feeds, properly report API error (toast)
+ }
+ }
+ };
+
+ HashMap<String,String> map = new HashMap<String,String>() {
+ {
+ put("op", "getFeeds");
+ put("sid", m_sessionId);
+ put("cat_id", "-3");
+ put("unread_only", "true");
+ }
+ };
+
+ req.execute(map);
} else {
- setLoadingStatus(getErrorMessage(), false);
- // TODO error, could not download feeds, properly report API error (toast)
+ switchOfflineSuccess();
}
}
- };
-
- HashMap<String,String> map = new HashMap<String,String>() {
- {
- put("op", "getFeeds");
- put("sid", m_sessionId);
- put("cat_id", "-3");
- put("unread_only", "true");
- }
- };
-
- req.execute(map);
- } else {
- switchOfflineSuccess();
- }
+ }).
+ setNegativeButton(R.string.dialog_cancel, new Dialog.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ //
+ }
+ });
+
+ AlertDialog dlg = builder.create();
+ dlg.show();
+
}
public void switchOfflineSuccess() {
@@ -746,10 +766,9 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
case R.id.headlines_select:
if (hf != null) {
Dialog dialog = new Dialog(this);
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.headlines_select_dialog);
-
- builder.setSingleChoiceItems(new String[] { getString(R.string.headlines_select_all),
+ AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ .setTitle(R.string.headlines_select_dialog)
+ .setSingleChoiceItems(new String[] { getString(R.string.headlines_select_all),
getString(R.string.headlines_select_unread), getString(R.string.headlines_select_none) }, 0, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -1796,7 +1815,7 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
Log.d(TAG, "offline: received " + articles.size() + " articles");
- if (articles.size() == 30 && m_articleOffset < 500) {
+ if (articles.size() == OFFLINE_SYNC_SEQ && m_articleOffset < OFFLINE_SYNC_MAX) {
offlineGetArticles();
} else {
switchOfflineSuccess();
diff --git a/src/org/fox/ttrss/OfflineFeedsFragment.java b/src/org/fox/ttrss/OfflineFeedsFragment.java
index b76dd4d4..c0de692b 100644
--- a/src/org/fox/ttrss/OfflineFeedsFragment.java
+++ b/src/org/fox/ttrss/OfflineFeedsFragment.java
@@ -56,8 +56,10 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
public Cursor createCursor() {
String unreadOnly = ((OfflineActivity)getActivity()).getUnreadOnly() ? "unread > 0" : null;
+ String order = m_prefs.getBoolean("sort_feeds_by_unread", false) ? "unread DESC, title" : "title";
+
return ((OfflineActivity)getActivity()).getReadableDb().query("feeds_unread",
- null, unreadOnly, null, null, null, "title");
+ null, unreadOnly, null, null, null, order);
}
public void refresh() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-14 11:02:05 +0000