From 61fbdde4d14b3bb9fe96da8b516f29c4e4fae93f Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 3 Sep 2016 20:26:57 +0200
Subject: [PATCH] Fixed a minor bug
---
app/build.gradle | 2 +-
.../java/de/kuschku/libquassel/client/NetworkManager.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 93ff59a8d..6db8021a5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,7 +61,7 @@ if (versionPropsFile.exists() && versionPropsFile.canRead()) {
versionProps.load(new FileInputStream(versionPropsFile))
def runTasks = gradle.startParameter.taskNames
versionBuild = Integer.valueOf(versionProps['VERSION_BUILD'].toString())
- if (!runTasks.intersect([':app:assembleBeta', 'assembleBeta', ':app:assembleRelease', 'assembleRelease']).empty) {
+ if (!(runTasks.intersect([':app:assembleBeta', 'assembleBeta', ':app:assembleRelease', 'assembleRelease']).empty)) {
println "Increasing version number"
versionBuild = versionBuild + 1
}
diff --git a/app/src/main/java/de/kuschku/libquassel/client/NetworkManager.java b/app/src/main/java/de/kuschku/libquassel/client/NetworkManager.java
index 5a44a499e..2d4b90f4b 100644
--- a/app/src/main/java/de/kuschku/libquassel/client/NetworkManager.java
+++ b/app/src/main/java/de/kuschku/libquassel/client/NetworkManager.java
@@ -43,7 +43,7 @@ public class NetworkManager extends Observable {
private final ObservableSortedList<QNetwork> list = new ObservableSortedList<>(QNetwork.class, new ObservableSortedList.ItemComparator<QNetwork>() {
@Override
public int compare(QNetwork o1, QNetwork o2) {
- return o1.networkName().compareTo(o2.networkName());
+ return o1 == null && o2 == null ? 0 : o1 == null ? 1 : o2 == null ? -1 : o1.networkName().compareTo(o2.networkName());
}
@Override
@@ -68,7 +68,9 @@ public class NetworkManager extends Observable {
}
public void createNetwork(@NonNull QNetwork network) {
- list.remove(networks.get(network.networkId()));
+ QNetwork qNetwork = networks.get(network.networkId());
+ if (list.contains(qNetwork))
+ list.remove(qNetwork);
networks.put(network.networkId(), network);
list.add(network);
}
--
GitLab