code clean-up

code clean-up and replaced ab_icon png with vector

Author: javalc6

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "livio.rssreader"
         minSdkVersion 23
         targetSdkVersion 35
-        versionCode 108
-        versionName "1.0.8"
+        versionCode 109
+        versionName "1.0.9"
     }
 
     compileOptions {

app/src/main/java/livio/rssreader/RSSReader.java

@@ -126,7 +126,7 @@
 import tools.FileHandler;
 import tools.FileManager;
 import tools.LocalBroadcastManager;//added after deprecation of orignal class from Google
-//import tools.ReportBug;
+import tools.ReportBug;
 import workers.RSSReaderWorker;
 
 import static livio.rssreader.SelectCategory.ID_CATEGORY;
@@ -197,7 +197,6 @@ public final class RSSReader extends AppCompatActivity implements FileHandler, A
     private final static long zzBackup_age = 7L * 24L * 3600L * 1000L;
 
     private static String latest_feed_id = null;
-    static FeedsDB feedsDB = FeedsDB.getInstance();//contiene feeds per tutte le categorie e tutte le lingue definite
     static String message_publisher = "unknown";//publisher
     //colorpicker
 
@@ -236,7 +235,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.main);
 
-//        ReportBug.enableMonitor(this);
+        ReportBug.enableMonitor(this);
 
         System.setProperty("http.keepAlive", "false"); // workaround to avoid responseCode = -1 problem
 
@@ -255,13 +254,6 @@ public void onCreate(Bundle savedInstanceState) {
         final Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        ActionBar ab = getSupportActionBar();
-        if (ab != null) {
-            ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME |  ActionBar.DISPLAY_SHOW_TITLE);
-            ab.setIcon(R.drawable.ab_icon);
-            ab.setTitle(R.string.app_name);
-        }
-
         mTts = new TTSEngine(this, new UtteranceProgressListener() {
             @Override
             public void onDone(String utteranceId) {
@@ -471,6 +463,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             String pref_lang = prefs.getString(PREF_FEEDS_LANGUAGE, getString(R.string.default_feed_language_code));
             String feed_id = prefs.getString(PREF_FEED_ID, null);//lang
             if (feed_id == null) {
+                FeedsDB feedsDB = FeedsDB.getInstance();
                 feed_id = feedsDB.getDefaultFeedId(pref_lang);//lang
             }
             File feedFile = new File(getCacheDir(), feed_id.concat(".cache"));
@@ -610,6 +603,7 @@ protected void onResume() {
         String feed_id = prefs.getString(PREF_FEED_ID, null);//lang
         if (feed_id == null) {
             String pref_lang = prefs.getString(PREF_FEEDS_LANGUAGE, getString(R.string.default_feed_language_code));
+            FeedsDB feedsDB = FeedsDB.getInstance();
             feed_id = feedsDB.getDefaultFeedId(pref_lang);//lang
         }
         File feedFile = new File(getCacheDir(), feed_id.concat(".cache"));
@@ -737,6 +731,7 @@ public void onReceive(Context context, Intent intent) {
                     String feed_id = prefs.getString(PREF_FEED_ID, null);//lang
                     if (feed_id == null) {
                         String pref_lang = prefs.getString(PREF_FEEDS_LANGUAGE, getString(R.string.default_feed_language_code));
+                        FeedsDB feedsDB = FeedsDB.getInstance();
                         feed_id = feedsDB.getDefaultFeedId(pref_lang);//lang
                     }
                     File feedFile = new File(getCacheDir(), feed_id.concat(".cache"));
@@ -889,6 +884,7 @@ public boolean decodeFile(String content) throws JSONException {
         }
 //sync to file if needed
         if (listUserFeeds.size() + listUserCats.size() > 0) {
+            FeedsDB feedsDB = FeedsDB.getInstance();
             UserDB ft = UserDB.getInstance(this, prefs, feedsDB, listUserFeeds, listUserCats); //create feedstree with restored user feeds
             ft.synctoFile(this); //write restored user feeds to file
         }

app/src/main/java/livio/rssreader/backend/UserDB.java

@@ -25,7 +25,6 @@
 import android.util.Log;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import livio.rssreader.BuildConfig;
 import livio.rssreader.R;
 import livio.rssreader.RSSReader;
@@ -74,7 +73,7 @@ public synchronized static UserDB getInstance(Context context, SharedPreferences
         return singleton;
     }
 
-    public synchronized static UserDB getInstance(Context context, SharedPreferences prefs, @Nullable FeedsDB feedsDB, ArrayList<String[]> listUserFeeds, ArrayList<String[]> listUserCats) {
+    public synchronized static UserDB getInstance(Context context, SharedPreferences prefs, FeedsDB feedsDB, ArrayList<String[]> listUserFeeds, ArrayList<String[]> listUserCats) {
         if (singleton == null) {
             singleton = new UserDB(context, prefs, listUserFeeds, listUserCats, feedsDB);
         } else {
@@ -91,6 +90,7 @@ public synchronized static UserDB getInstance(Context context, SharedPreferences
         return singleton;
     }
 
+    /** @noinspection unchecked*/
     private UserDB(Context context, SharedPreferences prefs, FeedsDB feedsDB) {
         if (BuildConfig.DEBUG)
             Log.d(tag, "new UserDB from file in feedListfn");

app/src/main/java/tools/ReportBug.java

@@ -0,0 +1,9 @@
+package tools;
+
+import android.content.Context;
+
+public final class ReportBug {
+    public static void enableMonitor(final Context ctx) {
+        //for future use
+    }
+}

app/src/main/res/drawable-hdpi/ab_icon.png

@@ -0,0 +1,6 @@
+<vector android:height="32dp"
+    android:viewportHeight="10.0"
+    android:viewportWidth="10.0" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="m2 2H8V8H2z"/>
+    <path android:fillColor="#FFFA6900" android:pathData="m8 1a1 1 0 0 1 1 1v6a-1 1 0 0 1 -1 1h-6a-1 -1 0 0 1 -1 -1v-6a1 1 0 0 1 1 -1zm-6 2a5 5 0 0 1 5 5h1a6 6 0 0 0 -6 -6zm0 2a3 3 0 0 1 3 3h1a4 4 0 0 0 -4 -4zm1 1a1 1 0 1 0 1 1a1 1 0 0 0 -1 -1"/>
+</vector>