Merge pull request #85 from vikulin/master

NPE fix in class loader
yggdrasil-network · Dec 21, 2022 · 91ddb4f · 91ddb4f
2 parents d34c316 + 95d48cf
commit 91ddb4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "io.github.chronosx88.yggdrasil"
         minSdkVersion 15
         targetSdkVersion 33
-        versionCode 41
-        versionName "2.1.5"
+        versionCode 42
+        versionName "2.1.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
 

diff --git a/app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt
@@ -212,8 +212,10 @@ class MainActivity : AppCompatActivity() {
             val sourceDir: String = this.applicationInfo.sourceDir
             val dexFile = DexFile(sourceDir)
             val cl = classLoader
-            if (cl != null) {
+            try {
                 val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)
+            } catch (_: NullPointerException){
+                //there is nothing we can do
             }
         }
         val versionName = findViewById<Button>(R.id.about)