Merge pull request #868 from divadsn/weather-bugfix

Fix crash on wrong or non-existent weather icon
LawnchairLauncher · Oct 22, 2017 · 7eba2c5 · 7eba2c5
2 parents ad02133 + 073ff85
commit 7eba2c5
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/app/src/main/java/ch/deletescape/lawnchair/weather/WeatherIconProvider.kt b/app/src/main/java/ch/deletescape/lawnchair/weather/WeatherIconProvider.kt
@@ -4,14 +4,21 @@ import android.content.Context
 import android.graphics.BitmapFactory
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.util.Log
 import ch.deletescape.lawnchair.R
 import ch.deletescape.lawnchair.Utilities
 import java.util.*
 
 class WeatherIconProvider(private val context: Context) {
 
  fun getIcon(iconID: String): Drawable {
- val bitmap = BitmapFactory.decodeResource(context.resources, ID_MAP[iconID]!!)
+ var resID = iconID
+ if (!ID_MAP.containsKey(resID)) {
+ Log.e("WeatherIconProvider", "No weather icon exists for condition: " + resID)
+ resID = CONDITION_UNKNOWN
+ }
+
+ val bitmap = BitmapFactory.decodeResource(context.resources, ID_MAP[resID]!!)
  return BitmapDrawable(context.resources,
  Utilities.addShadowToIcon(bitmap, bitmap.width))
  }