Skip to content
Snippets Groups Projects
Commit 61fbdde4 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed a minor bug

parent 91eee7b2
No related branches found
No related tags found
No related merge requests found
......@@ -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
}
......
......@@ -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);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment