maintenance release

maintenance release including updated support libraries

Author: javalc6

app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "livio.rssreader"
         minSdkVersion 23
-        targetSdkVersion 30
-        versionCode 100
-        versionName "1.00"
+        targetSdkVersion 31
+        versionCode 101
+        versionName "1.0.1"
     }
 
     compileOptions {
@@ -26,15 +26,17 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.appcompat:appcompat-resources:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat-resources:1.5.1'
 
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.work:work-runtime:2.5.0'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.work:work-runtime:2.7.1'
 
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.7.0'
+
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' //added as workaround for issue https://issuetracker.google.com/issues/238425626
 
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="livio.rssreader">
-	<uses-permission android:name="android.permission.INTERNET" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /><!--required to access data written before user uninstalls and reinstalls app-->
@@ -41,18 +42,18 @@
                   android:label="@string/show_help_label"/>
         <activity
             android:name=".SelectColors" android:exported="false" android:resizeableActivity="false" android:configChanges="orientation|screenSize"
-            android:theme="@style/Theme.MaterialComponents.Dialog.Bridge"
+            android:theme="@style/MyDialogTheme"
             android:label="@string/prefs_theme_sub">
         </activity>
         <!-- Widget -->
-        <receiver android:name="livio.rssreader.RSSWidget" android:label="@string/widget_name">
+        <receiver android:name="livio.rssreader.RSSWidget" android:exported="true" android:label="@string/widget_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/rss_widget" />
         </receiver>
         <!-- Widget dark -->
-        <receiver android:name="livio.rssreader.RSSWidgetDark" android:label="@string/widget_name">
+        <receiver android:name="livio.rssreader.RSSWidgetDark" android:exported="true" android:label="@string/widget_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>

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

@@ -14,6 +14,8 @@
 */
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import livio.rssreader.backend.UserDB;
 import livio.rssreader.backend.Item;
 import livio.rssreader.backend.ItemArrayAdapter;
@@ -37,6 +39,7 @@
 
 import android.view.MenuItem;
 
+import android.view.View;
 import android.widget.ListView;
 
 import static livio.rssreader.backend.UserDB.DEFAULT_FEED_ID;
@@ -60,15 +63,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		if (t != null) {
 			t.setDisplayHomeAsUpEnabled(true);
 		}
-        		
-        Intent startingIntent = getIntent();
-        if (startingIntent != null) {
-        	Bundle b = startingIntent.getBundleExtra(SelectCategory.ID_CATEGORY);
-        	if (b != null)	{
-        		cat = b.getString("category");
-    		}
-        }		        
-		
+
 	}
 
 /////////////////////////////////////////    
@@ -78,14 +73,22 @@ public static class FeedsFragment extends ListFragment implements NewFeedDialog.
         SharedPreferences prefs;
 
 		@Override
