Usage of 0 in Time Settings #1

ympavlov · Dec 6, 2021 · 2431fb1 · 2431fb1
1 parent 77dbee8
commit 2431fb1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
 		// compromise targetSdkVersion 11 to enable good appearance and old-style menu button (because new-style button'd be hidden with app bar)
 		//noinspection ExpiredTargetSdkVersion
 		targetSdkVersion 11
-		versionCode 16
-		versionName "1.6"
+		versionCode 19
+		versionName "1.9"
 	}
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/app/src/main/java/com/github/ympavlov/minidoro/AppPreferences.java b/app/src/main/java/com/github/ympavlov/minidoro/AppPreferences.java
@@ -31,22 +31,29 @@ public AppPreferences(Context context, SharedPreferences p)
 		minidoroRingtone = ContentResolver.SCHEME_ANDROID_RESOURCE + "://"+ context.getPackageName() + "/" + R.raw.darkjazz;
 	}
 
+	private static int parsePositive(String s, int def)
+	{
+		try {
+			int i = Integer.parseInt(s);
+			return i > 0 ? i : def;
+		} catch (NumberFormatException e) {
+			return def;
+		}
+	}
+
 	public int getDuration(Stage s)
 	{
-		String val = p.getString(s.durationPref, Integer.toString(s.defaultDuration));
-		if ("".equals(val) || "0".equals(val))
-			return s.defaultDuration;
-		return Integer.parseInt(val);
+		return parsePositive(
+				p.getString(s.durationPref, ""),
+				s.defaultDuration
+		);
 	}
 
 	public boolean isLongBreaksOn() { return getDuration(BREAK) != getDuration(LONG_BREAK); }
 
 	public int getLongBreaksPeriodicity()
 	{
-		String val = p.getString(LONG_BREAK_PERIODICITY_KEY, "4");
-		if ("".equals(val) || "0".equals(val))
-			return 4;
-		return Integer.parseInt(val);
+		return parsePositive(p.getString(LONG_BREAK_PERIODICITY_KEY, "4"), 4);
 	}
 
 	public boolean isDndModeOn() { return p.getBoolean(DND_MODE_KEY, false); }

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -4,25 +4,25 @@
     <PreferenceCategory android:title = "@string/prefGroupTimer">
         <EditTextPreference android:key="workDuration"
             android:dialogTitle="@string/prefWorkDurationD"
-            android:inputType="numberDecimal"
+            android:inputType="number"
             android:persistent="true"
             android:defaultValue="25"
             android:title="@string/prefWorkDuration"/>
         <EditTextPreference android:key="breakDuration"
             android:dialogTitle="@string/prefBreakDurationD"
-            android:inputType="numberDecimal"
+            android:inputType="number"
             android:persistent="true"
             android:defaultValue="5"
             android:title="@string/prefBreakDuration"/>
         <EditTextPreference android:key="longBreakDuration"
             android:dialogTitle="@string/prefLongBreakDurationD"
-            android:inputType="numberDecimal"
+            android:inputType="number"
             android:persistent="true"
             android:defaultValue="15"
             android:title="@string/prefLongBreakDuration"/>
         <EditTextPreference android:key="longBreakPeriodicity"
             android:dialogTitle="@string/prefLongBreakPeriodicityD"
-            android:inputType="numberDecimal"
+            android:inputType="number"
             android:persistent="true"
             android:defaultValue="4"
             android:title="@string/prefLongBreakPeriodicity"/>