Don't load resources package relative, as Proguard obfuscates the package

klassm · klassm · commit 0dc39357dac5 · 2018-02-17T17:29:50.000+01:00
diff --git a/app/proguard-production.txt b/app/proguard-production.txt
@@ -12,6 +12,7 @@
 -keep,includedescriptorclasses class li.klass.**$$serializer { *; }
 -keep class android.** { *; }
 -keep class li.klass.fhem.update.backend.device.configuration.DevicesConfiguration.**$* { *; }
+-keeppackagenames li.klass.fhem.update.backend.device.configuration
 
 -keep public class com.google.android.gms.**
 -dontwarn com.google.android.gms.**
diff --git a/app/src/main/java/li/klass/fhem/update/backend/device/configuration/DeviceDescMapping.java b/app/src/main/java/li/klass/fhem/update/backend/device/configuration/DeviceDescMapping.java
@@ -43,7 +43,7 @@ public class DeviceDescMapping {
     @Inject
     public DeviceDescMapping() {
         try {
-            mapping = new JSONObject(Resources.toString(Resources.getResource(DeviceDescMapping.class, "deviceDescMapping.json"), Charsets.UTF_8));
+            mapping = new JSONObject(Resources.toString(Resources.getResource(DeviceDescMapping.class, "/deviceDescMapping.json"), Charsets.UTF_8));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/app/src/main/resources/deviceDescMapping.json b/app/src/main/resources/deviceDescMapping.json
diff --git a/app/whatsnew-de.md b/app/whatsnew-de.md
@@ -1 +1 @@
-TODO
+* Fix application crash
diff --git a/app/whatsnew-en.md b/app/whatsnew-en.md
@@ -1 +1 @@
-TODO
+* Fix application crash

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class DeviceDescMapping {`
`43`	`43`	`@Inject`
`44`	`44`	`public DeviceDescMapping() {`
`45`	`45`	`try {`
`46`		`- mapping = new JSONObject(Resources.toString(Resources.getResource(DeviceDescMapping.class, "deviceDescMapping.json"), Charsets.UTF_8));`
	`46`	`+ mapping = new JSONObject(Resources.toString(Resources.getResource(DeviceDescMapping.class, "/deviceDescMapping.json"), Charsets.UTF_8));`
`47`	`47`	`} catch (Exception e) {`
`48`	`48`	`throw new RuntimeException(e);`
`49`	`49`	`}`