fix android samples (#481)

aws · Oct 3, 2023 · 4fdc1c6 · 4fdc1c6
1 parent 02ca5f5
commit 4fdc1c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/samples/Android/app/build.gradle b/samples/Android/app/build.gradle
@@ -36,11 +36,11 @@ android {
 
     sourceSets {
         main {
-            java.srcDir '../..Utils/CommandLineUtils'
-            java.srcDir '../..BasicPubSub/src/main/java'
-            java.srcDir '../..Jobs/src/main/java'
-            java.srcDir '../..Shadow/src/main/java'
-            java.srcDir '../..CognitoConnect/src/main/java'
+            java.srcDir '../../Utils/CommandLineUtils'
+            java.srcDir '../../BasicPubSub/src/main/java'
+            java.srcDir '../../Jobs/src/main/java'
+            java.srcDir '../../Shadow/src/main/java'
+            java.srcDir '../../CognitoConnect/src/main/java'
             java.srcDir 'src/main/java'
         }
     }

diff --git a/samples/Android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.kt b/samples/Android/app/src/main/java/software/amazon/awssdk/iotsamples/MainActivity.kt
@@ -114,10 +114,11 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
 
     private fun runSample(name: String) {
         val classLoader = Thread.currentThread().contextClassLoader
-        val sampleClass = classLoader?.loadClass(name);
+        val sampleClass = try { classLoader?.loadClass(name) } catch(e:Exception) { null }
         if (sampleClass == null) {
             clearConsole()
             writeToConsole("Could not find sample '${name}'")
+            return
         }
         writeToConsole("Running sample '${name}'\n")