Merge pull request #3558 from nextcloud/feature/noid/addNotificationH…

…intsToSettings

Add diagnose screen and add permission checks in settings

app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/10.json

@@ -0,0 +1,146 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 10,
+    "identityHash": "1b2dab0ea495c45c9c9ee6e64ba74039",
+    "entities": [
+      {
+        "tableName": "User",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `username` TEXT, `baseUrl` TEXT, `token` TEXT, `displayName` TEXT, `pushConfigurationState` TEXT, `capabilities` TEXT, `serverVersion` TEXT DEFAULT '', `clientCertificate` TEXT, `externalSignalingServer` TEXT, `current` INTEGER NOT NULL, `scheduledForDeletion` INTEGER NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "baseUrl",
+            "columnName": "baseUrl",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "token",
+            "columnName": "token",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "pushConfigurationState",
+            "columnName": "pushConfigurationState",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "capabilities",
+            "columnName": "capabilities",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "serverVersion",
+            "columnName": "serverVersion",
+            "affinity": "TEXT",
+            "notNull": false,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "clientCertificate",
+            "columnName": "clientCertificate",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "externalSignalingServer",
+            "columnName": "externalSignalingServer",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "current",
+            "columnName": "current",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scheduledForDeletion",
+            "columnName": "scheduledForDeletion",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ArbitraryStorage",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountIdentifier` INTEGER NOT NULL, `key` TEXT NOT NULL, `object` TEXT, `value` TEXT, PRIMARY KEY(`accountIdentifier`, `key`))",
+        "fields": [
+          {
+            "fieldPath": "accountIdentifier",
+            "columnName": "accountIdentifier",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "storageObject",
+            "columnName": "object",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "accountIdentifier",
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1b2dab0ea495c45c9c9ee6e64ba74039')"
+    ]
+  }
+}

app/src/androidTest/java/com/nextcloud/talk/activities/MainActivityTest.kt

@@ -29,6 +29,7 @@ class MainActivityTest {
                 displayName = "Test Name",
                 pushConfigurationState = null,
                 capabilities = null,
+                serverVersion = null,
                 certificateAlias = null,
                 externalSignalingServer = null
             )

app/src/gplay/java/com/nextcloud/talk/jobs/GetFirebasePushTokenWorker.kt

@@ -57,6 +57,7 @@ class GetFirebasePushTokenWorker(val context: Context, workerParameters: WorkerP
                 Log.d(TAG, "Fetched firebase push token is: $pushToken")
 
                 appPreferences.pushToken = pushToken
+                appPreferences.pushTokenLatestFetch = System.currentTimeMillis()
 
                 val data: Data =
                     Data.Builder().putString(PushRegistrationWorker.ORIGIN, "GetFirebasePushTokenWorker").build()

app/src/gplay/java/com/nextcloud/talk/services/firebase/NCFirebaseMessagingService.kt

@@ -78,6 +78,7 @@ class NCFirebaseMessagingService : FirebaseMessagingService() {
         Log.d(TAG, "onNewToken. token = $token")
 
         appPreferences.pushToken = token
+        appPreferences.pushTokenLatestGeneration = System.currentTimeMillis()
 
         val data: Data =
             Data.Builder().putString(PushRegistrationWorker.ORIGIN, "NCFirebaseMessagingService#onNewToken").build()

app/src/main/AndroidManifest.xml

@@ -241,6 +241,10 @@
             android:name=".settings.SettingsActivity"
             android:theme="@style/AppTheme" />
 
+        <activity
+            android:name=".diagnose.DiagnoseActivity"
+            android:theme="@style/AppTheme" />
+
         <activity
             android:name=".conversationinfo.ConversationInfoActivity"
             android:theme="@style/AppTheme" />

app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt

@@ -51,7 +51,6 @@ import com.nextcloud.talk.jobs.AccountRemovalWorker
 import com.nextcloud.talk.jobs.CapabilitiesWorker
 import com.nextcloud.talk.jobs.SignalingSettingsWorker
 import com.nextcloud.talk.jobs.WebsocketConnectionsWorker
-import com.nextcloud.talk.models.json.capabilities.Capabilities
 import com.nextcloud.talk.models.json.capabilities.CapabilitiesOverall
 import com.nextcloud.talk.models.json.generic.Status
 import com.nextcloud.talk.models.json.userprofile.UserProfileOverall
@@ -250,7 +249,7 @@ class AccountVerificationActivity : BaseActivity() {
             })
     }
 
-    private fun storeProfile(displayName: String?, userId: String, capabilities: Capabilities) {
+    private fun storeProfile(displayName: String?, userId: String, capabilitiesOverall: CapabilitiesOverall) {
         userManager.storeProfile(
             username,
             UserManager.UserAttributes(
@@ -261,7 +260,8 @@ class AccountVerificationActivity : BaseActivity() {
                 token = token,
                 displayName = displayName,
                 pushConfigurationState = null,
-                capabilities = LoganSquare.serialize(capabilities),
+                capabilities = LoganSquare.serialize(capabilitiesOverall.ocs!!.data!!.capabilities),
+                serverVersion = LoganSquare.serialize(capabilitiesOverall.ocs!!.data!!.serverVersion),
                 certificateAlias = appPreferences.temporaryClientCertAlias,
                 externalSignalingServer = null
             )
@@ -302,7 +302,7 @@ class AccountVerificationActivity : BaseActivity() {
             })
     }
 
-    private fun fetchProfile(credentials: String, capabilities: CapabilitiesOverall) {
+    private fun fetchProfile(credentials: String, capabilitiesOverall: CapabilitiesOverall) {
         ncApi.getUserProfile(
             credentials,
             ApiUtils.getUrlForUserProfile(baseUrl)
@@ -325,7 +325,7 @@ class AccountVerificationActivity : BaseActivity() {
                         storeProfile(
                             displayName,
                             userProfileOverall.ocs!!.data!!.userId!!,
-                            capabilities.ocs!!.data!!.capabilities!!
+                            capabilitiesOverall
                         )
                     } else {
                         runOnUiThread {

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -41,6 +41,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.Handler
+import android.provider.Settings
 import android.text.InputType
 import android.text.TextUtils
 import android.util.Log
@@ -107,6 +108,7 @@ import com.nextcloud.talk.ui.dialog.ConversationsListBottomDialog
 import com.nextcloud.talk.ui.dialog.FilterConversationFragment
 import com.nextcloud.talk.users.UserManager
 import com.nextcloud.talk.utils.ApiUtils
+import com.nextcloud.talk.utils.ClosedInterfaceImpl
 import com.nextcloud.talk.utils.FileUtils
 import com.nextcloud.talk.utils.Mimetype
 import com.nextcloud.talk.utils.ParticipantPermissions
@@ -126,6 +128,7 @@ import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isServerEOL
 import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUnifiedSearchAvailable
 import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew.isUserStatusAvailable
 import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil
+import com.nextcloud.talk.utils.power.PowerManagerUtils
 import com.nextcloud.talk.utils.rx.SearchViewObservable.Companion.observeSearchView
 import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder
 import eu.davidea.flexibleadapter.FlexibleAdapter
@@ -234,7 +237,8 @@ class ConversationsListActivity :
 
         // handle notification permission on API level >= 33
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
-            !platformPermissionUtil.isPostNotificationsPermissionGranted()
+            !platformPermissionUtil.isPostNotificationsPermissionGranted() &&
+            ClosedInterfaceImpl().isGooglePlayServicesAvailable
         ) {
             requestPermissions(
                 arrayOf(Manifest.permission.POST_NOTIFICATIONS),
@@ -1269,16 +1273,55 @@ class ConversationsListActivity :
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == UploadAndShareFilesWorker.REQUEST_PERMISSION) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                Log.d(TAG, "upload starting after permissions were granted")
-                showSendFilesConfirmDialog()
-            } else {
-                Snackbar.make(
-                    binding.root,
-                    context.getString(R.string.read_storage_no_permission),
-                    Snackbar.LENGTH_LONG
-                ).show()
+
+        when (requestCode) {
+            UploadAndShareFilesWorker.REQUEST_PERMISSION -> {
+                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    Log.d(TAG, "upload starting after permissions were granted")
+                    showSendFilesConfirmDialog()
+                } else {
+                    Snackbar.make(
+                        binding.root,
+                        context.getString(R.string.read_storage_no_permission),
+                        Snackbar.LENGTH_LONG
+                    ).show()
+                }
+            }
+
+            REQUEST_POST_NOTIFICATIONS_PERMISSION -> {
+                // whenever user allowed notifications, also check to ignore battery optimization
+                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    if (!PowerManagerUtils().isIgnoringBatteryOptimizations() &&
+                        ClosedInterfaceImpl().isGooglePlayServicesAvailable
+                    ) {
+                        val dialogText = String.format(
+                            context.resources.getString(R.string.nc_ignore_battery_optimization_dialog_text),
+                            context.resources.getString(R.string.nc_app_name)
+                        )
+
+                        val dialogBuilder = MaterialAlertDialogBuilder(this)
+                            .setTitle(R.string.nc_ignore_battery_optimization_dialog_title)
+                            .setMessage(dialogText)
+                            .setPositiveButton(R.string.nc_ok) { _, _ ->
+                                startActivity(
+                                    Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)
+                                )
+                            }
+                            .setNegativeButton(R.string.nc_common_dismiss, null)
+                        viewThemeUtils.dialog.colorMaterialAlertDialogBackground(this, dialogBuilder)
+                        val dialog = dialogBuilder.show()
+                        viewThemeUtils.platform.colorTextButtons(
+                            dialog.getButton(AlertDialog.BUTTON_POSITIVE),
+                            dialog.getButton(AlertDialog.BUTTON_NEGATIVE)
+                        )
+                    }
+                } else {
+                    Log.d(
+                        TAG,
+                        "Notification permission is denied. Either because user denied it when being asked. " +
+                            "Or permission is already denied and android decided to not offer the dialog."
+                    )
+                }
             }
         }
     }

app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt

@@ -32,6 +32,7 @@ import com.nextcloud.talk.data.source.local.converters.CapabilitiesConverter
 import com.nextcloud.talk.data.source.local.converters.ExternalSignalingServerConverter
 import com.nextcloud.talk.data.source.local.converters.HashMapHashMapConverter
 import com.nextcloud.talk.data.source.local.converters.PushConfigurationConverter
+import com.nextcloud.talk.data.source.local.converters.ServerVersionConverter
 import com.nextcloud.talk.data.source.local.converters.SignalingSettingsConverter
 import com.nextcloud.talk.data.storage.ArbitraryStoragesDao
 import com.nextcloud.talk.data.storage.model.ArbitraryStorageEntity
@@ -42,15 +43,20 @@ import net.sqlcipher.database.SQLiteDatabase
 import net.sqlcipher.database.SQLiteDatabaseHook
 import net.sqlcipher.database.SupportFactory
 import java.util.Locale
+import androidx.room.AutoMigration
 
 @Database(
     entities = [UserEntity::class, ArbitraryStorageEntity::class],
-    version = 9,
+    version = 10,
+    autoMigrations = [
+        AutoMigration(from = 9, to = 10)
+    ],
     exportSchema = true
 )
 @TypeConverters(
     PushConfigurationConverter::class,
     CapabilitiesConverter::class,
+    ServerVersionConverter::class,
     ExternalSignalingServerConverter::class,
     SignalingSettingsConverter::class,
     HashMapHashMapConverter::class