Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
QuasselDroid-ng
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
QuasselDroid-ng
Commits
74d46d71
Commit
74d46d71
authored
8 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
Fixed a minor issue
parent
eecd2d51
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/build.gradle
+10
-0
10 additions, 0 deletions
app/build.gradle
app/src/main/java/de/kuschku/libquassel/syncables/types/impl/NetworkInfo.java
+11
-10
11 additions, 10 deletions
.../kuschku/libquassel/syncables/types/impl/NetworkInfo.java
with
21 additions
and
10 deletions
app/build.gradle
+
10
−
0
View file @
74d46d71
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/de/kuschku/libquassel/syncables/types/impl/NetworkInfo.java
+
11
−
10
View file @
74d46d71
...
...
@@ -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
)
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment