Merge branch 'master' into fix/android-uncaught-exception

hansemannn · web-flow · commit f231d0c5a588 · 2025-03-10T16:27:04.000+01:00
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,4 +1,4 @@
 
 dependencies {
-	implementation 'androidx.browser:browser:1.4.0'
+	implementation 'androidx.browser:browser:1.5.0'
 }
diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.2.1
+version: 2.3.1
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-web-dialog
diff --git a/android/src/ti/webdialog/Utils.java b/android/src/ti/webdialog/Utils.java
@@ -65,7 +65,7 @@ public static boolean getBool(KrollDict options, String key)
 	public static int getColor(KrollDict options, String key)
 	{
 		if (options.containsKeyAndNotNull(key)) {
-			return TiConvert.toColor((String) options.get(key));
+			return TiConvert.toColor((String) options.get(key), TiApplication.getAppCurrentActivity());
 
 		} else {
 			return getR("color.colorPrimary");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`
`2`	`2`	`dependencies {`
`3`		`- implementation 'androidx.browser:browser:1.4.0'`
	`3`	`+ implementation 'androidx.browser:browser:1.5.0'`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# this is your module manifest and used by Titanium`
`3`	`3`	`# during compilation, packaging, distribution, etc.`
`4`	`4`	`#`
`5`		`-version: 2.2.1`
	`5`	`+version: 2.3.1`
`6`	`6`	`apiversion: 4`
`7`	`7`	`architectures: arm64-v8a armeabi-v7a x86 x86_64`
`8`	`8`	`description: titanium-web-dialog`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public static boolean getBool(KrollDict options, String key)`
`65`	`65`	`public static int getColor(KrollDict options, String key)`
`66`	`66`	`{`
`67`	`67`	`if (options.containsKeyAndNotNull(key)) {`
`68`		`- return TiConvert.toColor((String) options.get(key));`
	`68`	`+ return TiConvert.toColor((String) options.get(key), TiApplication.getAppCurrentActivity());`
`69`	`69`
`70`	`70`	`} else {`
`71`	`71`	`return getR("color.colorPrimary");`