From 749758ea0b02693cd73438d60d988dd8e97ebdaf Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 23 Apr 2019 09:24:42 +0200
Subject: [PATCH] fix minor crashes

---
 Habitica/build.gradle                                |  2 +-
 .../social/PublicGuildsRecyclerViewAdapter.kt        |  2 +-
 .../ui/fragments/social/GroupInformationFragment.kt  | 12 +++++++-----
 .../ui/views/tasks/form/TaskSchedulingControls.kt    |  7 ++++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index cc563279a..7616d7765 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -152,7 +152,7 @@ android {
         buildConfigField "String", "STORE", "\"google\""
         multiDexEnabled true
 
-        versionCode 2096
+        versionCode 2097
         versionName "1.9"
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
index d1b78f01d..9015a7120 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
@@ -38,7 +38,7 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
         val guildViewHolder = GuildViewHolder(parent.inflate(R.layout.item_public_guild))
         guildViewHolder.itemView.setOnClickListener { v ->
             val guild = v.tag as? Group ?: return@setOnClickListener
-            val directions =PublicGuildsFragmentDirections.openGuildDetail(guild.id)
+            val directions = PublicGuildsFragmentDirections.openGuildDetail(guild.id)
             directions.isMember = isInGroup(guild)
             MainNavigationController.navigate(directions)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
index 51076be07..7e054489d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
@@ -125,11 +125,13 @@ class GroupInformationFragment : BaseFragment() {
                 val width = Math.round(height * aspectRatio)
                 val drawable = BitmapDrawable(context.resources, Bitmap.createScaledBitmap(bitmap, width, height, false))
                 drawable.tileModeX = Shader.TileMode.REPEAT
-                Observable.just(drawable)
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(Consumer {
-                            no_party_background.background = it
-                        }, RxErrorHandler.handleEmptyError())
+                if (drawable != null) {
+                    Observable.just(drawable)
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .subscribe(Consumer {
+                                no_party_background.background = it
+                            }, RxErrorHandler.handleEmptyError())
+                }
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
index 508d048c9..d9cdf7582 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
@@ -18,6 +18,7 @@ import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper
 import com.habitrpg.android.habitica.models.tasks.Days
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.bindView
+import java.lang.NumberFormatException
 import java.text.DateFormat
 import java.text.DateFormatSymbols
 import java.util.*
@@ -76,7 +77,11 @@ class TaskSchedulingControls @JvmOverloads constructor(
     var everyX
         get() = (repeatsEveryEdittext.text ?: "1").toString().toInt()
     set(value) {
-        repeatsEveryEdittext.setText(value.toString())
+        try {
+            repeatsEveryEdittext.setText(value.toString())
+        } catch (e: NumberFormatException) {
+            repeatsEveryEdittext.setText("1")
+        }
     }
     var weeklyRepeat: Days = Days()
     set(value) {