android app: don't parse at first run + fix -C/--config arg

Toni500github · Dec 16, 2024 · b2a5e7e · b2a5e7e
1 parent 1eefe4d
commit b2a5e7e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/android/app/src/main/java/org/toni/customfetch_android/widget/customfetch.kt b/android/app/src/main/java/org/toni/customfetch_android/widget/customfetch.kt
@@ -31,6 +31,7 @@ class customfetch : AppWidgetProvider() {
         for (appWidgetId in appWidgetIds) {
             deleteTitlePref(context, appWidgetId)
         }
+        firstRun = true
     }
 
     override fun onAppWidgetOptionsChanged(
@@ -88,6 +89,7 @@ class WidgetSizeProvider(
 
 }
 
+var firstRun = true
 internal fun updateAppWidget(
     context: Context,
     appWidgetManager: AppWidgetManager,
@@ -108,14 +110,17 @@ internal fun updateAppWidget(
     Log.d("widthTesting", "width = $width")
     Log.d("wrappingTest", "disableLineWrap = $disableLineWrap")
 
-    val parsedContent = customfetchRender.getParsedContent(
-        context,
-        appWidgetId,
-        width,
-        disableLineWrap,
-        textPaint
-    )
-
+    val parsedContent = if (!firstRun) {
+        customfetchRender.getParsedContent(
+            context,
+            appWidgetId,
+            width,
+            disableLineWrap,
+            textPaint
+        )
+    } else ""
+
+    firstRun = false
     // Construct the RemoteViews object
     val views = RemoteViews(context.packageName, R.layout.customfetch)
     views.setTextViewText(R.id.customfetch_text, parsedContent)

diff --git a/...oid/app/src/main/java/org/toni/customfetch_android/widget/customfetchConfigureActivity.kt b/...oid/app/src/main/java/org/toni/customfetch_android/widget/customfetchConfigureActivity.kt
@@ -160,5 +160,7 @@ internal fun loadTruncateWidthPref(context: Context, appWidgetId: Int): String {
 internal fun deleteTitlePref(context: Context, appWidgetId: Int) {
     val prefs = context.getSharedPreferences(PREFS_NAME, 0).edit()
     prefs.remove(PREF_PREFIX_KEY + appWidgetId)
+    prefs.remove(PREF_PREFIX_KEY + "bool_" + appWidgetId)
+    prefs.remove(PREF_PREFIX_KEY + "truncate_" + appWidgetId)
     prefs.apply()
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -570,9 +570,9 @@ int main(int argc, char *argv[])
 #if ANDROID_APP
     // since ANDROID_APP means that it will run as an android widget, so in GUI,
     // then let's make it always true
-    // and also disable wrap lines for cleaner look
     config.gui = true;
-    config.wrap_lines = false;
+    config.wrap_lines = true;
+    optind = 0;
 #endif
 
     if (config.source_path.empty() || config.source_path == "off")