Copy martykan#365 crash fix to ClassicTimeWidgetProvider

Fixes martykan#598
kmantel · Dec 29, 2023 · 6267a10 · 6267a10
1 parent 917a183
commit 6267a10
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/app/src/main/java/cz/martykan/forecastie/widgets/ClassicTimeWidgetProvider.java b/app/src/main/java/cz/martykan/forecastie/widgets/ClassicTimeWidgetProvider.java
@@ -49,17 +49,22 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a
 
             DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(context);
             String defaultDateFormat = context.getResources().getStringArray(R.array.dateFormatsValues)[0];
-            String dateFormat = sp.getString("dateFormat", defaultDateFormat);
-            dateFormat = dateFormat.substring(0, dateFormat.indexOf("-")-1);
-            if ("custom".equals(dateFormat)) {
-                dateFormat = sp.getString("dateFormatCustom", defaultDateFormat);
+            String simpleDateFormat = sp.getString("dateFormat", defaultDateFormat);
+            if ("custom".equals(simpleDateFormat)) {
+                simpleDateFormat = sp.getString("dateFormatCustom", defaultDateFormat);
             }
             String dateString;
             try {
-                SimpleDateFormat resultFormat = new SimpleDateFormat(dateFormat);
-                dateString = resultFormat.format(new Date());
-            } catch (IllegalArgumentException e) {
-                dateString = context.getResources().getString(R.string.error_dateFormat);
+                simpleDateFormat = simpleDateFormat.substring(0, simpleDateFormat.indexOf("-") - 1);
+                try {
+                    SimpleDateFormat resultFormat = new SimpleDateFormat(simpleDateFormat);
+                    dateString = resultFormat.format(new Date());
+                } catch (IllegalArgumentException e) {
+                    dateString = context.getResources().getString(R.string.error_dateFormat);
+                }
+            } catch (StringIndexOutOfBoundsException e) {
+                DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.LONG);
+                dateString = dateFormat.format(new Date());
             }
 
             remoteViews.setTextViewText(R.id.time, timeFormat.format(new Date()));