Merge pull request #85 from vikulin/master

vikulin · web-flow · commit 91ddb4f9916f · 2022-12-21T12:54:35.000+02:00
NPE fix in class loader
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)

Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,10 @@ class MainActivity : AppCompatActivity() {`
`212`	`212`	`val sourceDir: String = this.applicationInfo.sourceDir`
`213`	`213`	`val dexFile = DexFile(sourceDir)`
`214`	`214`	`val cl = classLoader`
`215`		`- if (cl != null) {`
	`215`	`+ try {`
`216`	`216`	`val c: Class<*> = dexFile.loadClass("dummy/Dummy", cl)`
	`217`	`+ } catch (_: NullPointerException){`
	`218`	`+ //there is nothing we can do`
`217`	`219`	`}`
`218`	`220`	`}`
`219`	`221`	`val versionName = findViewById<Button>(R.id.about)`