Merge remote-tracking branch 'origin/fix_atlas_weather' into fix_atlas_weather

This commit is contained in:
2024-06-21 14:29:39 +01:00
3 changed files with 4 additions and 6 deletions

View File

@@ -1,7 +1,6 @@
package com.appttude.h_mal.atlas_weather.service.notification package com.appttude.h_mal.atlas_weather.service.notification
import android.Manifest import android.Manifest
import android.app.Notification
import android.app.NotificationChannel import android.app.NotificationChannel
import android.app.NotificationManager import android.app.NotificationManager
import android.app.PendingIntent import android.app.PendingIntent
@@ -11,7 +10,6 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.Bitmap import android.graphics.Bitmap
import android.os.Build
import androidx.annotation.RequiresPermission import androidx.annotation.RequiresPermission
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.app.NotificationCompat import androidx.core.app.NotificationCompat
@@ -68,7 +66,7 @@ class NotificationReceiver : BroadcastReceiver() {
addParentStack(MainActivity::class.java) addParentStack(MainActivity::class.java)
addNextIntent(notificationIntent) addNextIntent(notificationIntent)
} }
val pendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT) val pendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT)
val bmp: Bitmap = runBlocking { Picasso.get().load(weather.current?.icon).get() } val bmp: Bitmap = runBlocking { Picasso.get().load(weather.current?.icon).get() }
val builder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID) val builder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID)

View File

@@ -30,8 +30,6 @@ class NotificationService(context: Context) {
AlarmManager.INTERVAL_HOUR, AlarmManager.INTERVAL_HOUR,
alarmPendingIntent alarmPendingIntent
) )
// alarmManager.setAlarmClock(AlarmManager.AlarmClockInfo(calendar.timeInMillis, alarmPendingIntent), alarmPendingIntent)
} }
fun unschedulePushNotifications() { fun unschedulePushNotifications() {
@@ -60,7 +58,8 @@ class NotificationService(context: Context) {
// } // }
return GregorianCalendar.getInstance().apply { return GregorianCalendar.getInstance().apply {
add(Calendar.MINUTE, 1) // add(Calendar.MINUTE, 1)
add(Calendar.SECOND, 10)
} }
} }
} }

View File

@@ -6,6 +6,7 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="com.android.alarm.permission.SET_ALARM" /> <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />