Merge branch 'master' into release

.gitignore

@@ -5,6 +5,8 @@
 /kontalk.db
 /kontalk.properties
 *.pgp
+*.asc
+*.crt
 /win_installer/*.exe
 
 # Gradle
@@ -14,12 +16,8 @@
 /.nb-gradle/
 
 # IntelliJ Idea
-/.idea/workspace.xml
-/.idea/tasks.xml
-/.idea/gradle.xml
-/.idea/libraries/
-/.idea/inspectionProfiles/
-/*.iml
+.idea/
+*.iml
 
 # Package Files #
 #*.jar

.travis.yml

@@ -0,0 +1,8 @@
+language: java
+
+jdk:
+  - oraclejdk8
+
+before_install:
+  - git submodule update --init
+

README.md

@@ -1,6 +1,8 @@
 kontalk-java-client
 ===================
 
+[![Build Status](https://travis-ci.org/kontalk/desktopclient-java.svg?branch=master)](https://travis-ci.org/kontalk/desktopclient-java)
+
 A platform independent Java client for Kontalk (http://www.kontalk.org). Includes connectivity to the Jabber network!
 
 The desktop client uses your existing Kontalk account from the [Android client](https://github.com/kontalk/androidclient/blob/master/README.md#kontalk-official-android-client). Instructions for exporting the key [here](https://github.com/kontalk/androidclient/wiki/Export-personal-key-to-another-device).
@@ -19,19 +21,28 @@ The desktop client uses your existing Kontalk account from the [Android client](
 
 ## Key Features
 
-- connecting to Kontalk server with an already existing Kontalk account
-- automatically adding XMPP roster entries from server
-- manually adding arbitrary Kontalk or Jabber user
-- automatically requesting/adding public keys for other Kontalk user
-- sending/receiving (encrypted) text messages from/to Kontalk user
-- sending/receiving (plain) text messages from/to arbitrary Jabber/XMPP user (clients like [Pidgin](https://pidgin.im/) or [Conversations](https://github.com/siacs/Conversations))
-- sending/requesting server receipts according to XMPP extension
-- ability to block all messages for specific user
-- receiving files send from the Android client
+Connect with Kontalk...
+- Use the existing Kontalk account from your phone.
+- Synchronized contact list (=XMPP roster).
+- Add new Kontalk users by phone number.
+- The client automatically requests public keys for safe communication.
+- Your communication with Kontalk users is encrypted by default.
+
+... and beyond:
+- Exchange text messages with any Jabber/XMPP users!
+- Add new Jabber contacts by JID.
+- Tested with clients like [Pidgin](https://pidgin.im/) or [Conversations](https://github.com/siacs/Conversations).
 
 **Note: private key and messages are saved unencrypted and can be read by other
 applications on your computer!**
 
+## Implemented XEP features:
+- XEP-0184: Message receipts
+- XEP-0085: Chat state notifications
+- XEP-0191: User blocking
+- XEP-0066: File transfer over server
+- XEP-0084: Avatar images
+
 ## Support us
 
 * If you are missing a feature or found a bug [report it!](https://github.com/kontalk/desktopclient-java/issues)

build.gradle

@@ -2,8 +2,8 @@
 apply plugin: 'application'
 apply plugin: 'java'
 
-sourceCompatibility = '1.7'
-targetCompatibility = '1.7'
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
 
 mainClassName = 'org.kontalk.Kontalk'
 ext.clientCommonDir = 'client-common-java'
@@ -33,6 +33,7 @@ dependencies {
     compile group: 'org.bouncycastle', name: 'bcpg-jdk15on', version: "$bcVersion"
     compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "$bcVersion"
     compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "$bcVersion"
+    compile group: 'commons-cli', name: 'commons-cli', version: "1.3.1"
     compile group: 'commons-codec', name: 'commons-codec', version: "1.10"
     compile group: 'commons-configuration', name: 'commons-configuration', version: "1.10"
     compile group: 'commons-io', name: 'commons-io', version: "2.4"

nbproject/licenseheader.txt

@@ -2,7 +2,7 @@
 ${licenseFirst}
 </#if>
 ${licensePrefix} Kontalk Java client
-${licensePrefix} Copyright (C) 2014 Kontalk Devteam <devteam@kontalk.org>
+${licensePrefix} Copyright (C) 2016 Kontalk Devteam <devteam@kontalk.org>
 ${licensePrefix}
 ${licensePrefix} This program is free software: you can redistribute it and/or modify
 ${licensePrefix} it under the terms of the GNU General Public License as published by