#1257 load deviceConfiguration from root, as package names are obfuscated by proguard

klassm · klassm · commit 57ab55a3582c · 2018-01-14T11:23:49.000+01:00
diff --git a/app/build-includes/device-configuration-generator.gradle b/app/build-includes/device-configuration-generator.gradle
@@ -69,6 +69,6 @@ class DeviceConfigurationTask extends DefaultTask {
 
 task buildDeviceConfigurationJson(type: DeviceConfigurationTask) {
     inputDir = file('src/main/resources/deviceConfiguration')
-    outputFile = file('src/gen/resources/li/klass/fhem/update/backend/device/configuration/deviceConfiguration.json')
+    outputFile = file('src/gen/resources/deviceConfiguration.json')
 }
 tasks["preBuild"].dependsOn('buildDeviceConfigurationJson')
diff --git a/app/src/main/java/li/klass/fhem/update/backend/device/configuration/DeviceConfigurationProvider.kt b/app/src/main/java/li/klass/fhem/update/backend/device/configuration/DeviceConfigurationProvider.kt
@@ -38,7 +38,7 @@ class DeviceConfigurationProvider @Inject
 constructor() {
     private val configurations: Map<String, DeviceConfiguration> by lazy {
         val jsonAsString = Resources.toString(Resources.getResource(
-                DeviceConfigurationProvider::class.java, "deviceConfiguration.json"), Charsets.UTF_8)
+                DeviceConfigurationProvider::class.java, "/deviceConfiguration.json"), Charsets.UTF_8)
 
         JSON.parse(DevicesConfiguration.serializer(), jsonAsString).deviceConfigurations
     }
diff --git a/app/whatsnew-de.md b/app/whatsnew-de.md
@@ -1 +1 @@
-TODO
+* Repariere Applikations-Absturz
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
`@@ -69,6 +69,6 @@ class DeviceConfigurationTask extends DefaultTask {`
`69`	`69`
`70`	`70`	`task buildDeviceConfigurationJson(type: DeviceConfigurationTask) {`
`71`	`71`	`inputDir = file('src/main/resources/deviceConfiguration')`
`72`		`- outputFile = file('src/gen/resources/li/klass/fhem/update/backend/device/configuration/deviceConfiguration.json')`
	`72`	`+ outputFile = file('src/gen/resources/deviceConfiguration.json')`
`73`	`73`	`}`
`74`	`74`	`tasks["preBuild"].dependsOn('buildDeviceConfigurationJson')`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class DeviceConfigurationProvider @Inject`
`38`	`38`	`constructor() {`
`39`	`39`	`private val configurations: Map<String, DeviceConfiguration> by lazy {`
`40`	`40`	`val jsonAsString = Resources.toString(Resources.getResource(`
`41`		`- DeviceConfigurationProvider::class.java, "deviceConfiguration.json"), Charsets.UTF_8)`
	`41`	`+ DeviceConfigurationProvider::class.java, "/deviceConfiguration.json"), Charsets.UTF_8)`
`42`	`42`
`43`	`43`	`JSON.parse(DevicesConfiguration.serializer(), jsonAsString).deviceConfigurations`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-TODO`
	`1`	`+* Repariere Applikations-Absturz`