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

Fixed a minor issue

parent eecd2d51
No related branches found
No related tags found
No related merge requests found
......@@ -53,6 +53,15 @@ if (project.hasProperty("storeFile")) {
}
}
def getGitHash = { ->
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-parse', '--short', 'HEAD'
standardOutput = stdout
}
return stdout.toString().trim()
}
def versionPropsFile = file('version.properties')
def versionBuild = 0
if (versionPropsFile.exists() && versionPropsFile.canRead()) {
......@@ -85,6 +94,7 @@ android {
targetSdkVersion 24
versionCode versionBuild
versionName rawVersionName + " Build #" + versionBuild
buildConfigField "String", "GitHash", "\"${getGitHash()}\""
}
dataBinding {
enabled = true
......
......@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Observable;
import de.kuschku.libquassel.objects.types.NetworkServer;
import de.kuschku.util.backports.Objects;
public class NetworkInfo extends Observable {
private int networkId;
......@@ -308,16 +309,16 @@ public class NetworkInfo extends Observable {
autoReconnectRetries == that.autoReconnectRetries &&
unlimitedReconnectRetries == that.unlimitedReconnectRetries &&
rejoinChannels == that.rejoinChannels &&
(networkName != null ? networkName.equals(that.networkName) : that.networkName == null) &&
(codecForServer != null ? codecForServer.equals(that.codecForServer) : that.codecForServer == null) &&
(codecForEncoding != null ? codecForEncoding.equals(that.codecForEncoding) : that.codecForEncoding == null) &&
(codecForDecoding != null ? codecForDecoding.equals(that.codecForDecoding) : that.codecForDecoding == null) &&
(serverList != null ? serverList.equals(that.serverList) : that.serverList == null) &&
(perform != null ? perform.equals(that.perform) : that.perform == null) &&
(autoIdentifyService != null ? autoIdentifyService.equals(that.autoIdentifyService) : that.autoIdentifyService == null) &&
(autoIdentifyPassword != null ? autoIdentifyPassword.equals(that.autoIdentifyPassword) : that.autoIdentifyPassword == null) &&
(saslAccount != null ? saslAccount.equals(that.saslAccount) : that.saslAccount == null) &&
(saslPassword != null ? saslPassword.equals(that.saslPassword) : that.saslPassword == null)
Objects.equals(networkName, that.networkName) &&
Objects.equals(codecForServer, that.codecForServer) &&
Objects.equals(codecForEncoding, that.codecForEncoding) &&
Objects.equals(codecForDecoding, that.codecForDecoding) &&
Objects.equals(serverList, that.serverList) &&
Objects.equals(perform, that.perform) &&
Objects.equals(autoIdentifyService, that.autoIdentifyService) &&
Objects.equals(autoIdentifyPassword, that.autoIdentifyPassword) &&
Objects.equals(saslAccount, that.saslAccount) &&
Objects.equals(saslPassword, that.saslPassword)
);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment