From ae0b24bbc6d4d12b8af19655b64427974fc5e58f Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Sat, 4 Jun 2022 22:40:34 +0530
Subject: [PATCH] Minor code-consistency changes

---
 .../calculator/activities/MainActivity.kt       |  4 ++--
 .../calculator/activities/SettingsActivity.kt   |  5 ++---
 .../calculator/extensions/Context.kt            | 17 +++++++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
index dfda66a2..c55a404a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
@@ -12,8 +12,8 @@ import com.simplemobiletools.calculator.R
 import com.simplemobiletools.calculator.databases.CalculatorDatabase
 import com.simplemobiletools.calculator.dialogs.HistoryDialog
 import com.simplemobiletools.calculator.extensions.config
-import com.simplemobiletools.calculator.extensions.refreshAppWidget
 import com.simplemobiletools.calculator.extensions.updateViewColors
+import com.simplemobiletools.calculator.extensions.updateWidgets
 import com.simplemobiletools.calculator.helpers.*
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.LICENSE_AUTOFITTEXTVIEW
@@ -84,7 +84,7 @@ class MainActivity : SimpleActivity(), Calculator {
 
         if (storedUseCommaAsDecimalMark != config.useCommaAsDecimalMark) {
             setupDecimalSeparator()
-            refreshAppWidget<MyWidgetProvider>()
+            updateWidgets()
         }
 
         vibrateOnButtonPress = config.vibrateOnButtonPress
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
index b99a0461..1b158fbd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
@@ -6,8 +6,7 @@ import android.view.Menu
 import com.simplemobiletools.calculator.R
 import com.simplemobiletools.calculator.extensions.calculatorDB
 import com.simplemobiletools.calculator.extensions.config
-import com.simplemobiletools.calculator.extensions.refreshAppWidget
-import com.simplemobiletools.calculator.helpers.MyWidgetProvider
+import com.simplemobiletools.calculator.extensions.updateWidgets
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
 import com.simplemobiletools.commons.helpers.ensureBackgroundThread
@@ -105,7 +104,7 @@ class SettingsActivity : SimpleActivity() {
         settings_use_comma_as_decimal_mark_holder.setOnClickListener {
             settings_use_comma_as_decimal_mark.toggle()
             config.useCommaAsDecimalMark = settings_use_comma_as_decimal_mark.isChecked
-            refreshAppWidget<MyWidgetProvider>()
+            updateWidgets()
             ensureBackgroundThread { applicationContext.calculatorDB.deleteHistory() }
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt
index 51b9f6da..04a6efdd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt
@@ -9,6 +9,7 @@ import android.widget.Button
 import android.widget.TextView
 import com.simplemobiletools.calculator.databases.CalculatorDatabase
 import com.simplemobiletools.calculator.helpers.Config
+import com.simplemobiletools.calculator.helpers.MyWidgetProvider
 import com.simplemobiletools.calculator.interfaces.CalculatorDao
 
 val Context.config: Config get() = Config.newInstance(applicationContext)
@@ -28,10 +29,14 @@ fun Context.updateViewColors(viewGroup: ViewGroup, textColor: Int) {
         }
 }
 
-inline fun <reified T> Context.refreshAppWidget() {
-    val intent = Intent(this, T::class.java)
-    intent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
-    val ids = AppWidgetManager.getInstance(this).getAppWidgetIds(ComponentName(this, T::class.java))
-    intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
-    sendBroadcast(intent)
+fun Context.updateWidgets() {
+    val widgetIDs = AppWidgetManager.getInstance(applicationContext)?.getAppWidgetIds(ComponentName(applicationContext, MyWidgetProvider::class.java))
+        ?: return
+    if (widgetIDs.isNotEmpty()) {
+        Intent(applicationContext, MyWidgetProvider::class.java).apply {
+            action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+            putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIDs)
+            sendBroadcast(this)
+        }
+    }
 }