From 2c83fae82a62b74e0db84cef697657a401173c4e Mon Sep 17 00:00:00 2001
From: Yuri Volkov <yvolk@yurivolkov.com>
Date: Wed, 3 Jan 2024 15:02:11 +0300
Subject: [PATCH] #80 Do not make all permissions mandatory

---
 README.md                                     | 11 ++++++--
 app/build.gradle                              |  4 +--
 .../todoagenda/EnvironmentChangedReceiver.kt  |  4 ++-
 .../org/andstatus/todoagenda/MainActivity.kt  | 26 ++++++++-----------
 .../todoagenda/provider/EventProviderType.kt  |  4 +++
 .../main/play/release-notes/en-US/default.txt |  7 ++++-
 .../main/play/release-notes/ru-RU/default.txt |  7 ++++-
 app/src/main/res/values-ru/strings.xml        |  1 +
 8 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index b424d1d2..983bc2e0 100644
--- a/README.md
+++ b/README.md
@@ -85,13 +85,20 @@ In particular, see these solutions:
 
 ## Changelog
 
+<a id="v4.8"/>
+
+### 2024-01-03 v4.8.0 Time zone changes fixed
+* Fixed "[Default Time zone in app doesn't change, when Android System Time Zone changes](https://github.com/andstatus/todoagenda/issues/106)".
+* Fixed "[Do not make all permissions mandatory](https://github.com/andstatus/todoagenda/issues/80)".
+* App converted from Java to Kotlin.
+
 <a id="v4.7"/>
 
 ### 2023-12-31 v4.7.3 Show based on keywords in a title
-* Date range filtering extended with "[Today and Tomorrow](https://github.com/plusonelabs/calendar-widget/issues/123)"
+* Date range filtering extended with "[Today and Tomorrow](https://github.com/andstatus/todoagenda/issues/123)"
   option. This is different from the "One day" option as that hides events after current time on the next day,
   which is a bit confusing.
-* [Show based on keywords in a title](https://github.com/plusonelabs/calendar-widget/issues/122) option added,
+* [Show based on keywords in a title](https://github.com/andstatus/todoagenda/issues/122) option added,
   allowing to see events that have certain text included. 
   In addition to existing option "Hide based on keywords in a title".
 * Allow changing language of User Interface for Android 13+ in Android System Settings - Apps, see
diff --git a/app/build.gradle b/app/build.gradle
index 4722ddf2..a7d615a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,8 +12,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 703
-        versionName '4.7.3'
+        versionCode 704
+        versionName '4.8.0'
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
diff --git a/app/src/main/kotlin/org/andstatus/todoagenda/EnvironmentChangedReceiver.kt b/app/src/main/kotlin/org/andstatus/todoagenda/EnvironmentChangedReceiver.kt
index 79088690..359ad551 100644
--- a/app/src/main/kotlin/org/andstatus/todoagenda/EnvironmentChangedReceiver.kt
+++ b/app/src/main/kotlin/org/andstatus/todoagenda/EnvironmentChangedReceiver.kt
@@ -34,7 +34,9 @@ class EnvironmentChangedReceiver : BroadcastReceiver() {
         val action = if (settings == null || intent.action.isNullOrBlank()) {
             RemoteViewsFactory.ACTION_REFRESH
         } else if (PermissionsUtil.mustRequestPermissions(context)) {
-            RemoteViewsFactory.ACTION_CONFIGURE
+            // Recheck
+            AllSettings.reInitialize(context)
+            if (PermissionsUtil.mustRequestPermissions(context)) RemoteViewsFactory.ACTION_CONFIGURE else intent.action
         } else {
             intent.action
         }
diff --git a/app/src/main/kotlin/org/andstatus/todoagenda/MainActivity.kt b/app/src/main/kotlin/org/andstatus/todoagenda/MainActivity.kt
index 896d9103..ecc90d40 100644
--- a/app/src/main/kotlin/org/andstatus/todoagenda/MainActivity.kt
+++ b/app/src/main/kotlin/org/andstatus/todoagenda/MainActivity.kt
@@ -5,6 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.provider.Settings
 import android.util.Log
 import android.view.View
 import android.widget.AdapterView.OnItemClickListener
@@ -13,13 +14,11 @@ import android.widget.ListView
 import android.widget.SimpleAdapter
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.app.ActivityCompat
 import androidx.core.app.ActivityCompat.OnRequestPermissionsResultCallback
 import org.andstatus.todoagenda.prefs.AllSettings
 import org.andstatus.todoagenda.prefs.ApplicationPreferences
 import org.andstatus.todoagenda.prefs.ApplicationPreferences.isAskForPermissions
 import org.andstatus.todoagenda.provider.EventProviderType
-import org.andstatus.todoagenda.provider.EventProviderType.Companion.neededPermissions
 import org.andstatus.todoagenda.util.IntentUtil
 import org.andstatus.todoagenda.util.PermissionsUtil
 
@@ -85,7 +84,9 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback {
         findViewById<Button>(R.id.grant_permissions)?.visibility =
             if (needToRequestPermission) View.VISIBLE else View.GONE
         findViewById<Button>(R.id.dont_ask_for_permissions_button)?.visibility =
-            if (needToRequestPermission && isAskForPermissions(this)) View.VISIBLE else View.GONE
+            if (needToRequestPermission && isAskForPermissions(this) &&
+                EventProviderType.availableSources.isNotEmpty()
+            ) View.VISIBLE else View.GONE
         findViewById<Button>(R.id.go_to_home_screen_button)?.visibility =
             if (!needToRequestPermission && AllSettings.getInstances(this).isEmpty()) View.VISIBLE else View.GONE
 
@@ -125,12 +126,13 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback {
     }
 
     fun onGrantPermissionsButtonClick(view: View?) {
-        neededPermissions.toList().takeIf { it.isNotEmpty() }?.let { neededPermissions ->
-            Log.d(localClassName, "Requesting permissions: $neededPermissions")
-            val arr: Array<String> = Array(neededPermissions.size) { i -> neededPermissions[i] }
-            ActivityCompat.requestPermissions(this, arr, 1)
-        }
-        updateScreen()
+        val intent = Intent(
+            Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+            Uri.fromParts("package", packageName, null)
+        )
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        startActivity(intent)
+        finish()
     }
 
     fun onDontAskForPermissionsButtonClick(view: View?) {
@@ -138,12 +140,6 @@ class MainActivity : AppCompatActivity(), OnRequestPermissionsResultCallback {
         onHomeButtonClick(view)
     }
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        AllSettings.reInitialize(this)
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        updateScreen()
-    }
-
     fun onHomeButtonClick(view: View?) {
         val intent = Intent(Intent.ACTION_MAIN)
         intent.addCategory(Intent.CATEGORY_HOME)
diff --git a/app/src/main/kotlin/org/andstatus/todoagenda/provider/EventProviderType.kt b/app/src/main/kotlin/org/andstatus/todoagenda/provider/EventProviderType.kt
index f080c304..06121028 100644
--- a/app/src/main/kotlin/org/andstatus/todoagenda/provider/EventProviderType.kt
+++ b/app/src/main/kotlin/org/andstatus/todoagenda/provider/EventProviderType.kt
@@ -7,6 +7,7 @@ import android.util.Log
 import org.andstatus.todoagenda.EnvironmentChangedReceiver
 import org.andstatus.todoagenda.calendar.CalendarEventProvider
 import org.andstatus.todoagenda.calendar.CalendarEventVisualizer
+import org.andstatus.todoagenda.prefs.ApplicationPreferences
 import org.andstatus.todoagenda.prefs.EventSource
 import org.andstatus.todoagenda.prefs.OrderedEventSource
 import org.andstatus.todoagenda.task.TaskVisualizer
@@ -117,6 +118,9 @@ enum class EventProviderType(
                         }
                     }
             }
+            if (availableSources.isEmpty()) {
+                ApplicationPreferences.setAskForPermissions(context, true)
+            }
             initialized = true
         }
 
diff --git a/app/src/main/play/release-notes/en-US/default.txt b/app/src/main/play/release-notes/en-US/default.txt
index 260292bb..b674a503 100644
--- a/app/src/main/play/release-notes/en-US/default.txt
+++ b/app/src/main/play/release-notes/en-US/default.txt
@@ -1,2 +1,7 @@
-v4.7.3 Filter for Today and Tomorrow. Show based on keywords in a title. Allow changing language of User Interface for Android 13+
+v4.8.0. Fixed "Default Time zone in app doesn't change, when Android System Time Zone changes".
+Fixed "Do not make all permissions mandatory".
+App converted from Java to Kotlin.
+v4.7.3. Filter for Today and Tomorrow.
+Show based on keywords in a title.
+Allow changing language of User Interface for Android 13+
 
diff --git a/app/src/main/play/release-notes/ru-RU/default.txt b/app/src/main/play/release-notes/ru-RU/default.txt
index a48cb82a..f580c561 100644
--- a/app/src/main/play/release-notes/ru-RU/default.txt
+++ b/app/src/main/play/release-notes/ru-RU/default.txt
@@ -1 +1,6 @@
-v4.7.3 Фильтр "Сегодня и завтра". Показать только при начичии ключевых слов в названии. Изменение языка интерфейса для Android 13+
+v4.8.0. Исправлено: Часовой пояс в виджете не менялся до перезапуска приложения.
+Исправлено: Не надо делать все разрешения обязательными.
+Приложение сконвертировано с Java на Kotlin. Это может быть интересно программистам :-)
+v4.7.3. Фильтр "Сегодня и завтра".
+Показать только при начичии ключевых слов в названии.
+Изменение языка интерфейса для Android 13+
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b1ba8c6d..5987c619 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -18,6 +18,7 @@
     <string name="no_title">(Без заголовка)</string>
     <string name="grant_permissions">Предоставить разрешения</string>
     <string name="grant_permissions_verbose">Для Виджета требуется разрешение на чтение календарей и задач. \nНажмите здесь, чтобы предоставить это разрешение.</string>
+    <string name="dont_ask_for_permissions">Больше не спрашивать разрешения</string>
     <string name="past_header">Просроченные</string>
     <string name="end_of_list_header">Другие события</string>
     <string name="permissions_justification">Добро пожаловать в приложение Todo Agenda - легкий доступ к вашим календарям и задачам.\n\nДля того, чтобы получить максимум от этого виджета, Вам необходимо предоставить этому приложению доступ к календарям и задачам.</string>