From 8e76bbe2515c5c743d3db30a940ccb8040314bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20JEAN?= <contact@sebjean.com>
Date: Sat, 25 Sep 2021 09:54:34 +0200
Subject: [PATCH] fix(android): StringIndexOutOfBoundsException with invalid
 drawables (#9563)

* fix(android/application): org.nativescript.widgets.Utils::getDrawable

* chore: fix spacing

* fix(android/application): do not load empty path

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>

* test: Add tests for empty image sources

* chore: add a few more test cases

These make the app crash without the fix in place

Co-authored-by: Igor Randjelovic <rigor789@gmail.com>
Co-authored-by: Nathan Walker <walkerrunpdx@gmail.com>
---
 apps/ui/src/css/background-image-page.xml     | 32 ++++++++++++++++++-
 apps/ui/src/image-view/missing-image-page.xml |  2 ++
 .../java/org/nativescript/widgets/Utils.java  | 10 ++++--
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/apps/ui/src/css/background-image-page.xml b/apps/ui/src/css/background-image-page.xml
index 2b1beaa79..eef80d30e 100644
--- a/apps/ui/src/css/background-image-page.xml
+++ b/apps/ui/src/css/background-image-page.xml
@@ -1,5 +1,5 @@
 <Page>
-    <GridLayout rows="*,*,*,*,*,*" >
+    <GridLayout rows="*,*,*,*,*,*,*,*,*,*,*,*,*" >
         <Button backgroundImage="url('~/resources/images/no-image.png')"
             borderRadius='125' borderWidth='2' borderColor='black'
             backgroundRepeat="repeat" backgroundSize="contain"
@@ -25,5 +25,35 @@
             backgroundSize="contain"
             height="80" width="180"
             />
+
+        <!-- Test some invalid cases - these should not crash -->
+        <Button row="6" backgroundImage="url('res://theneverfoundunicorn.png')"
+            borderRadius='10' borderWidth='2' borderColor='black'
+            height="80" width="180"
+            />
+        <Button row="7" backgroundImage="url('res://')"
+            borderRadius='10' borderWidth='2' borderColor='black'
+            height="80" width="180"
+            />
+        <Button row="8" backgroundImage="url('')"
+            borderRadius='10' borderWidth='2' borderColor='black'
+            height="80" width="180"
+            />
+        <Button row="9" backgroundImage="res://theneverfoundunicorn.png"
+            borderRadius='10' borderWidth='2' borderColor='black'
+            height="80" width="180"
+            />
+        <Button row="10" backgroundImage="res://"
+            borderRadius='10' borderWidth='2' borderColor='black'
+            height="80" width="180"
+            />
+        <Button row="11" backgroundImage=" "
+            borderRadius='10' borderWidth='2' borderColor='black'
+            height="80" width="180"
+            />
+        <Button row="12" backgroundImage="bad"
+            borderRadius='10' borderWidth='2' borderColor='black'
+            height="80" width="180"
+            />
     </GridLayout>
 </Page>
diff --git a/apps/ui/src/image-view/missing-image-page.xml b/apps/ui/src/image-view/missing-image-page.xml
index d8f5596d8..9bed83ad7 100644
--- a/apps/ui/src/image-view/missing-image-page.xml
+++ b/apps/ui/src/image-view/missing-image-page.xml
@@ -12,6 +12,8 @@
 
             <Image src="res://theneverfoundunicorn.png" margin="1" width="30" height="30" backgroundColor="yellow" />
             <Image src="res://testlogo" margin="1" width="30" height="30" backgroundColor="yellow" />
+            <Image src="res://" margin="1" width="30" height="30" backgroundColor="yellow" />
+            <Image src="null" margin="1" width="30" height="30" backgroundColor="yellow" />
 
             <Image src="res://theneverfoundunicorn.png" margin="1" width="30" height="30" backgroundColor="yellow" borderRadius="10" />
             <Image src="res://testlogo" margin="1" width="30" height="30" backgroundColor="yellow" borderRadius="10" />
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
index 14eb2fcf7..d2e6473c6 100644
--- a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
+++ b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/Utils.java
@@ -36,8 +36,14 @@ import java.util.concurrent.Executors;
 
 public class Utils {
 	public static Drawable getDrawable(String uri, Context context){
-		String resPath = uri.substring("res://".length());
-		int resId = context.getResources().getIdentifier(resPath, "drawable", context.getPackageName());
+		int resId = 0;
+		int resPrefixLength = "res://".length();
+
+		if (uri.length() > resPrefixLength) {
+			String resPath = uri.substring(resPrefixLength);
+			resId = context.getResources().getIdentifier(resPath, "drawable", context.getPackageName());
+		}
+		
 		if (resId > 0) {
 			return AppCompatResources.getDrawable(context, resId);
 		} else {