From fba3486928ccc5a8f2784c6a2175615bfdc589b3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 12 Nov 2014 09:23:27 +0300
Subject: remove toggle unread article menu item

---
 .../src/main/java/org/fox/ttrss/OnlineActivity.java     | 17 +----------------
 .../java/org/fox/ttrss/offline/OfflineActivity.java     | 17 -----------------
 org.fox.ttrss/src/main/res/menu/main_menu.xml           |  6 ------
 org.fox.ttrss/src/main/res/menu/offline_menu.xml        |  5 -----
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 2d1a0a84..4c848fc9 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -1013,18 +1013,6 @@ public class OnlineActivity extends CommonActivity {
 				}
 			}
 			return true;
-		case R.id.set_unread:
-			if (ap != null && ap.getSelectedArticle() != null) {
-				Article a = ap.getSelectedArticle();
-				
-				if (a != null) {
-					a.unread = !a.unread;
-					saveArticleUnread(a);
-				}
-				
-				if (hf != null) hf.notifyUpdated();
-			}
-			return true;
 		case R.id.set_labels:
 			if (ap != null && ap.getSelectedArticle() != null) {
 				if (getApiLevel() != 7) {
@@ -1575,10 +1563,7 @@ public class OnlineActivity extends CommonActivity {
 
 					m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.ic_menu_published_light :
 						R.drawable.ic_menu_unpublished_light);
-
-					m_menu.findItem(R.id.set_unread).setIcon(article.unread ? R.drawable.ic_unread_light :
-						R.drawable.ic_read_light);
-				}				
+				}
 			}
 			
 			HeadlinesFragment hf = (HeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index 56e95400..79b70984 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -539,20 +539,6 @@ public class OfflineActivity extends CommonActivity {
 				refresh();
 			}
 			return true;
-		case R.id.set_unread:
-			if (oap != null) {
-				int articleId = oap.getSelectedArticleId();
-				
-				SQLiteStatement stmt = getWritableDb().compileStatement(
-						"UPDATE articles SET modified = 1, unread = 1 WHERE "
-								+ BaseColumns._ID + " = ?");
-				stmt.bindLong(1, articleId);
-				stmt.execute();
-				stmt.close();
-				
-				refresh();
-			}
-			return true;
 		default:
 			Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
 			return super.onOptionsItemSelected(item);
@@ -606,9 +592,6 @@ public class OfflineActivity extends CommonActivity {
 					m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.ic_menu_published_light :
 						R.drawable.ic_menu_unpublished_light);
 
-					m_menu.findItem(R.id.set_unread).setIcon(unread ? R.drawable.ic_unread_light :
-						R.drawable.ic_read_light);
-					
 					article.close();
 				}				
 			}
diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml
index 2bb72bc9..33a745aa 100644
--- a/org.fox.ttrss/src/main/res/menu/main_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml
@@ -140,12 +140,6 @@
                 android:id="@+id/catchup_above"
                 android:title="@string/article_mark_read_above"/>
 
-            <item
-                android:id="@+id/set_unread"
-                android:icon="@drawable/ic_read_light"
-                app:showAsAction=""
-                android:title="@string/article_set_unread"/>
-
         </group>
 
         <item
diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
index 6f576cdd..397df758 100644
--- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
@@ -84,11 +84,6 @@
             android:icon="@drawable/ic_share_light"
             app:showAsAction="ifRoom"
             android:title="@string/share_article"/>
-        <item
-            android:id="@+id/set_unread"
-            android:icon="@drawable/ic_read_light"
-            app:showAsAction=""
-            android:title="@string/article_set_unread"/>
         <item
             android:id="@+id/catchup_above"
             android:title="@string/article_mark_read_above"/>
-- 
cgit v1.2.3