-        public void onActivityCreated(Bundle savedInstanceState) {
-            super.onActivityCreated(savedInstanceState);
+        public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {//03-12-2022: sostituisce onActivityCreated deprecated
+            super.onViewCreated(view, savedInstanceState);
 
 	        final Activity act = getActivity();
             prefs = PreferenceManager.getDefaultSharedPreferences(act);
 
             udb = UserDB.getInstance(act, prefs);
 
+            Intent startingIntent = act.getIntent();
+            if (startingIntent != null) {
+                Bundle b = startingIntent.getBundleExtra(SelectCategory.ID_CATEGORY);
+                if (b != null)	{
+                    cat = b.getString("category");
+                } else Log.e(tag, "missing category!");
+            }
+
             currentUserFeeds = udb.getUserFeeds(cat);
             nativeFeeds = UserDB.getNativeFeeds();
             catIdx = udb.cat2int(cat);
@@ -103,15 +106,15 @@ public void onActivityCreated(Bundle savedInstanceState) {
             ListView lv = getListView();
             lv.setTextFilterEnabled(true);
 
-            lv.setOnItemClickListener((parent, view, position, id) -> { //select a feed
+            lv.setOnItemClickListener((parent, v, position, id) -> { //select a feed
                 SharedPreferences.Editor editor = prefs.edit();
                 editor.putString(RSSReader.PREF_FEED_ID, getFeed(position)[2]);
                 editor.apply();
                 act.setResult(RESULT_OK);
                 act.finish();
             });
 //long click --> edit (work in progress)
-            lv.setOnItemLongClickListener((parent, view, position, id) -> { //edit a feed
+            lv.setOnItemLongClickListener((parent, v, position, id) -> { //edit a feed
                 if (isUserFeed(position)) {//only feeds in user category can be edited
                     String[] feed = getFeed(position);
                     NewFeedDialog editNameDialog = NewFeedDialog.newInstance(feed);
@@ -141,7 +144,8 @@ public void onFinishEditDialog(String[] feed) {//add or replace feed
                     addFeed(cat, feed);
                     iaa.add(new Item(feed[0], false));
                     final Activity act = getActivity();
-                    act.invalidateOptionsMenu();
+                    if (act != null)
+                        act.invalidateOptionsMenu();
                 }
                 iaa.notifyDataSetChanged();
             }

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

@@ -16,9 +16,11 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
@@ -29,6 +31,7 @@
 import tools.SeekBarPreference;
 
 import android.view.MenuItem;
+import android.view.WindowManager;
 
 import static livio.rssreader.RSSReader.PREF_FONTSIZE;
 
@@ -59,7 +62,18 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
-    
+
+    @Override
+    public void onStart() {//14-11-2022: narrow panel in case of table in landscape mode
+        super.onStart();
+        Resources resources = getResources();
+        if (resources.getBoolean(R.bool.is_tablet_landscape)) {//isTablet && isLandscape
+//		int dialogHeight = (int) (getResources().getDisplayMetrics().heightPixels * 0.6);
+            int dialogWidth = (int) (resources.getDisplayMetrics().widthPixels * 0.6);
+            getWindow().setLayout(dialogWidth, WindowManager.LayoutParams.MATCH_PARENT);
+        }
+    }
+
     public static class PrefsFragment extends PreferenceFragmentCompat implements OnSharedPreferenceChangeListener{
     	SharedPreferences prefs;
 
@@ -91,7 +105,7 @@ private void setFontSizeSummary() {
         private static final String DIALOG_FRAGMENT_TAG = "SeekBarDialogPreference";
 
         @Override
-        public void onDisplayPreferenceDialog(Preference preference) {
+        public void onDisplayPreferenceDialog(@NonNull Preference preference) {
 // check if dialog is already showing
             if (getParentFragmentManager().findFragmentByTag(DIALOG_FRAGMENT_TAG) != null) {
                 return;

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

@@ -74,6 +74,8 @@
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -84,6 +86,7 @@
 import android.text.format.DateUtils;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -181,6 +184,8 @@ public final class RSSReader extends AppCompatActivity implements FileHandler, A
     public static final String PREF_CLIENT_VERSION = "client_version";
     public static final String PREF_FEED_ID = "news_feed";
 
+    public static final String PREF_BRICIOLA = "briciola";//used in place of Settings.Secure.ANDROID_ID, DO NOT insert this in backable_prefs
+
     private final static String tag = "RSSReader";
 
     public final static String uniqueWorkerName = "RSSReaderService";
@@ -221,23 +226,30 @@ else if (lang_code.startsWith("de"))
 
     private final FileManager mBackupRestore = new FileManager(this, this, true, APP_FOLDER);
 
-    /** Called when the activity is first created. */
-    @SuppressLint("NewApi")
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+    public Resources.Theme getTheme() {
+        Resources.Theme theme = super.getTheme();
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         int theme_idx = get_theme_idx(prefs, getResources());
         int background = preset_colors[theme_idx][0];
         if (!isDarkColor(background)) { // light background
-            setTheme(R.style.ThemeLightNoActionBar);
+            theme.applyStyle(R.style.ThemeLightNoActionBar, true);
         } else { // dark background
-            setTheme(R.style.ThemeNoActionBar);
+            theme.applyStyle(R.style.ThemeNoActionBar, true);
         }
+        return theme;
+    }
+
+    /** Called when the activity is first created. */
+    @SuppressLint("NewApi")
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (BuildConfig.DEBUG)
             Log.d(tag, "onCreate");
 
         setContentView(R.layout.main);
+        prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
         System.setProperty("http.keepAlive", "false"); // workaround to avoid responseCode = -1 problem
 
@@ -336,7 +348,7 @@ public void run() {
             Uri intent_data = intent.getData();
             if (intent_data != null) {
                 if (BuildConfig.DEBUG)
-                    Log.d(tag, "intent uri: " + intent_data.toString());
+                    Log.d(tag, "intent uri: " + intent_data);
 //TODO: process feed via intent
 //command: adb shell am start -W -a android.intent.action.VIEW -d "<replace with url to feed>"  -t "application/rss+xml"
             }
@@ -434,11 +446,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
         inflater.inflate(R.menu.menu, menu);
         ttsplay = menu.findItem(R.id.menu_play);
         ttsplay.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {//scopedstorage
-            MenuItem restore = menu.findItem(R.id.menu_restore);//scopedstorage
-            restore.getSubMenu().clear();//scopedstorage - disable (local restore / external restore)
-        }
         return true;
     }    
 
@@ -455,7 +462,7 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle item selection
+// Handle item selection
         int itemId = item.getItemId();
         if (itemId == R.id.menu_preferences) {
             showPreferences();
@@ -515,16 +522,27 @@ public boolean onOptionsItemSelected(MenuItem item) {
         } else if (itemId == R.id.menu_backup) {
             doBackup(prefs, mBackupRestore, getResources());
             return true;
-        } else if (itemId == R.id.menu_local_storage) {//restore from local storage (direct) - not valid for Android 11 or later
-            mBackupRestore.readLocalFile(EXTENDED_BACKUP_FILENAME, BACKUP_FILENAME);//scopedstorage
-            return true;
         } else if (itemId == R.id.menu_restore) {//scopedstorage (purtroppo in Android 11 non si riesce ad usare in modo sicuro filename2uri_downloads_Q(), quindi usiamo per il restore comunque il SAF, come nel caso di storage esterno
             if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
                 mBackupRestore.openFileSAF(EXTENDED_BACKUP_MIMETYPE_ONEDRIVE, false);//scopedstorage, use SAF on Android 11 or later
-            } // else ignore
-            return true;
-        } else if (itemId == R.id.menu_ext_storage) {//restore from external storage - not valid for Android 11 or later
-            mBackupRestore.readExternalFile();
+            } else {
+//18-09-2022: nuova gestione con PopupMenu per evitare problemi in ChromeOS basato su Android 11 (o superiore)
+//PopupMenu risolve problema del passaggio del mouse sopra la voce del menu 'restore' che apre il filemanager su ChromeOS in modo indesiderato
+                PopupMenu popup = showRestorePopup(findViewById(R.id.my_toolbar), Gravity.END);
+
+                popup.setOnMenuItemClickListener(item1 -> {
+//                    mDrawerLayout.closeDrawer(mDrawerList);
+                    int itemId1 = item1.getItemId();
+                    if (itemId1 == R.id.menu_ext_storage) {//restore from external storage
+                        mBackupRestore.readExternalFile();
+                        return true;
+                    } else if (itemId1 == R.id.menu_local_storage) {//restore from local storage (direct)
+                        mBackupRestore.readLocalFile(EXTENDED_BACKUP_FILENAME, BACKUP_FILENAME);//scopedstorage
+                        return true;
+                    }
+                    return false;//never happen
+                });
+            }
             return true;
         } else if (itemId == R.id.menu_exit) {
             finishAffinity();//nn
@@ -538,6 +556,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    private PopupMenu showRestorePopup(View view, int gravity) {
+        Context wrapper = new ContextThemeWrapper(RSSReader.this, R.style.MyPopupMenu);//18-09-2022: aggiunto wrapper per risolvere un problema sul colore del testo del popup quando il tema è scuro
+        PopupMenu popup = new PopupMenu(wrapper, view, gravity);
+        Menu popmenu = popup.getMenu();
+        popmenu.add(Menu.NONE, R.id.menu_local_storage, Menu.NONE, R.string.local_storage);//menu_local_storage is hidden in buildNavDrawerItems()
+        popmenu.add(Menu.NONE, R.id.menu_ext_storage, Menu.NONE, R.string.ext_storage);//menu_ext_storage is hidden in buildNavDrawerItems()
+
+        popup.show();
+        return popup;
+    }
+
     private static void doBackup(SharedPreferences prefs, FileManager mBackupRestore, Resources resources) {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {//scopedstorage
             mBackupRestore.createFileSAF(EXTENDED_BACKUP_FILENAME);//scopedstorage
@@ -676,7 +705,7 @@ private void showPreferences() {
 
     @Override
     public void onRequestPermissionsResult(int requestCode,
-                                           String[] permissions, int[] grantResults) {
+                                           @NonNull String[] permissions, int[] grantResults) {
         if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
             mBackupRestore.processRequestPermissionsResult(requestCode);
         } else {// permission denied

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

@@ -21,6 +21,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
@@ -257,7 +258,7 @@ public ColorItem() {
             //Auto-generated constructor stub
         }
 
-        ColorItem(String name, int color) {
+        ColorItem(@NonNull String name, int color) {
             this.name = name;
             this.resourceId = color;
         }
@@ -266,6 +267,7 @@ void setColor(int color) {
             this.resourceId = color;
         }
 
+        @NonNull
         @Override
         public String toString() {
             return this.name;