Skip to content

Commit b52dcad

Browse files
Merge pull request #14888 from nextcloud/renovate/androidpluginversion
fix(deps): update dependency com.android.tools.build:gradle to v8.11.0
2 parents bf8d7fc + d4b738f commit b52dcad

File tree

5 files changed

+767
-5
lines changed

5 files changed

+767
-5
lines changed

app/lint.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,8 @@
8080
<ignore path="**/jetified-firebase-installations**/**/lint.jar" />
8181
<ignore path="**/appcompat-1.**/**/lint.jar" />
8282
</issue>
83+
84+
<issue id="Aligned16KB">
85+
<ignore path="**/arm64-v8a/libmockkjvmtiagent.so" />
86+
</issue>
8387
</lint>

app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
package com.nextcloud.client.jobs
88

9+
import android.Manifest
910
import android.accounts.AuthenticatorException
1011
import android.accounts.OperationCanceledException
1112
import android.app.Activity
@@ -14,10 +15,12 @@ import android.app.PendingIntent
1415
import android.content.BroadcastReceiver
1516
import android.content.Context
1617
import android.content.Intent
18+
import android.content.pm.PackageManager
1719
import android.graphics.BitmapFactory
1820
import android.media.RingtoneManager
1921
import android.text.TextUtils
2022
import android.util.Base64
23+
import androidx.core.app.ActivityCompat
2124
import androidx.core.app.NotificationCompat
2225
import androidx.core.app.NotificationManagerCompat
2326
import androidx.work.Worker
@@ -224,8 +227,17 @@ class NotificationWork constructor(
224227
}
225228
.build()
226229
)
227-
val notificationManager = NotificationManagerCompat.from(context)
228-
notificationManager.notify(notification.getNotificationId(), notificationBuilder.build())
230+
231+
if (ActivityCompat.checkSelfPermission(
232+
context,
233+
Manifest.permission.POST_NOTIFICATIONS
234+
) != PackageManager.PERMISSION_GRANTED
235+
) {
236+
Log_OC.w(this, "Missing permission to post notifications")
237+
} else {
238+
val notificationManager = NotificationManagerCompat.from(context)
239+
notificationManager.notify(notification.getNotificationId(), notificationBuilder.build())
240+
}
229241
}
230242

231243
@Suppress("TooGenericExceptionCaught") // legacy code

app/src/main/java/com/owncloud/android/ui/dialog/RenamePublicShareDialogFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class RenamePublicShareDialogFragment : DialogFragment(), DialogInterface.OnClic
8888
AlertDialog.BUTTON_POSITIVE -> {
8989
var newName = ""
9090
if (binding.userInput.text != null) {
91-
newName = binding.userInput.text.toString().trim { it <= ' ' }
91+
newName = binding.userInput.text.toString().trim()
9292
}
9393

9494
if (TextUtils.isEmpty(newName)) {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
ext {
1313
androidLibraryVersion ="0edf15760b8a086ab9969e103c7229dad973efbd"
1414
androidCommonLibraryVersion = "0.26.0"
15-
androidPluginVersion = "8.9.2"
15+
androidPluginVersion = "8.11.0"
1616
androidxMediaVersion = "1.5.1"
1717
androidxTestVersion = "1.6.1"
1818
appCompatVersion = "1.7.1"

0 commit comments

Comments
 (0)