From 98af1e334a08fda095d2e797717879aa65de0f52 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Mon, 10 Jul 2023 13:46:55 -0700
Subject: [PATCH 01/14] fix(geolocation): perm handling around wheninuse vs
 always

closes https://github.com/NativeScript/plugins/issues/386
---
 packages/geolocation/index.ios.ts | 2 +-
 packages/geolocation/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/geolocation/index.ios.ts b/packages/geolocation/index.ios.ts
index f9f31975..40a8ed52 100644
--- a/packages/geolocation/index.ios.ts
+++ b/packages/geolocation/index.ios.ts
@@ -109,7 +109,7 @@ class LocationListenerImpl extends NSObject implements CLLocationManagerDelegate
 				}
 				break;
 			case CLAuthorizationStatus.kCLAuthorizationStatusAuthorizedWhenInUse:
-				if (this._resolve && !this.authorizeAlways) {
+				if (this._resolve) {
 					LocationMonitor.stopLocationMonitoring(this.id);
 					this._resolve();
 				}
diff --git a/packages/geolocation/package.json b/packages/geolocation/package.json
index 47496476..8fe4458f 100644
--- a/packages/geolocation/package.json
+++ b/packages/geolocation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/geolocation",
-	"version": "8.2.0",
+	"version": "8.2.1-beta.0",
 	"description": "Provides API for getting and monitoring location for NativeScript app.",
 	"main": "index",
 	"typings": "index.d.ts",

From 01aaec8df236c9ea7fa44bf84f06740178ba5e95 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 11 Jul 2023 14:52:31 -0700
Subject: [PATCH 02/14] chore: cleanup

---
 apps/demo-angular/project.json | 16 ++++++----------
 apps/demo/project.json         | 16 ++++++----------
 apps/demo/src/main-page.xml    |  5 +----
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/apps/demo-angular/project.json b/apps/demo-angular/project.json
index 57eebe49..70452a08 100644
--- a/apps/demo-angular/project.json
+++ b/apps/demo-angular/project.json
@@ -21,10 +21,9 @@
 				}
 			]
 		},
-		"ios": {
-			"executor": "@nativescript/nx:build",
+		"debug": {
+			"executor": "@nativescript/nx:debug",
 			"options": {
-				"platform": "ios",
 				"noHmr": true
 			},
 			"dependsOn": [
@@ -34,10 +33,9 @@
 				}
 			]
 		},
-		"android": {
-			"executor": "@nativescript/nx:build",
+		"prepare": {
+			"executor": "@nativescript/nx:prepare",
 			"options": {
-				"platform": "android",
 				"noHmr": true
 			},
 			"dependsOn": [
@@ -48,10 +46,8 @@
 			]
 		},
 		"clean": {
-			"executor": "@nativescript/nx:build",
-			"options": {
-				"clean": true
-			}
+			"executor": "@nativescript/nx:clean",
+			"options": {}
 		},
 		"lint": {
 			"executor": "@nx/linter:eslint",
diff --git a/apps/demo/project.json b/apps/demo/project.json
index 55887d78..75cce95b 100644
--- a/apps/demo/project.json
+++ b/apps/demo/project.json
@@ -21,10 +21,9 @@
 				}
 			]
 		},
-		"ios": {
-			"executor": "@nativescript/nx:build",
+		"debug": {
+			"executor": "@nativescript/nx:debug",
 			"options": {
-				"platform": "ios",
 				"noHmr": true
 			},
 			"dependsOn": [
@@ -34,10 +33,9 @@
 				}
 			]
 		},
