Merge pull request #3972 from owncloud/technical/target_sdk_33

[TECHNICAL] Bump target sdk to 33

Author: abelgardep

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         // SDK
         sdkCompileVersion = 33
         sdkMinVersion = 21
-        sdkTargetVersion = 31
+        sdkTargetVersion = 33
 
         // Android jetpack
         androidxArchCore = "2.2.0"

changelog/unreleased/3973

@@ -0,0 +1,8 @@
+Change: Bump target SDK to 33
+
+Target SDK was upgraded to 33 to keep the app updated with the latest android changes.
+A new setting was introduced to manage notifications in an easier way.
+
+https://github.com/owncloud/android/issues/3617
+https://github.com/owncloud/android/pull/3972
+https://developer.android.com/about/versions/13/behavior-changes-13

owncloud-android-library

@@ -39,6 +39,11 @@
         API >= 23; the app needs to handle this
     -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!--
+        Notifications are off by default since API 33;
+        See note in https://developer.android.com/develop/ui/views/notifications/notification-permission
+    -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <!--
          Next permissions are always approved in installation time,
         the apps needs to do nothing special in runtime

owncloudApp/src/main/AndroidManifest.xml

@@ -24,7 +24,9 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
@@ -50,6 +52,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private var subsectionMore: Preference? = null
     private var prefPrivacyPolicy: Preference? = null
     private var subsectionWhatsNew: Preference? = null
+    private var subsectionNotifications: Preference? = null
     private var prefAboutApp: Preference? = null
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -61,6 +64,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         subsectionMore = findPreference(SUBSECTION_MORE)
         prefPrivacyPolicy = findPreference(PREFERENCE_PRIVACY_POLICY)
         subsectionWhatsNew = findPreference(SUBSECTION_WHATSNEW)
+        subsectionNotifications = findPreference(SUBSECTION_NOTIFICATIONS)
         prefAboutApp = findPreference(PREFERENCE_ABOUT_APP)
 
         subsectionPictureUploads?.isVisible = settingsViewModel.isThereAttachedAccount()
