replace more usages of switch() on resource identifier with if-else

6 files changed, 147 insertions, 156 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index a3b152a7..3f452a63 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -127,26 +127,25 @@ public class OfflineArticleFragment extends Fragment {
 	public boolean onContextItemSelected(MenuItem item) {
 		/* AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
 				.getMenuInfo(); */
-		
-		switch (item.getItemId()) {
-		case R.id.article_link_share:
-			m_activity.shareArticle(m_articleId);
-			return true;
-		case R.id.article_link_copy:
-			if (true) {
-				Cursor article = m_activity.getArticleById(m_articleId);
-				
-				if (article != null) {				
-					m_activity.copyToClipboard(article.getString(article.getColumnIndex("link")));
-					article.close();
-				}
-			}
-			return true;
-		default:
-			Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
-			return super.onContextItemSelected(item);
-		}
-	}
+
+        int itemId = item.getItemId();
+        if (itemId == R.id.article_link_share) {
+            m_activity.shareArticle(m_articleId);
+            return true;
+        } else if (itemId == R.id.article_link_copy) {
+            if (true) {
+                Cursor article = m_activity.getArticleById(m_articleId);
+
+                if (article != null) {
+                    m_activity.copyToClipboard(article.getString(article.getColumnIndex("link")));
+                    article.close();
+                }
+            }
+            return true;
+        }
+        Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
+        return super.onContextItemSelected(item);
+    }
 	
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View v,
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java
index 50335966..1f8f3dc6 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java
@@ -169,15 +169,13 @@ public class OfflineDetailActivity extends OfflineActivity implements OfflineHea
             return true;
         }
 
-        switch (item.getItemId()) {
-		case android.R.id.home:
-			finish();
-			return true;
-		default:
-			Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
-			return super.onOptionsItemSelected(item);
-		}
-	}
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
+        return super.onOptionsItemSelected(item);
+    }
 	
 	@Override
 	public void onArticleSelected(int articleId, boolean open) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
index 40674bb8..372728e4 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
@@ -92,37 +92,36 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen
 	public boolean onContextItemSelected(MenuItem item) {
 		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
 				.getMenuInfo();
-		
-		switch (item.getItemId()) {
-		case R.id.browse_headlines:
-			if (true) {
-				int catId = getCatIdAtPosition(info.position);
-				if (catId != -10000) {
-					m_activity.onCatSelected(catId, true);
-				}
-			}
-			return true;
-		case R.id.browse_feeds:
-			if (true) {
-				int catId = getCatIdAtPosition(info.position);
-				if (catId != -10000) {
-					m_activity.onCatSelected(catId, false);
-				}
-			}
-			return true;
-		case R.id.catchup_category:
-			if (true) {
-				int catId = getCatIdAtPosition(info.position);
-				if (catId != -10000) {
-					m_activity.catchupFeed(catId, true);
-				}
-			}
-			return true;	
-		default:
-			Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
-			return super.onContextItemSelected(item);
-		}
-	}
+
+        int itemId = item.getItemId();
+        if (itemId == R.id.browse_headlines) {
+            if (true) {
+                int catId = getCatIdAtPosition(info.position);
+                if (catId != -10000) {
+                    m_activity.onCatSelected(catId, true);
+                }
+            }
+            return true;
+        } else if (itemId == R.id.browse_feeds) {
+            if (true) {
+                int catId = getCatIdAtPosition(info.position);
+                if (catId != -10000) {
+                    m_activity.onCatSelected(catId, false);
+                }
+            }
+            return true;
+        } else if (itemId == R.id.catchup_category) {
+            if (true) {
+                int catId = getCatIdAtPosition(info.position);
+                if (catId != -10000) {
+                    m_activity.catchupFeed(catId, true);
+                }
+            }
+            return true;
+        }
+        Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
+        return super.onContextItemSelected(item);
+    }
 	
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
index 6dd85a87..c0b63330 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
@@ -56,26 +56,25 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem
 	public boolean onContextItemSelected(MenuItem item) {
 		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
 				.getMenuInfo();
-		switch (item.getItemId()) {
-		case R.id.browse_headlines:
-			if (true) {
-				int feedId = getFeedIdAtPosition(info.position);
-				if (feedId != -10000) {
-					m_activity.onFeedSelected(feedId);
-				}
-			}
-			return true;
-		case R.id.catchup_feed:
-			int feedId = getFeedIdAtPosition(info.position);
-			if (feedId != -10000) {
-				m_activity.catchupFeed(feedId, false);
-			}
-			return true;
-		default:
-			Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
-			return super.onContextItemSelected(item);
-		}
-	}
+        int itemId = item.getItemId();
+        if (itemId == R.id.browse_headlines) {
+            if (true) {
+                int feedId = getFeedIdAtPosition(info.position);
+                if (feedId != -10000) {
+                    m_activity.onFeedSelected(feedId);
+                }
+            }
+            return true;
+        } else if (itemId == R.id.catchup_feed) {
+            int feedId = getFeedIdAtPosition(info.position);
+            if (feedId != -10000) {
+                m_activity.catchupFeed(feedId, false);
+            }
+            return true;
+        }
+        Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId());
+        return super.onContextItemSelected(item);
+    }
 	
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View v,
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index d448117c..669e4115 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -158,79 +158,78 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 	}
 
 	private boolean onArticleMenuItemSelected(MenuItem item, final int articleId) {
-		switch (item.getItemId()) {
-			case R.id.headlines_article_unread:
-				if (true) {
+        int itemId = item.getItemId();
+        if (itemId == R.id.headlines_article_unread) {
+            if (true) {
 
-					SQLiteStatement stmt = m_activity.getDatabase().compileStatement(
-							"UPDATE articles SET modified = 1, unread = not unread " + "WHERE " + BaseColumns._ID
-									+ " = ?");
-
-					stmt.bindLong(1, articleId);
-					stmt.execute();
-					stmt.close();
-
-					refresh();
-				}
-				return true;
-			case R.id.headlines_article_link_copy:
-				if (true) {
-					Cursor article = m_activity.getArticleById(articleId);
-
-					if (article != null) {
-						m_activity.copyToClipboard(article.getString(article.getColumnIndex("link")));
-						article.close();
-					}
-				}
-				return true;
-			case R.id.headlines_article_link_open:
-				if (true) {
-					Cursor article = m_activity.getArticleById(articleId);
-
-					if (article != null) {
-						m_activity.openUri(Uri.parse(article.getString(article.getColumnIndex("link"))));
+                SQLiteStatement stmt = m_activity.getDatabase().compileStatement(
+                        "UPDATE articles SET modified = 1, unread = not unread " + "WHERE " + BaseColumns._ID
+                                + " = ?");
 
-						// TODO: mark article as read, set modified = 1, refresh
+                stmt.bindLong(1, articleId);
+                stmt.execute();
+                stmt.close();
 
-						article.close();
-					}
-				}
-				return true;
-			case R.id.headlines_share_article:
-				m_activity.shareArticle(articleId);
-				return true;
-			case R.id.catchup_above:
-				if (true) {
-					AlertDialog.Builder builder = new AlertDialog.Builder(
-							m_activity)
-							.setMessage(R.string.confirm_catchup_above)
-							.setPositiveButton(R.string.dialog_ok,
-									new Dialog.OnClickListener() {
-										public void onClick(DialogInterface dialog,
-															int which) {
-
-											catchupAbove(articleId);
+                refresh();
+            }
+            return true;
+        } else if (itemId == R.id.headlines_article_link_copy) {
+            if (true) {
+                Cursor article = m_activity.getArticleById(articleId);
+
+                if (article != null) {
+                    m_activity.copyToClipboard(article.getString(article.getColumnIndex("link")));
+                    article.close();
+                }
+            }
+            return true;
+        } else if (itemId == R.id.headlines_article_link_open) {
+            if (true) {
+                Cursor article = m_activity.getArticleById(articleId);
 
-										}
-									})
-							.setNegativeButton(R.string.dialog_cancel,
-									new Dialog.OnClickListener() {
-										public void onClick(DialogInterface dialog,
-															int which) {
+                if (article != null) {
+                    m_activity.openUri(Uri.parse(article.getString(article.getColumnIndex("link"))));
 
-										}
-									});
+                    // TODO: mark article as read, set modified = 1, refresh
 
-					AlertDialog dialog = builder.create();
-					dialog.show();
-				}
-				return true;
-			default:
-				Log.d(TAG, "onArticleMenuItemSelected, unhandled id=" + item.getItemId());
-				return false;
-		}
+                    article.close();
+                }
+            }
+            return true;
+        } else if (itemId == R.id.headlines_share_article) {
+            m_activity.shareArticle(articleId);
+            return true;
+        } else if (itemId == R.id.catchup_above) {
+            if (true) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(
+                        m_activity)
+                        .setMessage(R.string.confirm_catchup_above)
+                        .setPositiveButton(R.string.dialog_ok,
+                                new Dialog.OnClickListener() {
+                                    public void onClick(DialogInterface dialog,
+                                                        int which) {
+
+                                        catchupAbove(articleId);
+
+                                    }
+                                })
+                        .setNegativeButton(R.string.dialog_cancel,
+                                new Dialog.OnClickListener() {
+                                    public void onClick(DialogInterface dialog,
+                                                        int which) {
+
+                                    }
+                                });
+
+                AlertDialog dialog = builder.create();
+                dialog.show();
+            }
+            return true;
+        }
+        Log.d(TAG, "onArticleMenuItemSelected, unhandled id=" + item.getItemId());
+        return false;
 
-	}
+    }
 
 	private void catchupAbove(int articleId) {
 		SQLiteStatement stmt = null;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
index efd1ed97..78dad8f3 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java
@@ -141,9 +141,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
             return true;
         }
 
-    	switch (item.getItemId()) {
-        case R.id.headlines_toggle_sort_order:
-            /* SharedPreferences.Editor editor = m_prefs.edit();
+        if (item.getItemId() == R.id.headlines_toggle_sort_order) {/* SharedPreferences.Editor editor = m_prefs.edit();
             editor.putBoolean("offline_oldest_first", !m_prefs.getBoolean("offline_oldest_first", false));
             editor.commit();
             refresh(); */
@@ -155,7 +153,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
             AlertDialog.Builder builder = new AlertDialog.Builder(this)
                     .setTitle(getString(R.string.headlines_sort_articles_title))
                     .setSingleChoiceItems(
-                            new String[] {
+                            new String[]{
                                     getString(R.string.headlines_sort_default),
                                     getString(R.string.headlines_sort_oldest_first)
                             },
@@ -175,7 +173,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
                                             if (true) {
                                                 SharedPreferences.Editor editor = m_prefs.edit();
                                                 editor.putBoolean("offline_oldest_first", true);
-												editor.apply();
+                                                editor.apply();
                                             }
                                             break;
                                     }
@@ -194,11 +192,10 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea
 			invalidateOptionsMenu();
 			refresh();
 			return true; */
-		default:
-			Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
-			return super.onOptionsItemSelected(item);
-		}
-	}
+        }
+        Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId());
+        return super.onOptionsItemSelected(item);
+    }
 	
 	@Override
 	public void onSaveInstanceState(Bundle out) {