sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix minor issues

Browse source
This commit is contained in:
Phillip Thelen 2017-11-15 20:30:51 +01:00
parent 7ff1830310
commit 725081a587
6 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
View file

@ -69,6 +69,9 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
result.drop = res._tmp.drop result.drop = res._tmp.drop
} }
this.localRepository.executeTransaction { this.localRepository.executeTransaction {
if (!task.isValid) {
return@executeTransaction
}
if (task.type != "reward") { if (task.type != "reward") {
task.value = task.value + res.delta task.value = task.value + res.delta
if (Task.TYPE_DAILY == task.type || Task.TYPE_TODO == task.type) { if (Task.TYPE_DAILY == task.type || Task.TYPE_TODO == task.type) {

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.java
View file

@ -161,7 +161,7 @@ public class RealmSocialLocalRepository extends RealmBaseLocalRepository impleme
public void saveChatMessages(String groupId, List<ChatMessage> chatMessages) { public void saveChatMessages(String groupId, List<ChatMessage> chatMessages) {
realm.executeTransaction(realm1 -> realm.insertOrUpdate(chatMessages)); realm.executeTransaction(realm1 -> realm.insertOrUpdate(chatMessages));
if (groupId != null) { if (groupId != null) {
List<ChatMessage> existingMessages = realm.where(ChatMessage.class).equalTo("GroupId", groupId).findAll(); List<ChatMessage> existingMessages = realm.where(ChatMessage.class).equalTo("groupId", groupId).findAll();
List<ChatMessage> messagesToRemove = new ArrayList<>(); List<ChatMessage> messagesToRemove = new ArrayList<>();
for (ChatMessage existingMember : existingMessages) { for (ChatMessage existingMember : existingMessages) {
boolean isStillMember = false; boolean isStillMember = false;

13
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.kt
View file

@ -13,7 +13,18 @@ class RealmTutorialLocalRepository(realm: Realm) : RealmBaseLocalRepository(real
return realm.where(TutorialStep::class.java).equalTo("identifier", key) return realm.where(TutorialStep::class.java).equalTo("identifier", key)
.findAllAsync() .findAllAsync()
.asObservable() .asObservable()
.filter { realmObject -> realmObject.isLoaded && realmObject.isValid && !realmObject.isEmpty() } .filter { realmObject -> realmObject.isLoaded && realmObject.isValid }
.map { steps ->
return@map if (steps.isEmpty()) {
val step = TutorialStep()
step.identifier = key
val list = ArrayList<TutorialStep>()
list.add(step)
list
} else {
steps
}
}
.map { steps -> steps.first() } .map { steps -> steps.first() }
.cast(TutorialStep::class.java) .cast(TutorialStep::class.java)
} }

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
View file

@ -254,7 +254,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), View.OnClickListener, Swip
refreshLayout.isRefreshing = true refreshLayout.isRefreshing = true
userRepository.retrieveUser(true, true) userRepository.retrieveUser(true, true)
.doOnTerminate { .doOnTerminate {
refreshLayout.isRefreshing = false refreshLayout?.isRefreshing = false
}.subscribe(Action1 { }, RxErrorHandler.handleEmptyError()) }.subscribe(Action1 { }, RxErrorHandler.handleEmptyError())
} }

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
View file

@ -160,7 +160,9 @@ class TasksFragment : BaseMainFragment() {
if (activePos < viewPager?.adapter?.count ?: 0 - 1 && viewFragmentsDictionary?.get(activePos + 1) != null && viewFragmentsDictionary?.get(activePos + 1)?.recyclerAdapter != null) { if (activePos < viewPager?.adapter?.count ?: 0 - 1 && viewFragmentsDictionary?.get(activePos + 1) != null && viewFragmentsDictionary?.get(activePos + 1)?.recyclerAdapter != null) {
viewFragmentsDictionary?.get(activePos + 1)?.recyclerAdapter?.filter() viewFragmentsDictionary?.get(activePos + 1)?.recyclerAdapter?.filter()
} }
activeFragment?.setActiveFilter(activeTaskFilter) if (activeTaskFilter != null) {
activeFragment?.setActiveFilter(activeTaskFilter)
}
taskFilterHelper.tags = activeTags taskFilterHelper.tags = activeTags
updateFilterIcon() updateFilterIcon()

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
View file

@ -427,6 +427,6 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
public interface OnFilterCompletedListener { public interface OnFilterCompletedListener {
void onFilterCompleted(String activeTaskFilter, List<String> activeTags); void onFilterCompleted(@Nullable String activeTaskFilter, List<String> activeTags);
} }
} }