@@ -89,6 +93,18 @@ class SettingsFragment : PreferenceFragmentCompat() {
             true
         }
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            subsectionNotifications?.setOnPreferenceClickListener {
+                val intent = Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS).apply {
+                    putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
+                }
+                startActivity(intent)
+                true
+            }
+        } else {
+            settingsScreen.removePreferenceFromScreen(subsectionNotifications)
+        }
+
         prefAboutApp?.apply {
             summary = String.format(
                 getString(R.string.prefs_app_version_summary),
@@ -114,6 +130,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         private const val SUBSECTION_PICTURE_UPLOADS = "picture_uploads_subsection"
         private const val SUBSECTION_VIDEO_UPLOADS = "video_uploads_subsection"
         private const val SUBSECTION_MORE = "more_subsection"
+        private const val SUBSECTION_NOTIFICATIONS = "notifications_subsection"
 
         // Remove preference with nullability check
         fun PreferenceScreen?.removePreferenceFromScreen(preference: Preference?) {

owncloudApp/src/main/java/com/owncloud/android/presentation/settings/SettingsFragment.kt

@@ -27,18 +27,23 @@
 
 package com.owncloud.android.ui.activity
 
+import android.Manifest.permission.POST_NOTIFICATIONS
 import android.accounts.Account
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.RemoteException
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.FrameLayout
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
@@ -47,6 +52,7 @@ import com.owncloud.android.AppRater
 import com.owncloud.android.BuildConfig
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
+import com.owncloud.android.data.preferences.datasources.SharedPreferencesProvider
 import com.owncloud.android.databinding.ActivityMainBinding
 import com.owncloud.android.domain.camerauploads.model.UploadBehavior
 import com.owncloud.android.domain.capabilities.model.OCCapability
@@ -164,6 +170,8 @@ class FileDisplayActivity : FileActivity(),
     private val fileOperationsViewModel: FileOperationsViewModel by viewModel()
     private val transfersViewModel: TransfersViewModel by viewModel()
 
+    private val sharedPreferences: SharedPreferencesProvider by inject()
+
     var filesUploadHelper: FilesUploadHelper? = null
         internal set
 
@@ -246,9 +254,34 @@ class FileDisplayActivity : FileActivity(),
             AppRater.appLaunched(this, packageName)
         }
 
+        checkNotificationPermission()
         Timber.v("onCreate() end")
     }
 
+    private fun checkNotificationPermission() {
+        // Ask for permission only in case it's api >= 33 and notifications are not granted.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
+            ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) == PackageManager.PERMISSION_GRANTED
+        ) return
+
+        // Permission denied. Can be because notifications are off by default or because they were denied by the user.
+        val alreadyRequested = sharedPreferences.getBoolean(PREFERENCE_NOTIFICATION_PERMISSION_REQUESTED, false)
+        val shouldShowPermissionRequest = shouldShowRequestPermissionRationale(POST_NOTIFICATIONS)
+        Timber.d("Already requested notification permission $alreadyRequested and should ask again $shouldShowPermissionRequest")
+        if (!alreadyRequested || shouldShowPermissionRequest) {
+            // Not requested yet or system considers we can request the permission again.
+            val requestPermissionLauncher =
+                registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean ->
+                    Timber.d("Permission to send notifications granted: $isGranted")
+                    if (!isGranted) {
+                        showSnackMessage(getString(R.string.notifications_permission_denied))
+                    }
+                    sharedPreferences.putBoolean(PREFERENCE_NOTIFICATION_PERMISSION_REQUESTED, true)
+                }
+            requestPermissionLauncher.launch(POST_NOTIFICATIONS)
+        }
+    }
+
     override fun onPostCreate(savedInstanceState: Bundle?) {
         super.onPostCreate(savedInstanceState)
 
@@ -1535,6 +1568,7 @@ class FileDisplayActivity : FileActivity(),
         private const val KEY_UPLOAD_HELPER = "FILE_UPLOAD_HELPER"
         private const val KEY_FILE_LIST_OPTION = "FILE_LIST_OPTION"
 
+        private const val PREFERENCE_NOTIFICATION_PERMISSION_REQUESTED = "PREFERENCE_NOTIFICATION_PERMISSION_REQUESTED"
         const val ALL_FILES_SAF_REGEX = "*/*"
 
         const val ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS"

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
+</vector>

owncloudApp/src/main/res/drawable/ic_notifications.xml

@@ -73,6 +73,7 @@
     <string name="prefs_camera_video_upload_on_wifi">Upload videos via wifi only</string>
     <string name="prefs_camera_video_upload_on_charging">Upload videos only when charging</string>
     <string name="prefs_subsection_advanced">Advanced</string>
+    <string name="prefs_subsection_notifications">Manage notifications</string>
     <string name="prefs_show_hidden_files">Show hidden files</string>
     <string name="prefs_log_open_logs_list_view">Log files</string>
     <string name="prefs_log_no_logs_list_view">Empty log folder!</string>
@@ -548,6 +549,7 @@
     <string name="prefs_camera_upload_behaviour_dialog_title">Original file will be</string>
     <string name="prefs_camera_upload_behaviour_title">Original file will be</string>
     <string name="prefs_camera_upload_last_sync_title">Last synchronization</string>
+    <string name="notifications_permission_denied">You can update your preferences in Settings</string>
     <string name="upload_copy_files">Copy file</string>
     <string name="upload_move_files">Move file</string>
 

owncloudApp/src/main/res/values/strings.xml

@@ -25,6 +25,12 @@
         app:summary="@string/prefs_subsection_security_summary"
         app:title="@string/prefs_subsection_security" />
 
+    <Preference
+        app:allowDividerAbove="true"
+        app:icon="@drawable/ic_notifications"
+        app:key="notifications_subsection"
+        app:title="@string/prefs_subsection_notifications" />
+
     <Preference
         app:allowDividerAbove="true"
         app:fragment="com.owncloud.android.presentation.settings.logging.SettingsLogsFragment"