Fix update calendar service

2021-01-10 15:54:54 +01:00 · 2021-01-10 15:54:54 +01:00 · 24bb811f93
commit 24bb811f93
parent d2087d094f
8 changed files with 72 additions and 9 deletions
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
--- a/app/build.gradle
+++ b/app/build.gradle
@ -22,7 +22,7 @@ android {
        applicationId "com.tommasoberlose.anotherwidget"
        minSdkVersion 23
        targetSdkVersion 30
-        versionCode 119
+        versionCode 120
        versionName "2.2.2"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -152,7 +152,8 @@
        <service
            android:name=".services.UpdateCalendarService"
            android:enabled="true"
-            android:exported="false"/>
+            android:exported="false"
+            android:foregroundServiceType="dataSync" />
        <service
            android:name=".services.LocationService"
            android:enabled="true"
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/services/LocationService.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/services/LocationService.kt
@ -115,7 +115,6 @@ class LocationService : Service() {
            val builder = NotificationCompat.Builder(this@LocationService, getString(R.string.location_access_notification_channel_id))
                .setSmallIcon(R.drawable.ic_stat_notification)
                .setContentTitle(getString(R.string.location_access_notification_title))
-                .setStyle(NotificationCompat.BigTextStyle().bigText(getString(R.string.location_access_notification_subtitle)))
                .setOngoing(true)
                .setColor(ContextCompat.getColor(this@LocationService, R.color.colorAccent))

--- a/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarService.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/services/UpdateCalendarService.kt
@ -1,11 +1,15 @@
 package com.tommasoberlose.anotherwidget.services

 import android.Manifest
-import android.app.Service
+import android.app.*
 import android.content.Context
 import android.content.Intent
 import android.os.IBinder
 import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
+import com.tommasoberlose.anotherwidget.R
 import com.tommasoberlose.anotherwidget.db.EventRepository
 import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper
@ -13,6 +17,7 @@ import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.applyFilters
 import com.tommasoberlose.anotherwidget.helpers.CalendarHelper.sortEvents
 import com.tommasoberlose.anotherwidget.models.Event
 import com.tommasoberlose.anotherwidget.receivers.UpdatesReceiver
+import com.tommasoberlose.anotherwidget.ui.activities.MainActivity
 import com.tommasoberlose.anotherwidget.ui.fragments.MainFragment
 import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission
@ -28,11 +33,22 @@ import kotlin.collections.ArrayList
 class UpdateCalendarService : Service() {

    companion object {
+        const val CALENDAR_SYNC_NOTIFICATION_ID = 28466
        fun enqueueWork(context: Context) {
            context.startService(Intent(context, UpdateCalendarService::class.java))
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                context.startForegroundService(Intent(context, UpdateCalendarService::class.java))
+            } else {
+                context.startService(Intent(context, UpdateCalendarService::class.java))
+            }
        }
    }

+    override fun onCreate() {
+        super.onCreate()
+        startForeground(CALENDAR_SYNC_NOTIFICATION_ID, getCalendarSyncNotification())
+    }
+
    private var job: Job? = null

    override fun onBind(intent: Intent?): IBinder? {
@ -171,4 +187,32 @@ class UpdateCalendarService : Service() {
        job?.cancel()
        job = null
    }
+
+    private fun getCalendarSyncNotification(): Notification {
+        with(NotificationManagerCompat.from(this)) {
+            // Create channel
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                createNotificationChannel(
+                    NotificationChannel(
+                        getString(R.string.calendar_sync_notification_channel_id),
+                        getString(R.string.calendar_sync_notification_channel_name),
+                        NotificationManager.IMPORTANCE_LOW
+                    ).apply {
+                        description = getString(R.string.calendar_sync_notification_channel_description)
+                    }
+                )
+            }
+
+            val builder = NotificationCompat.Builder(this@UpdateCalendarService, getString(R.string.calendar_sync_notification_channel_id))
+                .setSmallIcon(R.drawable.ic_stat_notification)
+                .setContentTitle(getString(R.string.calendar_sync_notification_title))
+                .setOngoing(true)
+                .setColor(ContextCompat.getColor(this@UpdateCalendarService, R.color.colorAccent))
+
+            // Main intent that open the activity
+            builder.setContentIntent(PendingIntent.getActivity(this@UpdateCalendarService, 0, Intent(this@UpdateCalendarService, MainActivity::class.java), PendingIntent.FLAG_UPDATE_CURRENT))
+
+            return builder.build()
+        }
+    }
 }
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/MainActivity.kt
@ -4,6 +4,7 @@ import android.Manifest
 import android.app.Activity
 import android.appwidget.AppWidgetManager
 import android.content.Intent
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
@ -22,9 +23,10 @@ import com.tommasoberlose.anotherwidget.global.Preferences
 import com.tommasoberlose.anotherwidget.global.RequestCode
 import com.tommasoberlose.anotherwidget.ui.activities.tabs.WeatherProviderActivity
 import com.tommasoberlose.anotherwidget.ui.viewmodels.MainViewModel
+import com.tommasoberlose.anotherwidget.ui.widgets.MainWidget
 import com.tommasoberlose.anotherwidget.utils.checkGrantedPermission

-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceChangeListener {

    private var mAppWidgetId: Int = -1
    private lateinit var viewModel: MainViewModel
@ -140,4 +142,18 @@ class MainActivity : AppCompatActivity() {
            Preferences.showEvents = false
        }
    }
+
+    override fun onStart() {
+        Preferences.preferences.registerOnSharedPreferenceChangeListener(this)
+        super.onStart()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        Preferences.preferences.unregisterOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {
+        MainWidget.updateWidget(this)
+    }
 }
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/MainFragment.kt
@ -102,9 +102,7 @@ class MainFragment : Fragment() {
        }

        binding.actionSettings.setOnClickListener {
-            Navigation.findNavController(it).navigate(R.id.action_appMainFragment_to_appSettingsFragment, null, null, FragmentNavigatorExtras(
-//                binding.fragmentTitle to "fragment_title"
-            ))
+            Navigation.findNavController(it).navigate(R.id.action_appMainFragment_to_appSettingsFragment,)
        }

        binding.preview.layoutParams = binding.preview.layoutParams.apply {
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -103,6 +103,11 @@
    <string name="attendee_status_invited">Events invitations</string>
    <string name="attendee_status_declined">Declined events</string>

+    <string name="calendar_sync_notification_channel_id" translatable="false">calendar-sync</string>
+    <string name="calendar_sync_notification_channel_name">Events sync service</string>
+    <string name="calendar_sync_notification_channel_description">Service used to synchronize the calendar events.</string>
+    <string name="calendar_sync_notification_title">Syncing calendar events…</string>
+
    <!-- Weather -->
    <string name="settings_weather_title">Weather</string>
    <string name="title_permission_location">Show the weather</string>
@ -172,7 +177,7 @@
    <string name="weather_provider_activity_subtitle">Select a weather provider from the list.\nA few providers need a free personal account,\nbut they are usually more accurate.</string>

    <string name="location_access_notification_channel_id" translatable="false">location-access</string>
-    <string name="location_access_notification_channel_name">Background service</string>
+    <string name="location_access_notification_channel_name">Weather update service</string>
    <string name="location_access_notification_channel_description">Service used to update the weather based on the current location of the user.</string>
    <string name="location_access_notification_title">Updating the weather…</string>
    <string name="location_access_notification_subtitle">We\'re updating the weather based on your current location.</string>