minor cleanup

10 files changed, 9 insertions, 60 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
index 2496b84c..80467f63 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java
@@ -50,7 +50,7 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
     private boolean m_loadingInProgress;
     private ExecutorService m_executor;
     private Handler m_mainHandler = new Handler(Looper.getMainLooper());
-    private MutableLiveData<Long> m_lastUpdate = new MutableLiveData<>(new Long(0));
+    private MutableLiveData<Long> m_lastUpdate = new MutableLiveData<>(Long.valueOf(0));
 
     public ArticleModel(@NonNull Application application) {
         super(application);
@@ -100,7 +100,7 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
         }
     }
 
-    private ArticleList loadInBackground() {
+    private void loadInBackground() {
         Log.d(TAG, this + " loadInBackground append=" + m_append + " offset=" + m_offset);
 
         ArticleList articlesWork = new ArticleList(m_articles.getValue());
@@ -228,7 +228,6 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle
 
         m_loadingInProgress = false;
 
-        return articlesWork;
     }
 
     private int getSkip(boolean append, ArticleList articles) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java
index 86a31465..def61209 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java
@@ -17,7 +17,7 @@ import java.net.URL;
 public abstract class BaseFeedlistFragment extends androidx.fragment.app.Fragment {
     abstract public void refresh();
 
-    public void initDrawerHeader(LayoutInflater inflater, View view, ListView list, final CommonActivity activity, final SharedPreferences prefs, boolean isRoot) {
+    public void initDrawerHeader(LayoutInflater inflater, View view, ListView list, final CommonActivity activity, final SharedPreferences prefs) {
 
         View layout = inflater.inflate(R.layout.drawer_header, list, false);
         list.addHeaderView(layout, null, false);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index 0c77cbce..97e356c4 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -64,7 +64,6 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 	public final static String FRAG_ARTICLE = "article";
 	public final static String FRAG_FEEDS = "feeds";
 	public final static String FRAG_CATS = "cats";
-	public final static String FRAG_DIALOG = "dialog";
 
 	public final static String THEME_DEFAULT = "THEME_FOLLOW_DEVICE";
 
@@ -72,7 +71,6 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc
 	public final static String NOTIFICATION_CHANNEL_PRIORITY = "channel_priority";
 
 	public static final int EXCERPT_MAX_LENGTH = 256;
-    public static final int EXCERPT_MAX_QUERY_LENGTH = 2048;
 	public static final int LABEL_BASE_INDEX = -1024;
 
 	public static final int PENDING_INTENT_CHROME_SHARE = 1;
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index abdb320d..1d735490 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -62,9 +62,9 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 		params.put("op", "getCategories");
 		params.put("sid", sessionId);
 		params.put("enable_nested", "true");
-		if (unreadOnly) {
-			params.put("unread_only", String.valueOf(unreadOnly));
-		}
+
+		if (unreadOnly)
+			params.put("unread_only", "true");
 
 		return new ApiLoader(getContext(), params);
 	}
@@ -288,7 +288,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
 		m_list = view.findViewById(R.id.feeds);
 		m_adapter = new FeedCategoryListAdapter(getActivity(), R.layout.feeds_row, m_cats);
 
-		initDrawerHeader(inflater, view, m_list, m_activity, m_prefs, true);
+		initDrawerHeader(inflater, view, m_list, m_activity, m_prefs);
 
         m_list.setAdapter(m_adapter);
         m_list.setOnItemClickListener(this);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index 7c6a2237..f618b5b1 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -327,7 +327,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
 
 		m_list = view.findViewById(R.id.feeds);
 
-		initDrawerHeader(inflater, view, m_list, m_activity, m_prefs, !m_enableParentBtn);
+		initDrawerHeader(inflater, view, m_list, m_activity, m_prefs);
 
 		if (m_enableParentBtn) {
 			View layout = inflater.inflate(R.layout.feeds_goback, m_list, false);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 28ffafec..d39ee038 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -103,7 +103,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 	private Feed m_feed;
 	private int m_activeArticleId;
 	private String m_searchQuery = "";
-	//private HeadlinesLoader m_loader;
 
 	private SharedPreferences m_prefs;
 
@@ -1482,10 +1481,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 		}
 	}
 
-	public int getActiveArticleId() {
-		return m_activeArticleId;
-	}
-
 	public String getSearchQuery() {
 		return m_searchQuery;
 	}
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 4faff8af..26dab50d 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -1394,15 +1394,6 @@ article.score = Integer.parseInt(edit.getText().toString());
 		return m_lastImageHitTestUrl;
 	}
 
-	public boolean isWifiConnected() {
-		NetworkInfo wifi = m_cmgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-
-		if (wifi != null)
-			return wifi.isConnected();
-
-		return false;
-	}
-
 	public int getResizeWidth() {
 		Display display = getWindowManager().getDefaultDisplay();
 		Point size = new Point();
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonActivity.java
index 63458532..9c9187d9 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonActivity.java
@@ -10,7 +10,6 @@ public class CommonActivity extends Activity {
 	private final String TAG = this.getClass().getSimpleName();
 	
 	private boolean m_smallScreenMode = true;
-	private boolean m_compatMode = false;
 
 	protected void setSmallScreen(boolean smallScreen) {
 		Log.d(TAG, "m_smallScreenMode=" + smallScreen);
@@ -27,23 +26,10 @@ public class CommonActivity extends Activity {
 		toast.show();
 	}
 
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		m_compatMode = android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB;
-
-		Log.d(TAG, "m_compatMode=" + m_compatMode);
-		
-		super.onCreate(savedInstanceState);
-	}
-
 	public boolean isSmallScreen() {
 		return m_smallScreenMode;
 	}
 
-	public boolean isCompatMode() {
-		return m_compatMode;
-	}
-
 	public boolean isPortrait() {
 		Display display = getWindowManager().getDefaultDisplay(); 
 		
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
index c0f63937..f0795dd8 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java
@@ -296,11 +296,7 @@ public class Article implements Parcelable {
 	}
 
 	public boolean equalsById(Article article) {
-		if (article != null && id == article.id) {
-			return true;
-		} else {
-			return false;
-		}
+        return article != null && id == article.id;
 	}
 
 	@SuppressWarnings("rawtypes")
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/ArticleList.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/ArticleList.java
index 74df2c33..6724acb0 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/ArticleList.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/ArticleList.java
@@ -35,22 +35,6 @@ public class ArticleList extends CopyOnWriteArrayList<Article> {
 		return this.stream().filter(a -> { return a.unread; }).count();
 	}
 
-	public long getSizeWithoutFooters() {
-		return this.stream().filter(a -> { return a.id > 0; }).count();
-	}
-
-	/** strips all trailing items with negative IDs (Article.TYPE_LOADMORE, Article.TYPE_AMR_FOOTER) */
-	public void stripFooters() {
-		for (ListIterator<Article> iterator = this.listIterator(size()); iterator.hasPrevious();) {
-			final Article article = iterator.previous();
-
-			if (article.id < 0)
-				this.remove(article);
-			else
-				break;
-		}
-	}
-
 	public int getPositionById(int id) {
 		for (int i = 0; i < size(); i++) {
 			if (get(i).id == id) {