-		"android": {
-			"executor": "@nativescript/nx:build",
+		"prepare": {
+			"executor": "@nativescript/nx:prepare",
 			"options": {
-				"platform": "android",
 				"noHmr": true
 			},
 			"dependsOn": [
@@ -48,10 +46,8 @@
 			]
 		},
 		"clean": {
-			"executor": "@nativescript/nx:build",
-			"options": {
-				"clean": true
-			}
+			"executor": "@nativescript/nx:clean",
+			"options": {}
 		},
 		"lint": {
 			"executor": "@nx/linter:eslint",
diff --git a/apps/demo/src/main-page.xml b/apps/demo/src/main-page.xml
index 3f2c4c7d..4e542f5f 100644
--- a/apps/demo/src/main-page.xml
+++ b/apps/demo/src/main-page.xml
@@ -27,21 +27,18 @@
         <Button text="google-signin" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="haptics" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="imagepicker" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        
         <Button text="ios-security" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="iqkeyboardmanager" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        
         <Button text="local-notifications" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="localize" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="pdf" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="picker" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
+        <Button text="secure-storage" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="shared-notification-delegate" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="social-share" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        
         <Button text="theme-switcher" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="twitter" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="zip" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-<Button text="secure-storage" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
       </StackLayout>
     </ScrollView>
   </StackLayout>

From 012d280919a67d63be9776c2e26467593cacfc40 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 11 Jul 2023 14:53:19 -0700
Subject: [PATCH 03/14] release(geolocation): 8.2.1

---
 packages/geolocation/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/geolocation/package.json b/packages/geolocation/package.json
index 8fe4458f..b512b0da 100644
--- a/packages/geolocation/package.json
+++ b/packages/geolocation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/geolocation",
-	"version": "8.2.1-beta.0",
+	"version": "8.2.1",
 	"description": "Provides API for getting and monitoring location for NativeScript app.",
 	"main": "index",
 	"typings": "index.d.ts",

From e27f76201e96390e3a525c9f477c4906eceee8e5 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 11 Jul 2023 20:35:49 -0700
Subject: [PATCH 04/14] chore: ts-patch 3 - can be removed once plugin-tools
 contains the update

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index f3854860..a9951fa9 100644
--- a/package.json
+++ b/package.json
@@ -45,10 +45,14 @@
 		"shorthash": "0.0.2",
 		"simple-plist": "^1.1.0",
 		"sprintf-js": "^1.1.1",
+		"ts-patch": "^3.0.0",
 		"typescript": "~5.0.0",
 		"vue": "~2.6.12",
 		"zone.js": "~0.13.0"
 	},
+	"resolutions": {
+		"ts-patch": "^3.0.0"
+	},
 	"lint-staged": {
 		"**/*.{js,ts,scss,json,html}": [
 			"npx prettier --write"

From 6d67da3ac10cfa81f0962d97ec3a7d86ba3c8509 Mon Sep 17 00:00:00 2001
From: Keoni Mahelona <kmahelona@users.noreply.github.com>
Date: Wed, 12 Jul 2023 15:39:41 +1200
Subject: [PATCH 05/14] feat(localize): support for language codes with 3
 characters (#520)

---
 packages/localize/index.android.ts | 6 +++++-
 packages/localize/index.ios.ts     | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/localize/index.android.ts b/packages/localize/index.android.ts
index b42fb912..96d55550 100644
--- a/packages/localize/index.android.ts
+++ b/packages/localize/index.android.ts
@@ -41,6 +41,10 @@ export function androidLaunchEventLocalizationHandler() {
 }
 
 export function overrideLocale(locale: string): boolean {
-	ApplicationSettings.setString('__app__language__', locale.substring(0, 2));
+	let language_code = locale.substring(0, 2);
+	if (locale.indexOf('-') < 0 && locale.length == 3) {
+		language_code = locale;
+	}
+	ApplicationSettings.setString('__app__language__', language_code);
 	return true;
 }
diff --git a/packages/localize/index.ios.ts b/packages/localize/index.ios.ts
index 2d20a391..3428c074 100644
--- a/packages/localize/index.ios.ts
+++ b/packages/localize/index.ios.ts
@@ -30,7 +30,12 @@ export function androidLaunchEventLocalizationHandler() {
 }
 
 export function overrideLocale(locale: string): boolean {
-	const path = NSBundle.mainBundle.pathForResourceOfType(locale.substring(0, 2), 'lproj');
+	let language_code = locale.substring(0, 2);
+	if (locale.indexOf('-') < 0 && locale.length == 3) {
+		language_code = locale;
+	}
+
+	const path = NSBundle.mainBundle.pathForResourceOfType(language_code, 'lproj');
 
 	if (!path) {
 		return false;
@@ -39,7 +44,7 @@ export function overrideLocale(locale: string): boolean {
 	bundle = NSBundle.bundleWithPath(path);
 	NSUserDefaults.standardUserDefaults.setObjectForKey([locale], 'AppleLanguages');
 	NSUserDefaults.standardUserDefaults.synchronize();
-	ApplicationSettings.setString('__app__language__', locale.substring(0, 2));
+	ApplicationSettings.setString('__app__language__', language_code);
 
 	return true;
 }

From c91f518913d883b9d2183446f3ce3010efde5929 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 11 Jul 2023 20:43:16 -0700
Subject: [PATCH 06/14] release(localize): 5.2.0

---
 packages/localize/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/localize/package.json b/packages/localize/package.json
index fece5f26..6aaae66e 100644
--- a/packages/localize/package.json
+++ b/packages/localize/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/localize",
-	"version": "5.1.0",
+	"version": "5.2.0",
 	"description": "i18n plugin for NativeScript using native capabilities of each platform.",
 	"main": "index",
 	"typings": "index.d.ts",

From eb214109686ca3b17935751a593c8bebbbb2384c Mon Sep 17 00:00:00 2001
From: William Juan <williamjuan027@gmail.com>
Date: Fri, 14 Jul 2023 10:01:14 +0800
Subject: [PATCH 07/14] docs(google-signin): Update docs to include adding
 GIDClientID to info.plist (#522)

---
 packages/google-signin/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/google-signin/README.md b/packages/google-signin/README.md
index dd471766..3be1c58a 100644
--- a/packages/google-signin/README.md
+++ b/packages/google-signin/README.md
@@ -85,7 +85,7 @@ Make sure you've filled out all the required fields in the console for [OAuth co
 	2. Select `GoogleService-Info.plist` from the file manager.
 	3. Select the `Runner` target from the dialog that appears.
 
-4. Add the `CFBundleURLTypes` attributes below to the `App_Resources/iOS/Info.plist` file.
+  4. Add the `CFBundleURLTypes` and `GIDClientID` attributes below to the `App_Resources/iOS/Info.plist` file.
 
 ```xml
 <!-- Google Sign-in Section -->
@@ -102,6 +102,9 @@ Make sure you've filled out all the required fields in the console for [OAuth co
 		</array>
 	</dict>
 </array>
+<key>GIDClientID</key>
+<!-- Copied from GoogleService-Info.plist key CLIENT_ID -->
+<string><749673967192-c24phj29u2otpict36e71ocjo2g5i3hs.apps.googleusercontent.com/string>
 <!-- End of the Google Sign-in Section -->
 ```
 

From 565514f2b3c1be30ef11d8d8d099221093298554 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Tue, 1 Aug 2023 09:33:48 -0700
Subject: [PATCH 08/14] chore: readme

---
 packages/localize/README.md | 55 ++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/packages/localize/README.md b/packages/localize/README.md
index ca183f99..3b9cf85a 100644
--- a/packages/localize/README.md
+++ b/packages/localize/README.md
@@ -2,29 +2,34 @@
 
 ## Contents
 
-* [Installation](#installation)
-* [Use @nativescript/localize](#use-nativescriptlocalize)
-	* [Localization in NativeScript Core](#localization-in-nativescript-core)
-		* [Quirks](#quirks)
-	* [Localization in Angular](#localization-in-angular)
-  	* [Localization in Vue](#localization-in-vue)
-	* [Localization in Svelte](#localization-in-svelte)
-  	* [Setting the Default Language](#setting-the-default-language)
-  	* [Localizing the Application Name](#localizing-the-application-name)
-  	* [Localizing iOS properties?](#how-to-localize-ios-properties)
-  	* [Changing the language dynamically at runtime](#changing-the-language-dynamically-at-runtime)
-		* [iOS](#ios)
-		* [Android](#android)
-* [File format](#file-format)
-* [Troubleshooting](#troubleshooting)
-  * [Angular localization pipe and the modal context](#the-angular-localization-pipe-and-the-modal-context)
-  * [Issues with WebView on Android N+](#issues-with-webview-on-android-n)
-* [API](#api)
-	* [localize()](#localize)
-	* [overrideLocale()](#overridelocale)
-	* [androidLaunchEventLocalizationHandler()](#androidlauncheventlocalizationhandler)
-* [Credits](#credits)
-* [License](#license)
+- [@nativescript/localize](#nativescriptlocalize)
+	- [Contents](#contents)
+	- [Intro](#intro)
+	- [Installation](#installation)
+	- [Use @nativescript/localize](#use-nativescriptlocalize)
+		- [Localization in NativeScript Core](#localization-in-nativescript-core)
+			- [Quirks](#quirks)
+		- [Localization in Angular](#localization-in-angular)
+		- [Localization in Vue](#localization-in-vue)
+		- [Localization in Svelte](#localization-in-svelte)
+		- [Setting the default language](#setting-the-default-language)
+		- [Localizing the application name](#localizing-the-application-name)
+		- [File format](#file-format)
+			- [JSON](#json)
+			- [Javascript](#javascript)
+		- [Localizing iOS properties](#localizing-ios-properties)
+		- [Changing the language dynamically at runtime](#changing-the-language-dynamically-at-runtime)
+			- [iOS](#ios)
+			- [Android](#android)
+	- [Troubleshooting](#troubleshooting)
+		- [Angular localization pipe and the modal context](#angular-localization-pipe-and-the-modal-context)
+		- [Issues with WebView on Android N+](#issues-with-webview-on-android-n)
+	- [API](#api)
+		- [localize()](#localize)
+		- [overrideLocale()](#overridelocale)
+		- [androidLaunchEventLocalizationHandler()](#androidlauncheventlocalizationhandler)
+	- [Credits](#credits)
+	- [License](#license)
 
 ## Intro
 
@@ -321,7 +326,7 @@ const localeOverriddenSuccessfully = overrideLocale('en-GB'); // or "nl-NL", etc
 For Example:
 
 ```ts
-import { Application } from '@nativescript/core';
+import { Application, Utils } from '@nativescript/core';
 import { overrideLocale } from '@nativescript/localize';
 
 alert({
@@ -331,7 +336,7 @@ alert({
 }).then(() => {
 	L.localize.overrideLocale(selectedLang);
 	if (isAndroid) {
-		(Application.android.foregroundActivity || Application.android.startActivity).finish();
+		Utils.android.getCurrentActivity().finish();
 	} else {
 		exit(0);
 	}

From a55b9176b401523200564c37bdfb5bb1c8e0f4a0 Mon Sep 17 00:00:00 2001
From: Dylan Llewellyn <46717769+herefishyfish@users.noreply.github.com>
Date: Fri, 4 Aug 2023 23:15:16 +0800
Subject: [PATCH 09/14] docs(appavailibility): add android permission note
 (#523)

---
 packages/appavailability/README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/appavailability/README.md b/packages/appavailability/README.md
index 540af6e9..c02451ce 100644
--- a/packages/appavailability/README.md
+++ b/packages/appavailability/README.md
@@ -74,6 +74,23 @@ For example, to query for `twitter://`, `whatsapp://` and `fb://`, edit `app/App
 </array>
 ```
 
+## Android Query Permission
+
+Starting from Android API level 30 (Android 11), you must explicitly declare your app's intent to interact with other apps in the Android manifest file `AndroidManifest.xml`.
+
+```xml
+<manifest>
+    <queries> 
+        <package android:name="com.whatsapp" /> 
+    </queries>
+  
+    <application ...>
+    </application>
+</manifest>
+```
+
+Replace `com.whatsapp` with the package name of the app you want to interact with.
+
 ## API
 
 | Methods| Return Type| Description|

From b0982b4195589eed0177371f81ef101cd00964fa Mon Sep 17 00:00:00 2001
From: Felix <Log3n@users.noreply.github.com>
Date: Tue, 29 Aug 2023 04:56:40 +0200
Subject: [PATCH 10/14] fix(google-maps): polygon holes (#526)

---
 packages/google-maps/index.android.ts       | 34 ++++++++++++-------
 packages/google-maps/index.d.ts             |  4 +--
 packages/google-maps/index.ios.ts           | 36 +++++++++++++--------
 packages/google-maps/utils/index.android.ts | 20 ++++++------
 packages/google-maps/utils/index.ios.ts     | 17 ++++++----
 5 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/packages/google-maps/index.android.ts b/packages/google-maps/index.android.ts
index afd22d32..ac5daf65 100644
--- a/packages/google-maps/index.android.ts
+++ b/packages/google-maps/index.android.ts
@@ -1356,26 +1356,36 @@ export class Polygon extends OverLayBase implements IPolygon {
 		}
 	}
 
-	get holes(): Coordinate[] {
-		const array: androidNative.Array<com.google.android.gms.maps.model.LatLng> = this.native.getHoles().toArray();
-		const holes: Coordinate[] = [];
+	get holes(): Coordinate[][] {
+		const array: androidNative.Array<java.util.List<com.google.android.gms.maps.model.LatLng>> = this.native.getHoles().toArray();
+		const holes: Coordinate[][] = [];
 		for (let i = 0; i < array.length; i++) {
-			const hole = array[i];
-			holes.push({
-				lat: hole.latitude,
-				lng: hole.longitude,
-			});
+			const nativeHole = array[i].toArray();
+			const hole: Coordinate[] = [];
+			for (let j = 0; j < nativeHole.length; j++) {
+				hole.push({
+					lat: nativeHole[j].latitude,
+					lng: nativeHole[j].longitude,
+				});
+			}
+			holes.push(hole);
 		}
 		return holes;
 	}
 
-	set holes(value) {
+	set holes(value: Coordinate[][]) {
 		if (Array.isArray(value)) {
-			const nativeArray = new java.util.ArrayList<com.google.android.gms.maps.model.LatLng>();
+			const nativeHoles = new java.util.ArrayList<java.util.ArrayList<com.google.android.gms.maps.model.LatLng>>();
 			value.forEach((hole) => {
-				nativeArray.add(new com.google.android.gms.maps.model.LatLng(hole.lat, hole.lng));
+				if (Array.isArray(hole) && hole.length) {
+					const nativeHole = new java.util.ArrayList<com.google.android.gms.maps.model.LatLng>();
+					hole.forEach((coordinate) => {
+						nativeHole.add(new com.google.android.gms.maps.model.LatLng(coordinate.lat, coordinate.lng));
+					});
+					nativeHoles.add(nativeHole);
+				}
 			});
-			this.native.setHoles(nativeArray);
+			this.native.setHoles(nativeHoles);
 		}
 	}
 
diff --git a/packages/google-maps/index.d.ts b/packages/google-maps/index.d.ts
index 3c4ea39d..0f28f44b 100644
--- a/packages/google-maps/index.d.ts
+++ b/packages/google-maps/index.d.ts
@@ -494,7 +494,7 @@ export class Circle implements ICircle {
 
 export interface IPolygon {
 	points: Coordinate[];
-	holes: Coordinate[];
+	holes: Coordinate[][];
 	tappable: boolean;
 	strokeWidth: number;
 	strokeColor: Color | string;
@@ -512,7 +512,7 @@ export interface PolygonOptions extends Partial<IPolygon> {}
 export class Polygon implements IPolygon {
 	fillColor: Color | string;
 	geodesic: boolean;
-	holes: Coordinate[];
+	holes: Coordinate[][];
 	points: Coordinate[];
 	strokeColor: Color | string;
 	strokeJointType: JointType;
diff --git a/packages/google-maps/index.ios.ts b/packages/google-maps/index.ios.ts
index 6842680b..d42e53bd 100644
--- a/packages/google-maps/index.ios.ts
+++ b/packages/google-maps/index.ios.ts
@@ -1336,31 +1336,39 @@ export class Polygon extends OverLayBase implements IPolygon {
 		this.native.path = points;
 	}
 
-	get holes(): Coordinate[] {
+	get holes(): Coordinate[][] {
 		const nativeHoles = this.native?.holes;
 		const count = nativeHoles?.count || 0;
-		const holes: Coordinate[] = [];
+		const holes: Coordinate[][] = [];
 		for (let i = 0; i < count; i++) {
-			const hole = nativeHoles.objectAtIndex(i);
-			const coord = hole.coordinateAtIndex(0);
-			holes.push({
-				lat: coord.latitude,
-				lng: coord.longitude,
-			});
+			const nativeHole = nativeHoles.objectAtIndex(i);
+			const hole: Coordinate[] = [];
+			for (let j = 0; j < nativeHole.count(); j++) {
+				const coord = nativeHole.coordinateAtIndex(j);
+				hole.push({
+					lat: coord.latitude,
+					lng: coord.longitude,
+				});
+			}
+			holes.push(hole);
 		}
 		return holes;
 	}
 
-	set holes(value) {
-		const holes = [];
+	set holes(value: Coordinate[][]) {
+		const nativeHoles = [];
 		if (Array.isArray(value)) {
 			value.forEach((hole) => {
-				const path = GMSMutablePath.path();
-				path.addCoordinate(CLLocationCoordinate2DMake(hole.lat, hole.lng));
-				holes.push(path);
+				if (Array.isArray(hole) && hole.length) {
+					const path = GMSMutablePath.path();
+					hole.forEach((coordinate) => {
+						path.addCoordinate(CLLocationCoordinate2DMake(coordinate.lat, coordinate.lng));
+					});
+					nativeHoles.push(path);
+				}
 			});
 		}
-		this.native.holes = holes as any;
+		this.native.holes = nativeHoles as any;
 	}
 
 	get tappable(): boolean {
diff --git a/packages/google-maps/utils/index.android.ts b/packages/google-maps/utils/index.android.ts
index e5febc3e..6252bb38 100644
--- a/packages/google-maps/utils/index.android.ts
+++ b/packages/google-maps/utils/index.android.ts
@@ -76,7 +76,7 @@ export function intoNativeMarkerOptions(options: MarkerOptions) {
 		opts.icon(com.google.android.gms.maps.model.BitmapDescriptorFactory.defaultMarker(hueFromColor(color)));
 	}
 
-	if(typeof options?.opacity === 'number') {
+	if (typeof options?.opacity === 'number') {
 		opts.alpha(options.opacity);
 	}
 
@@ -153,14 +153,15 @@ export function intoNativePolygonOptions(options: PolygonOptions) {
 	}
 
 	if (Array.isArray(options?.holes)) {
-		const holes = new java.util.ArrayList();
 		options.holes.forEach((hole) => {
-			holes.add(new com.google.android.gms.maps.model.LatLng(hole.lat, hole.lng));
+			if (Array.isArray(hole) && hole.length) {
+				const nativeHole = new java.util.ArrayList<com.google.android.gms.maps.model.LatLng>();
+				hole.forEach((coordinate) => {
+					nativeHole.add(new com.google.android.gms.maps.model.LatLng(coordinate.lat, coordinate.lng));
+				});
+				opts.addHole(nativeHole);
+			}
 		});
-
-		if (options.holes.length) {
-			opts.addHole(holes);
-		}
 	}
 
 	if (typeof options?.tappable === 'boolean') {
@@ -275,10 +276,7 @@ export function intoNativeGroundOverlayOptions(options: GroundOverlayOptions) {
 	}
 
 	if (options?.bounds) {
-		opts.positionFromBounds(new com.google.android.gms.maps.model.LatLngBounds(
-			new com.google.android.gms.maps.model.LatLng(options.bounds.southwest.lat, options.bounds.southwest.lng),
-			new com.google.android.gms.maps.model.LatLng(options.bounds.northeast.lat, options.bounds.northeast.lng)
-		));
+		opts.positionFromBounds(new com.google.android.gms.maps.model.LatLngBounds(new com.google.android.gms.maps.model.LatLng(options.bounds.southwest.lat, options.bounds.southwest.lng), new com.google.android.gms.maps.model.LatLng(options.bounds.northeast.lat, options.bounds.northeast.lng)));
 	}
 
 	if (typeof options?.transparency) {
diff --git a/packages/google-maps/utils/index.ios.ts b/packages/google-maps/utils/index.ios.ts
index 1d6d9609..5a745ad7 100644
--- a/packages/google-maps/utils/index.ios.ts
+++ b/packages/google-maps/utils/index.ios.ts
@@ -144,12 +144,17 @@ export function intoNativePolygonOptions(options: PolygonOptions) {
 	const opts = path ? GMSPolygon.polygonWithPath(path) : GMSPolygon.new();
 
 	if (Array.isArray(options?.holes)) {
-		if (options.holes.length) {
-			opts.holes = options.holes.map((hole) => {
-				const res = GMSMutablePath.path();
-				res.addCoordinate(CLLocationCoordinate2DMake(hole.lat, hole.lng));
-			}) as any;
-		}
+		const nativeHoles = NSMutableArray.new<GMSMutablePath>();
+		options.holes.forEach((hole) => {
+			if (Array.isArray(hole) && hole.length) {
+				const path = GMSMutablePath.path();
+				hole.forEach((coordinate) => {
+					path.addCoordinate(CLLocationCoordinate2DMake(coordinate.lat, coordinate.lng));
+				});
+				nativeHoles.addObject(path);
+			}
+		});
+		opts.holes = nativeHoles;
 	}
 
 	if (typeof options?.tappable === 'boolean') {

From fbc7fc5bd89fef8490b4732cbc3e71d0b5726ae9 Mon Sep 17 00:00:00 2001
From: Jason Cassidy <47318351+jcassidyav@users.noreply.github.com>
Date: Mon, 4 Sep 2023 16:14:40 +0100
Subject: [PATCH 11/14] fix(secure-storage): Add Support for Access/Application
 groups on IOS in the simulator. (#528)

---
 packages/secure-storage/index.ios.ts | 29 ++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/secure-storage/index.ios.ts b/packages/secure-storage/index.ios.ts
index 76ecda1a..bc6f8610 100644
--- a/packages/secure-storage/index.ios.ts
+++ b/packages/secure-storage/index.ios.ts
@@ -36,7 +36,7 @@ export class SecureStorage extends SecureStorageCommon {
 	get(arg: GetOptions): Promise<any> {
 		return new Promise((resolve, reject) => {
 			if (this.isSimulator) {
-				resolve(NSUserDefaults.standardUserDefaults.objectForKey(arg.key));
+				resolve(this.getUserDefaultsValue(arg));
 				return;
 			}
 
@@ -57,7 +57,7 @@ export class SecureStorage extends SecureStorageCommon {
 
 	getSync(arg: GetOptions): any {
 		if (this.isSimulator) {
-			return NSUserDefaults.standardUserDefaults.objectForKey(arg.key);
+			return this.getUserDefaultsValue(arg);
 		}
 
 		let query = SAMKeychainQuery.new();
@@ -77,7 +77,7 @@ export class SecureStorage extends SecureStorageCommon {
 	set(arg: SetOptions): Promise<boolean> {
 		return new Promise((resolve, reject) => {
 			if (this.isSimulator) {
-				NSUserDefaults.standardUserDefaults.setObjectForKey(arg.value, arg.key);
+				this.setUserDefaultsValue(arg);
 				resolve(true);
 				return;
 			}
@@ -96,7 +96,7 @@ export class SecureStorage extends SecureStorageCommon {
 
 	setSync(arg: SetOptions): boolean {
 		if (this.isSimulator) {
-			NSUserDefaults.standardUserDefaults.setObjectForKey(arg.value, arg.key);
+			this.setUserDefaultsValue(arg);
 			return true;
 		}
 
@@ -114,7 +114,7 @@ export class SecureStorage extends SecureStorageCommon {
 	remove(arg: RemoveOptions): Promise<boolean> {
 		return new Promise((resolve, reject) => {
 			if (this.isSimulator) {
-				NSUserDefaults.standardUserDefaults.removeObjectForKey(arg.key);
+				this.removeUserDefaultsValue(arg);
 				resolve(true);
 				return;
 			}
@@ -135,7 +135,7 @@ export class SecureStorage extends SecureStorageCommon {
 
 	removeSync(arg: RemoveOptions): boolean {
 		if (this.isSimulator) {
-			NSUserDefaults.standardUserDefaults.removeObjectForKey(arg.key);
+			this.removeUserDefaultsValue(arg);
 			return true;
 		}
 
@@ -205,4 +205,21 @@ export class SecureStorage extends SecureStorageCommon {
 		}
 		return true;
 	}
+
+	private setUserDefaultsValue(arg: SetOptions) {
+		this.getUserDefaultToUse(arg.accessGroup).setValueForKey(arg.value, arg.key);
+	}
+	private getUserDefaultsValue(arg: GetOptions) {
+		return this.getUserDefaultToUse(arg.accessGroup).objectForKey(arg.key);
+	}
+	private removeUserDefaultsValue(arg: RemoveOptions) {
+		return this.getUserDefaultToUse(arg.accessGroup).removeObjectForKey(arg.key);
+	}
+	private getUserDefaultToUse(accessGroup?: string): NSUserDefaults {
+		if (accessGroup) {
+			return new NSUserDefaults({ suiteName: accessGroup });
+		} else {
+			return NSUserDefaults.standardUserDefaults;
+		}
+	}
 }

From c39be93de8a48b81e802e0ed1210ddbe7e802c24 Mon Sep 17 00:00:00 2001
From: Jason Cassidy <47318351+jcassidyav@users.noreply.github.com>
Date: Mon, 4 Sep 2023 16:27:32 +0100
Subject: [PATCH 12/14] release(secure-storage): 3.0.3

---
 packages/secure-storage/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/secure-storage/package.json b/packages/secure-storage/package.json
index ac3fdad4..11af0c62 100644
--- a/packages/secure-storage/package.json
+++ b/packages/secure-storage/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/secure-storage",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"description": "Secure Storage NativeScript plugin",
 	"main": "index",
 	"typings": "index.d.ts",

From 938d8801e9bc5ae646e00e10121914d80880ecd2 Mon Sep 17 00:00:00 2001
From: Jason Cassidy <47318351+jcassidyav@users.noreply.github.com>
Date: Sat, 16 Sep 2023 19:32:00 +0100
Subject: [PATCH 13/14] feat(imagepicker): consolidate API with improved
 typings (#530)

---
 .../plugin-demos/imagepicker.component.html   |  2 +-
 .../src/plugin-demos/imagepicker.component.ts | 46 +++++++-------
 packages/imagepicker/README.md                | 38 +++++++-----
 packages/imagepicker/common.ts                | 50 ++++++++++++++-
 packages/imagepicker/index.android.ts         | 54 ++++++++--------
 packages/imagepicker/index.d.ts               |  8 +--
 packages/imagepicker/index.ios.ts             | 62 +++++++++----------
 .../Android/src/main/AndroidManifest.xml      |  3 +-
 tools/demo/imagepicker/index.ts               | 56 +++++++++--------
 9 files changed, 187 insertions(+), 132 deletions(-)

diff --git a/apps/demo-angular/src/plugin-demos/imagepicker.component.html b/apps/demo-angular/src/plugin-demos/imagepicker.component.html
index 31dbee8c..b28808e4 100644
--- a/apps/demo-angular/src/plugin-demos/imagepicker.component.html
+++ b/apps/demo-angular/src/plugin-demos/imagepicker.component.html
@@ -5,7 +5,7 @@
 	<ListView [items]="imageAssets" *ngIf="!isSingleMode">
 		<ng-template let-image="item" let-i="index">
 			<GridLayout columns="auto, *">
-				<Image [width]="thumbSize" [height]="thumbSize" [src]="image" stretch="aspectFill"></Image>
+				<Image [width]="thumbSize" [height]="thumbSize" [src]="image.asset" stretch="aspectFill"></Image>
 				<Label col="1" [text]="'image ' + i"></Label>
 			</GridLayout>
 		</ng-template>
diff --git a/apps/demo-angular/src/plugin-demos/imagepicker.component.ts b/apps/demo-angular/src/plugin-demos/imagepicker.component.ts
index 72480a7b..493b611d 100644
--- a/apps/demo-angular/src/plugin-demos/imagepicker.component.ts
+++ b/apps/demo-angular/src/plugin-demos/imagepicker.component.ts
@@ -1,14 +1,14 @@
 import { Component, NgZone } from '@angular/core';
-import { ImageAsset } from '@nativescript/core';
-import * as imagepicker from '@nativescript/imagepicker';
+import { ImageAsset, ImageSource } from '@nativescript/core';
+import { ImagePicker, create, ImagePickerSelection } from '@nativescript/imagepicker';
 
 @Component({
 	selector: 'demo-imagepicker',
 	templateUrl: 'imagepicker.component.html',
 })
 export class ImagepickerComponent {
-	imageAssets = [];
-	imageSrc: any;
+	imageAssets: ImagePickerSelection[] = [];
+	imageSrc: ImageAsset | ImageSource;
 	isSingleMode: boolean = true;
 	thumbSize: number = 80;
 	previewSize: number = 300;
@@ -18,7 +18,7 @@ export class ImagepickerComponent {
 	public onSelectMultipleTap() {
 		this.isSingleMode = false;
 
-		let context = imagepicker.create({
+		let context = create({
 			mode: 'multiple',
 		});
 		this.startSelection(context);
@@ -27,36 +27,40 @@ export class ImagepickerComponent {
 	public onSelectSingleTap() {
 		this.isSingleMode = true;
 
-		let context = imagepicker.create({
+		let context = create({
 			mode: 'single',
 		});
 		this.startSelection(context);
 	}
 
-	private startSelection(context) {
+	private startSelection(context: ImagePicker) {
 		context
 			.authorize()
-			.then(() => {
+			.then((authResult) => {
 				this._ngZone.run(() => {
 					this.imageAssets = [];
 					this.imageSrc = null;
 				});
-				return context.present();
-			})
-			.then((selection) => {
-				this._ngZone.run(() => {
-					console.log('Selection done: ' + JSON.stringify(selection));
-					this.imageSrc = this.isSingleMode && selection.length > 0 ? selection[0] : null;
+				if (authResult.authorized) {
+					return context.present().then((selection) => {
+						this._ngZone.run(() => {
+							console.log('Selection done: ' + JSON.stringify(selection));
+							this.imageSrc = this.isSingleMode && selection.length > 0 ? selection[0].asset : null;
 
-					// set the images to be loaded from the assets with optimal sizes (optimize memory usage)
-					selection.forEach((el: ImageAsset) => {
-						el.options.width = this.isSingleMode ? this.previewSize : this.thumbSize;
-						el.options.height = this.isSingleMode ? this.previewSize : this.thumbSize;
-					});
+							// set the images to be loaded from the assets with optimal sizes (optimize memory usage)
+							selection.forEach((el) => {
+								el.asset.options.width = this.isSingleMode ? this.previewSize : this.thumbSize;
+								el.asset.options.height = this.isSingleMode ? this.previewSize : this.thumbSize;
+							});
 
-					this.imageAssets = selection;
-				});
+							this.imageAssets = selection;
+						});
+					});
+				} else {
+					console.log('Unauthorised');
+				}
 			})
+
 			.catch(function (e) {
 				console.log(e);
 			});
diff --git a/packages/imagepicker/README.md b/packages/imagepicker/README.md
index 27458c27..65cf9327 100644
--- a/packages/imagepicker/README.md
+++ b/packages/imagepicker/README.md
@@ -29,6 +29,11 @@ Install the plugin by running the following command in the root directory of you
 npm install @nativescript/imagepicker
 ```
 
+**Note: Version 3.0 contains breaking changes:**
+* authorize() now returns a `Promise<AuthorizationResult>` for both android and ios.
+* In the returned result from `present()` each `result[i].thumbnail` is now an `ImageSource`.
+* `result[i].duration` is now typed correctly as a `number`.
+
 **Note: Version 2.0 contains breaking changes. In order supply more information about your selection, the ImageSource asset is nested in the response so you'll need to update your code to use `result.asset` instead of `result` as your src for your Images.**
 
 ## Android required permissions
@@ -97,22 +102,25 @@ The `present` method resolves with the selected media assets that can you to pro
 ```ts
 imagePickerObj
     .authorize()
-    .then(function() {
-        return imagePickerObj.present();
-    })
-    .then(function(selection) {
-        selection.forEach(function(selected) {
-            this.imageSource = selected.asset;
-            this.type = selected.type;
-            this.filesize = selected.filesize;
-            //etc
-        });
-        list.items = selection;
-    }).catch(function (e) {
+    .then((authResult) => {
+        if(authResult.authorized) {
+            return imagePickerObj.present()
+                .then(function(selection) {
+                    selection.forEach(function(selected) {
+                        this.imageSource = selected.asset;
+                        this.type = selected.type;
+                        this.filesize = selected.filesize;
+                        //etc
+                    });
+                });
+        } else {
+            // process authorization not granted.
+        }
+    })    
+    .catch(function (e) {
         // process error
     });
 ```
-> **Note** To request permissions for Android 6+ (API 23+), use [nativescript-permissions](https://www.npmjs.com/package/nativescript-permissions) plugin.
 
 ### Demo
 You can play with the plugin on StackBlitz at any of the following links:
@@ -131,8 +139,8 @@ The class that provides the media selection API. It offers the following methods
 | Method | Returns | Description
 |:-------|:--------|:-----------
 | `constructor(options: Options)` | `ImagePicker` | Instanciates the ImagePicker class with the optional `options` parameter. See [Options](#options)
-| `authorize()` | `Promise<void>` | Requests the required permissions. Call it before calling `present()`. In case of a failed authorization, consider notifying the user for degraded functionality.
-| `present()` | `Promise<ImageAsset[]>` | Presents the image picker UI.
+| `authorize()` | `Promise<AuthorizationResult>` | Requests the required permissions. Call it before calling `present()`. In case of a failed authorization, consider notifying the user for degraded functionality.  The returned `AuthorizationResult` will have it's `authorized` property set to `true` if permission has been granted.
+| `present()` | `Promise<ImagePickerSelection[]>` | Presents the image picker UI.
 | `create(options: Options, hostView: View)` | `ImagePicker` | Creates an instance of the ImagePicker class. The `hostView` parameter can be set to the view that hosts the image picker. Intended to be used when opening the picker from a modal page.
 
 ### Options
diff --git a/packages/imagepicker/common.ts b/packages/imagepicker/common.ts
index a091f949..b4bc731d 100644
--- a/packages/imagepicker/common.ts
+++ b/packages/imagepicker/common.ts
@@ -1,4 +1,5 @@
-import { ImageAsset } from '@nativescript/core';
+import { ImageAsset, ImageSource } from '@nativescript/core';
+import { MultiResult, Result } from '@nativescript-community/perms';
 
 export enum ImagePickerMediaType {
 	Any = 0,
@@ -40,12 +41,12 @@ export interface ImagePickerSelection {
 	/**
 	 * The duration of the video. Only passed if type is 'video'
 	 */
-	duration?: string;
+	duration?: number;
 
 	/**
 	 * An image to use for the video thumbnail. Only passed if type is 'video'
 	 */
-	thumbnail?: ImageAsset;
+	thumbnail?: ImageSource;
 }
 
 /**
@@ -116,3 +117,46 @@ export interface Options {
 		read_external_storage?: string;
 	};
 }
+
+export interface ImagePickerApi {
+	/**
+	 * Call this before 'present' to request any additional permissions that may be necessary.
+	 * In case of failed authorization consider notifying the user for degraded functionality.
+	 */
+	authorize(): Promise<AuthorizationResult>;
+
+	/**
+	 * Present the image picker UI.
+	 * The result will be an array of SelectedAsset instances provided when the promise is fulfilled.
+	 */
+	present(): Promise<ImagePickerSelection[]>;
+}
+
+export interface AuthorizationResult {
+	authorized: boolean;
+	details: MultiResult | Result;
+}
+const requestingPermissions = ['android.permission.READ_MEDIA_IMAGES', 'android.permission.READ_MEDIA_VIDEO'];
+
+export abstract class ImagePickerBase implements ImagePickerApi {
+	abstract authorize(): Promise<AuthorizationResult>;
+	abstract present(): Promise<ImagePickerSelection[]>;
+	protected mapResult(result: MultiResult | Result): AuthorizationResult {
+		let authorized = true;
+		if (Array.isArray(result) && result.length == 2) {
+			// is of type Result
+			authorized = result[0] === 'authorized';
+		} else {
+			const t = result as MultiResult;
+			requestingPermissions.forEach((permission) => {
+				if (t[permission] !== undefined) {
+					authorized = authorized && t[permission] === 'authorized';
+				}
+			});
+		}
+		return {
+			details: result,
+			authorized,
+		};
+	}
+}
diff --git a/packages/imagepicker/index.android.ts b/packages/imagepicker/index.android.ts
index 6268df41..8da55bea 100644
--- a/packages/imagepicker/index.android.ts
+++ b/packages/imagepicker/index.android.ts
@@ -1,12 +1,12 @@
-import { ImageAsset, Application, AndroidApplication, Utils, File, knownFolders } from '@nativescript/core';
+import { ImageAsset, Application, AndroidApplication, Utils, File, knownFolders, ImageSource } from '@nativescript/core';
 import * as permissions from '@nativescript-community/perms';
 
-import { ImagePickerMediaType, Options } from './common';
+import { ImagePickerMediaType, Options, AuthorizationResult, ImagePickerBase, ImagePickerSelection } from './common';
 export * from './common';
 let copyToAppFolder;
 let renameFileTo;
-let fileMap = {};
-let videoFiles = {
+
+const videoFiles = {
 	mp4: true,
 	mov: true,
 	avi: true,
@@ -22,8 +22,8 @@ let videoFiles = {
 };
 class UriHelper {
 	public static _calculateFileUri(uri: android.net.Uri) {
-		let DocumentsContract = (<any>android.provider).DocumentsContract;
-		let isKitKat = android.os.Build.VERSION.SDK_INT >= 19; // android.os.Build.VERSION_CODES.KITKAT
+		const DocumentsContract = (<any>android.provider).DocumentsContract;
+		const isKitKat = android.os.Build.VERSION.SDK_INT >= 19; // android.os.Build.VERSION_CODES.KITKAT
 
 		if (isKitKat && DocumentsContract.isDocumentUri(Utils.android.getApplicationContext(), uri)) {
 			let docId, id, type;
@@ -56,7 +56,7 @@ class UriHelper {
 			// MediaProvider
 			else if (UriHelper.isMediaDocument(uri)) {
 				docId = DocumentsContract.getDocumentId(uri);
-				let split = docId.split(':');
+				const split = docId.split(':');
 				type = split[0];
 				id = split[1];
 
@@ -68,8 +68,8 @@ class UriHelper {
 					contentUri = android.provider.MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
 				}
 
-				let selection = '_id=?';
-				let selectionArgs = [id];
+				const selection = '_id=?';
+				const selectionArgs = [id];
 
 				return UriHelper.getDataColumn(contentUri, selection, selectionArgs, false);
 			}
@@ -89,13 +89,13 @@ class UriHelper {
 
 	private static getDataColumn(uri: android.net.Uri, selection, selectionArgs, isDownload: boolean) {
 		let cursor = null;
-		let filePath;
+		let filePath: string;
 		if (isDownload) {
-			let columns = ['_display_name'];
+			const columns = ['_display_name'];
 			try {
 				cursor = this.getContentResolver().query(uri, columns, selection, selectionArgs, null);
 				if (cursor != null && cursor.moveToFirst()) {
-					let column_index = cursor.getColumnIndexOrThrow(columns[0]);
+					const column_index = cursor.getColumnIndexOrThrow(columns[0]);
 					filePath = cursor.getString(column_index);
 					if (filePath) {
 						const dl = android.os.Environment.getExternalStoragePublicDirectory(android.os.Environment.DIRECTORY_DOWNLOADS);
@@ -111,13 +111,13 @@ class UriHelper {
 				}
 			}
 		} else {
-			let columns = [android.provider.MediaStore.MediaColumns.DATA];
+			const columns = [android.provider.MediaStore.MediaColumns.DATA];
 			let filePath;
 
 			try {
 				cursor = this.getContentResolver().query(uri, columns, selection, selectionArgs, null);
 				if (cursor != null && cursor.moveToFirst()) {
-					let column_index = cursor.getColumnIndexOrThrow(columns[0]);
+					const column_index = cursor.getColumnIndexOrThrow(columns[0]);
 					filePath = cursor.getString(column_index);
 					if (filePath) {
 						return filePath;
@@ -151,10 +151,11 @@ class UriHelper {
 	}
 }
 
-export class ImagePicker {
+export class ImagePicker extends ImagePickerBase {
 	private _options: Options;
 
 	constructor(options: Options) {
+		super();
 		this._options = options;
 		copyToAppFolder = options.copyToAppFolder;
 		renameFileTo = options.renameFileTo;
@@ -176,8 +177,8 @@ export class ImagePicker {
 	}
 
 	get mimeTypes() {
-		let length = this.mediaType === '*/*' ? 2 : 1;
-		let mimeTypes = Array.create(java.lang.String, length);
+		const length = this.mediaType === '*/*' ? 2 : 1;
+		const mimeTypes = Array.create(java.lang.String, length);
 
 		if (this.mediaType === '*/*') {
 			mimeTypes[0] = 'image/*';
@@ -188,9 +189,9 @@ export class ImagePicker {
 		return mimeTypes;
 	}
 
-	authorize(): Promise<permissions.MultiResult | permissions.Result> {
+	authorize(): Promise<AuthorizationResult> {
+		let requested: { [key: string]: permissions.PermissionOptions } = {};
 		if ((<any>android).os.Build.VERSION.SDK_INT >= 33 && Utils.ad.getApplicationContext().getApplicationInfo().targetSdkVersion >= 33) {
-			let requested: { [key: string]: permissions.PermissionOptions } = {};
 			const mediaPerms = {
 				photo: { reason: 'To pick images from your gallery' },
 				video: { reason: 'To pick videos from your gallery' },
@@ -203,15 +204,16 @@ export class ImagePicker {
 				requested = mediaPerms;
 			}
 
-			return permissions.request(requested);
+			return permissions.request(requested).then((result) => this.mapResult(result));
 		} else if ((<any>android).os.Build.VERSION.SDK_INT >= 23) {
-			return permissions.request('storage', { read: true });
+			requested['storage'] = { read: true, write: false };
+			return permissions.request(requested).then((result) => this.mapResult(result));
 		} else {
-			return Promise.resolve({ storage: 'authorized' });
+			return Promise.resolve({ details: null, authorized: true });
 		}
 	}
 
-	present(): Promise<ImageAsset[]> {
+	present(): Promise<ImagePickerSelection[]> {
 		return new Promise((resolve, reject) => {
 			// WARNING: If we want to support multiple pickers we will need to have a range of IDs here:
 			let RESULT_CODE_PICKER_IMAGES = 9192;
@@ -227,7 +229,7 @@ export class ImagePicker {
 					const file = File.fromPath(selectedAsset.android);
 					let copiedFile: any = false;
 
-					let item: any = {
+					const item: ImagePickerSelection = {
 						asset: selectedAsset,
 						filename: file.name,
 						originalFilename: file.name,
@@ -254,10 +256,10 @@ export class ImagePicker {
 						item.filesize = new java.io.File(item.path).length();
 					}
 					if (item.type == 'video') {
-						let thumb = android.media.ThumbnailUtils.createVideoThumbnail(copiedFile ? copiedFile.path : file.path, android.provider.MediaStore.Video.Thumbnails.MINI_KIND);
+						const thumb = android.media.ThumbnailUtils.createVideoThumbnail(copiedFile ? copiedFile.path : file.path, android.provider.MediaStore.Video.Thumbnails.MINI_KIND);
 						let retriever = new android.media.MediaMetadataRetriever();
 						retriever.setDataSource(item.path);
-						item.thumbnail = thumb;
+						item.thumbnail = new ImageSource(thumb);
 						let time = retriever.extractMetadata(android.media.MediaMetadataRetriever.METADATA_KEY_DURATION);
 						let duration = parseInt(time) / 1000;
 						item.duration = duration;
diff --git a/packages/imagepicker/index.d.ts b/packages/imagepicker/index.d.ts
index d76e0018..a6207715 100644
--- a/packages/imagepicker/index.d.ts
+++ b/packages/imagepicker/index.d.ts
@@ -1,13 +1,13 @@
-import { Observable, ImageSource, ImageAsset, View } from '@nativescript/core';
-
-export class ImagePicker {
+import { ImageSource, ImageAsset, View } from '@nativescript/core';
+import { AuthorizationResult, ImagePickerApi } from './common';
+export class ImagePicker implements ImagePickerApi {
 	constructor(options?: Options);
 
 	/**
 	 * Call this before 'present' to request any additional permissions that may be necessary.
 	 * In case of failed authorization consider notifying the user for degraded functionality.
 	 */
-	authorize(): Promise<void>;
+	authorize(): Promise<AuthorizationResult>;
 
 	/**
 	 * Present the image picker UI.
diff --git a/packages/imagepicker/index.ios.ts b/packages/imagepicker/index.ios.ts
index ba8099a3..431a57db 100644
--- a/packages/imagepicker/index.ios.ts
+++ b/packages/imagepicker/index.ios.ts
@@ -1,13 +1,16 @@
-import { Observable, ImageAsset, View, Utils, Application, path, knownFolders, Folder, File, ImageSource } from '@nativescript/core';
-import { Options, ImagePickerMediaType } from './common';
+import { ImageAsset, View, Utils, Application, path, knownFolders, ImageSource } from '@nativescript/core';
+import { AuthorizationResult, ImagePickerBase, ImagePickerSelection, Options } from './common';
 import { getFile } from '@nativescript/core/http';
+import * as permissions from '@nativescript-community/perms';
 export * from './common';
-
+type FileMap = {
+	[key: string]: ImagePickerSelection;
+};
 const defaultAssetCollectionSubtypes: NSArray<any> = NSArray.arrayWithArray(<any>[PHAssetCollectionSubtype.SmartAlbumRecentlyAdded, PHAssetCollectionSubtype.SmartAlbumUserLibrary, PHAssetCollectionSubtype.AlbumMyPhotoStream, PHAssetCollectionSubtype.SmartAlbumFavorites, PHAssetCollectionSubtype.SmartAlbumPanoramas, PHAssetCollectionSubtype.SmartAlbumBursts, PHAssetCollectionSubtype.AlbumCloudShared, PHAssetCollectionSubtype.SmartAlbumSelfPortraits, PHAssetCollectionSubtype.SmartAlbumScreenshots, PHAssetCollectionSubtype.SmartAlbumLivePhotos]);
 let copyToAppFolder;
 let renameFileTo;
-let fileMap = {};
-export class ImagePicker extends Observable {
+let fileMap: FileMap = {};
+export class ImagePicker extends ImagePickerBase {
 	_imagePickerController: QBImagePickerController;
 	_hostView: View;
 	_delegate: ImagePickerControllerDelegate;
@@ -27,10 +30,9 @@ export class ImagePicker extends Observable {
 
 	constructor(options: Options = {}, hostView: View) {
 		super();
-
 		this._hostView = hostView;
 
-		let imagePickerController = QBImagePickerController.alloc().init();
+		const imagePickerController = QBImagePickerController.alloc().init();
 
 		imagePickerController.assetCollectionSubtypes = defaultAssetCollectionSubtypes;
 		imagePickerController.mediaType = options.mediaType ? <QBImagePickerMediaType>options.mediaType.valueOf() : QBImagePickerMediaType.Any;
@@ -46,24 +48,14 @@ export class ImagePicker extends Observable {
 		this._imagePickerController = imagePickerController;
 	}
 
-	authorize(): Promise<void> {
+	authorize(): Promise<AuthorizationResult> {
 		console.log('authorizing...');
-
-		return new Promise<void>((resolve, reject) => {
-			let runloop = CFRunLoopGetCurrent();
-			PHPhotoLibrary.requestAuthorization(function (result) {
-				if (result === PHAuthorizationStatus.Authorized) {
-					resolve();
-				} else {
-					reject(new Error('Authorization failed. Status: ' + result));
-				}
-			});
-		});
+		return permissions.request('photo').then((result) => this.mapResult(result));
 	}
 
-	present() {
+	present(): Promise<ImagePickerSelection[]> {
 		fileMap = {};
-		return new Promise<void>((resolve, reject) => {
+		return new Promise<ImagePickerSelection[]>((resolve, reject) => {
 			this._delegate = ImagePickerControllerDelegate.initWithOwner(this, resolve, reject);
 			this._imagePickerController.delegate = this._delegate;
 
@@ -99,27 +91,29 @@ class ImagePickerControllerDelegate extends NSObject implements QBImagePickerCon
 	qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, iosAssets: NSArray<any>): void {
 		for (let i = 0; i < iosAssets.count; i++) {
 			const asset = new ImageAsset(iosAssets.objectAtIndex(i));
-			let phAssetImage: PHAsset = (<any>asset)._ios;
+			const phAssetImage: PHAsset = (<any>asset)._ios;
 			// this fixes the image aspect ratio in tns-core-modules version < 4.0
 			if (!asset.options) asset.options = { keepAspectRatio: true };
-			let existingFileName = phAssetImage.valueForKey('filename');
-			let pickerSelection: any = {
+			const existingFileName = phAssetImage.valueForKey('filename');
+			const pickerSelection: ImagePickerSelection = {
 				asset: asset,
 				type: phAssetImage.mediaType == 2 ? 'video' : 'image',
 				filename: existingFileName,
 				originalFilename: existingFileName,
+				filesize: 0,
+				path: '',
 			};
 			if (pickerSelection.type == 'video') pickerSelection.duration = parseInt(phAssetImage.duration.toFixed(0));
 			fileMap[existingFileName] = pickerSelection;
 			if (pickerSelection.type == 'video') {
-				let manager = new PHImageManager();
-				let options = new PHVideoRequestOptions();
+				const manager = new PHImageManager();
+				const options = new PHVideoRequestOptions();
 				options.networkAccessAllowed = true;
 				manager.requestAVAssetForVideoOptionsResultHandler(phAssetImage, options, (urlAsset: AVURLAsset, audioMix, info) => {
 					fileMap[existingFileName].path = urlAsset.URL.toString().replace('file://', '');
 				});
 			} else {
-				let imageOptions = new PHContentEditingInputRequestOptions();
+				const imageOptions = new PHContentEditingInputRequestOptions();
 				imageOptions.networkAccessAllowed = true;
 				phAssetImage.requestContentEditingInputWithOptionsCompletionHandler(imageOptions, (thing) => {
 					fileMap[existingFileName].path = thing.fullSizeImageURL.toString().replace('file://', '');
@@ -129,16 +123,16 @@ class ImagePickerControllerDelegate extends NSObject implements QBImagePickerCon
 
 		if (this._resolve) {
 			setTimeout(() => {
-				let promises = [];
+				const promises = [];
 				let count = 0;
-				for (var key in fileMap) {
-					let item = fileMap[key];
+				for (const key in fileMap) {
+					const item = fileMap[key];
 					const folder = knownFolders.documents();
-					let extension = item.filename.split('.').pop();
+					const extension = item.filename.split('.').pop();
 					let filename = renameFileTo ? renameFileTo + '.' + extension : item.filename;
 					if (iosAssets.count > 1) filename = renameFileTo ? renameFileTo + '-' + count + '.' + extension : item.filename;
 					fileMap[item.filename].filename = filename;
-					let fileManager = new NSFileManager();
+					const fileManager = new NSFileManager();
 					if (copyToAppFolder) {
 						const filePath = path.join(folder.path + '/' + copyToAppFolder, filename);
 						promises.push(
@@ -170,8 +164,8 @@ class ImagePickerControllerDelegate extends NSObject implements QBImagePickerCon
 				}
 
 				Promise.all(promises).then(() => {
-					let results = [];
-					for (var key in fileMap) {
+					const results: ImagePickerSelection[] = [];
+					for (const key in fileMap) {
 						results.push(fileMap[key]);
 					}
 					this._resolve(results);
diff --git a/tools/assets/App_Resources/Android/src/main/AndroidManifest.xml b/tools/assets/App_Resources/Android/src/main/AndroidManifest.xml
index 15375880..6281e8b6 100644
--- a/tools/assets/App_Resources/Android/src/main/AndroidManifest.xml
+++ b/tools/assets/App_Resources/Android/src/main/AndroidManifest.xml
@@ -11,8 +11,7 @@
 		android:largeScreens="true"
 		android:xlargeScreens="true"/>
 
-	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" tools:replace="android:maxSdkVersion"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
diff --git a/tools/demo/imagepicker/index.ts b/tools/demo/imagepicker/index.ts
index a3250060..dd02873c 100644
--- a/tools/demo/imagepicker/index.ts
+++ b/tools/demo/imagepicker/index.ts
@@ -1,10 +1,10 @@
 import { DemoSharedBase } from '../utils';
 import * as imagepicker from '@nativescript/imagepicker';
-import { ItemEventData, Label } from '@nativescript/core';
+import { ImageAsset, ImageSource, ItemEventData, Label } from '@nativescript/core';
 
 export class DemoSharedImagepicker extends DemoSharedBase {
 	private _selection: any;
-	private _imageSrc: any;
+	private _imageSrc: ImageSource | ImageAsset;
 	private _imageAssets: Array<any>;
 	private _isSingleMode: boolean;
 
@@ -16,11 +16,11 @@ export class DemoSharedImagepicker extends DemoSharedBase {
 		return 300;
 	}
 
-	get imageSrc(): any {
+	get imageSrc(): ImageSource | ImageAsset {
 		return this._imageSrc;
 	}
 
-	set imageSrc(value: any) {
+	set imageSrc(value: ImageSource | ImageAsset) {
 		if (this._imageSrc !== value) {
 			this._imageSrc = value;
 			this.notifyPropertyChange('imageSrc', value);
@@ -82,31 +82,35 @@ export class DemoSharedImagepicker extends DemoSharedBase {
 		this.startSelection(context);
 	}
 
-	private startSelection(context) {
+	private startSelection(context: imagepicker.ImagePicker) {
 		context
 			.authorize()
-			.then(() => {
-				this.imageAssets = [];
-				this.imageSrc = null;
-				this.selection = null;
-				return context.present();
-			})
-			.then((selection: imagepicker.ImagePickerSelection[]) => {
-				console.log('Selection done: ', selection);
-				this.imageSrc = this.isSingleMode && selection.length > 0 ? selection[0].asset : null;
-				if (selection[0].thumbnail) {
-					this.imageSrc = selection[0].thumbnail;
+			.then((authResult) => {
+				console.log(authResult);
+				if (authResult.authorized) {
+					this.imageAssets = [];
+					this.imageSrc = null;
+					this.selection = null;
+					return context.present().then((selection: imagepicker.ImagePickerSelection[]) => {
+						console.log('Selection done: ', selection);
+						this.imageSrc = this.isSingleMode && selection.length > 0 ? selection[0].asset : null;
+						if (selection[0].thumbnail) {
+							this.imageSrc = selection[0].thumbnail;
+						}
+						this.selection = this.isSingleMode && selection.length > 0 ? selection[0] : null;
+
+						// set the images to be loaded from the assets with optimal sizes (optimize memory usage)
+						selection.forEach((element) => {
+							let asset = element.asset;
+							asset.options.width = this.isSingleMode ? this.previewSize : this.thumbSize;
+							asset.options.height = this.isSingleMode ? this.previewSize : this.thumbSize;
+						});
+
+						this.imageAssets = selection;
+					});
+				} else {
+					console.log('UnAuthorized');
 				}
-				this.selection = this.isSingleMode && selection.length > 0 ? selection[0] : null;
-
-				// set the images to be loaded from the assets with optimal sizes (optimize memory usage)
-				selection.forEach((element) => {
-					let asset = element.asset;
-					asset.options.width = this.isSingleMode ? this.previewSize : this.thumbSize;
-					asset.options.height = this.isSingleMode ? this.previewSize : this.thumbSize;
-				});
-
-				this.imageAssets = selection;
 			})
 			.catch(function (e) {
 				console.log('selection error', e);

From a5924fd5c9de39d37206c09a780568d7a4801011 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Sat, 16 Sep 2023 12:05:00 -0700
Subject: [PATCH 14/14] release(imagepicker): 3.0.0

---
 apps/demo/src/main-page.xml       | 5 +----
 packages/imagepicker/package.json | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/demo/src/main-page.xml b/apps/demo/src/main-page.xml
index 3f2c4c7d..4e542f5f 100644
--- a/apps/demo/src/main-page.xml
+++ b/apps/demo/src/main-page.xml
@@ -27,21 +27,18 @@
         <Button text="google-signin" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="haptics" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="imagepicker" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        
         <Button text="ios-security" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="iqkeyboardmanager" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        
         <Button text="local-notifications" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="localize" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="pdf" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="picker" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
+        <Button text="secure-storage" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="shared-notification-delegate" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="social-share" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-        
         <Button text="theme-switcher" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="twitter" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
         <Button text="zip" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
-<Button text="secure-storage" tap="{{ viewDemo }}" class="btn btn-primary view-demo"/>
       </StackLayout>
     </ScrollView>
   </StackLayout>
diff --git a/packages/imagepicker/package.json b/packages/imagepicker/package.json
index ffc8b214..9e8f4f2f 100644
--- a/packages/imagepicker/package.json
+++ b/packages/imagepicker/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/imagepicker",
-	"version": "2.0.2",
+	"version": "3.0.0",
 	"description": "A plugin for the NativeScript framework implementing multiple image picker",
 	"main": "index",
 	"typings": "index.d.ts",
@@ -33,6 +33,6 @@
 	"readmeFilename": "README.md",
 	"bootstrapper": "@nativescript/plugin-seed",
 	"dependencies": {
-		"@nativescript-community/perms": "~2.3.0"
+		"@nativescript-community/perms": "^2.3.0"
 	}
 }

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/NativeScript/plugins/pull/521.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/NativeScript/plugins/pull/521.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/NativeScript/plugins/pull/521.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/NativeScript/plugins/pull/521.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>