Skip to content

Commit

Permalink
APP-1231 fix
Browse files Browse the repository at this point in the history
  • Loading branch information
maxml committed Jul 11, 2016
1 parent 136e775 commit 4374f87
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 7 deletions.
Expand Up @@ -45,6 +45,15 @@ public static KaaClient newClient(KaaClientPlatformContext context, KaaClientSta
return newClient(context, listener, false);
}

/**
* Creating new Kaa client
*
* @param context - Kaa platform specific context for client init
* @param listener - notifier for changing client state
* @param isUserKeyStrategy - user strategy about creating public/private keys. In default case use previously created
* @return new Kaa client
* @throws KaaRuntimeException - if there are now key pair
*/
public static KaaClient newClient(KaaClientPlatformContext context, KaaClientStateListener listener, boolean isUserKeyStrategy)
throws KaaRuntimeException {
try {
Expand Down
Expand Up @@ -106,6 +106,8 @@ public interface KaaChannelManager {

/**
* Updates the manager by adding the channel.
*
* @param channel sending/receiving data for endpoint server
*/
void addChannel(KaaDataChannel channel);

Expand Down
Expand Up @@ -109,6 +109,15 @@ public KaaClientPropertiesState(PersistentStorage storage, Base64 base64, KaaCli
this(storage, base64, properties, false);
}

/**
* All needed properties for creating Kaa client
*
* @param storage - in what storage platform will work
* @param base64 - interface for Base64 type
* @param properties - saved properties for client
* @param isUserKeyStrategy - if not key pair keyPair and true, then create keys. In default it false and used
* already created keys.
*/
public KaaClientPropertiesState(PersistentStorage storage, Base64 base64, KaaClientProperties properties,
boolean isUserKeyStrategy) {

Expand Down
Expand Up @@ -32,11 +32,6 @@ public interface KaaClientState {
boolean isRegistered();
void setRegistered(boolean registered);

/**
* User can choose to create key pair or not. In default case there is no key generation
*
* @return keys
*/
PrivateKey getPrivateKey();
PublicKey getPublicKey();

Expand Down
6 changes: 4 additions & 2 deletions pom.xml
Expand Up @@ -30,7 +30,9 @@ Copyright 2014-2016 CyberVision, Inc.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<main.dir>${basedir}</main.dir>
<akka.version>2.4.1</akka.version>
<avro-ui.version>0.3.0-SNAPSHOT</avro-ui.version>

<akka.version>2.4.1</akka.version>
<spring.version>4.2.5.RELEASE</spring.version>
<spring.security.version>3.2.9.RELEASE</spring.security.version>
<spring.data.version>Fowler-RELEASE</spring.data.version>
Expand Down Expand Up @@ -82,7 +84,7 @@ Copyright 2014-2016 CyberVision, Inc.
<jackson-mapper-asl.version>1.9.12</jackson-mapper-asl.version>
<jackson-core-asl.version>1.9.13</jackson-core-asl.version>
<jline.version>2.11</jline.version>
<avro-ui.version>0.2.1</avro-ui.version>


<slf4j.version>1.7.7</slf4j.version>
<slf4j-android.version>1.7.7</slf4j-android.version>
Expand Down

0 comments on commit 4374f87

Please sign in to comment.