From 304c705a5e3b4ac653d9ccebb71dc9e09046c754 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 9 Feb 2018 18:56:40 +0100
Subject: [PATCH] fix typo

---
 .../data/implementation/InventoryRepositoryImpl.kt        | 8 ++++----
 .../habitica/data/local/InventoryLocalRepository.kt       | 2 +-
 .../implementation/RealmInventoryLocalRepository.java     | 6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
index 8cb9f8856..71ec0a5b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
@@ -85,7 +85,7 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
         return localRepository.getOwnedEquipment()
     }
 
-    override fun getOwnedItems(itemClass: Class<out Item>, user: User): Observable<out RealmResults<out Item>> {
+    override fun getOwnedItems(itemClass: Class<out Item>, user: User?): Observable<out RealmResults<out Item>> {
         return localRepository.getOwnedItems(itemClass, user)
     }
 
@@ -214,13 +214,13 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
                 .doOnNext {
                     localRepository.changeOwnedCount(egg, -1)
                     localRepository.changeOwnedCount(hatchingPotion, -1)
-                    localRepository.changePetFeedStatus(egg.key+hatchingPotion.key, 5)
+                    localRepository.changePetFeedStatus(egg.key+"-"+hatchingPotion.key, 5)
                 }
     }
 
     override fun inviteToQuest(quest: QuestContent): Observable<Quest> {
         return apiClient.inviteToQuest("party", quest.key)
-                .doOnNext { quest1 -> localRepository.changeOwnedCount(quest, -1) }
+                .doOnNext { localRepository.changeOwnedCount(quest, -1) }
     }
 
     override fun buyItem(user: User, key: String, value: Double): Observable<BuyResponse> {
@@ -280,6 +280,6 @@ class InventoryRepositoryImpl(localRepository: InventoryLocalRepository, apiClie
         return if (!item.isValid) {
             Observable.just(null)
         } else apiClient.togglePinnedItem(item.pinType, item.path)
-                .flatMap { aVoid -> retrieveInAppRewards() }
+                .flatMap { retrieveInAppRewards() }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
index 6fa21e0c8..277724fec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.kt
@@ -31,7 +31,7 @@ interface InventoryLocalRepository : ContentLocalRepository {
 
     fun getOwnedEquipment(type: String): Observable<RealmResults<Equipment>>
 
-    fun getOwnedItems(itemClass: Class<out Item>, user: User): Observable<out RealmResults<out Item>>
+    fun getOwnedItems(itemClass: Class<out Item>, user: User?): Observable<out RealmResults<out Item>>
     fun getOwnedItems(user: User): Observable<out Map<String, Item>>
 
     fun getEquipment(key: String): Observable<Equipment>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
index 4b4aa823c..ceb888ef5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.data.local.implementation;
 
 import android.content.Context;
+import android.support.annotation.NonNull;
 
 import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
 import com.habitrpg.android.habitica.helpers.RxErrorHandler;
@@ -72,6 +73,7 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
                 .count();
     }
 
+    @NonNull
     @Override
     public Observable<RealmResults<Equipment>> getOwnedEquipment(String type) {
         return getRealm().where(Equipment.class)
@@ -82,6 +84,7 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
                 .filter(RealmResults::isLoaded);
     }
 
+    @NonNull
     @Override
     public Observable<RealmResults<Equipment>> getOwnedEquipment() {
         return getRealm().where(Equipment.class)
@@ -91,8 +94,9 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
                 .filter(RealmResults::isLoaded);
     }
 
+    @NotNull
     @Override
-    public Observable<? extends RealmResults<? extends Item>> getOwnedItems(Class<? extends Item> itemClass, User user) {
+    public Observable<? extends RealmResults<? extends Item>> getOwnedItems(@NotNull Class<? extends Item> itemClass, @Nullable User user) {
         if (itemClass == null) {
             return Observable.empty();
         }