Fix android sample build

.gitignore

@@ -1,2 +1,15 @@
 Gemfile.lock
 *.gemspec
+/android/WebsocketExampleClientProject/.idea/vcs.xml
+/android/WebsocketExampleClientProject/.idea/scopes/scope_settings.xml
+/android/WebsocketExampleClientProject/.idea/runConfigurations.xml
+/android/WebsocketExampleClientProject/.idea/modules.xml
+/android/WebsocketExampleClientProject/.idea/misc.xml
+/android/WebsocketExampleClientProject/.idea/gradle.xml
+/android/WebsocketExampleClientProject/.idea/encodings.xml
+/android/WebsocketExampleClientProject/.idea/copyright/profiles_settings.xml
+/android/WebsocketExampleClientProject/.idea/compiler.xml
+/android/WebsocketExampleClientProject/.idea/caches
+.idea
+/.DS_Store
+*.iml

android/WebsocketExampleClientProject/WebsocketExampleClient/build.gradle

@@ -1,20 +1,23 @@
 buildscript {
     repositories {
+        google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+
     }
 }
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 
 repositories {
+    google()
     mavenCentral()
 }
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 16
@@ -23,6 +26,6 @@ android {
 }
 
 dependencies {
-    compile "org.java-websocket:Java-WebSocket:1.3.0"
-    compile(name: 'themis-0.9.4', ext: 'aar')
+    implementation "org.java-websocket:Java-WebSocket:1.3.0"
+    implementation (name: 'themis-0.9.4', ext: 'aar')
 }

android/WebsocketExampleClientProject/WebsocketExampleClient/src/main/java/se/elabs/websocketexampleclient/MainActivity.java

@@ -257,10 +257,11 @@ public void onError(Exception e) {
     }
 
     public void sendMessage(View view) {
-        EditText editText = (EditText)findViewById(R.id.message);
+        EditText editText = findViewById(R.id.message);
 
         try {
-            byte[] wrapped = secureSession.wrap(editText.getText().toString().getBytes("UTF-8"));
+            byte[] message = editText.getText().toString().getBytes("UTF-8");
+            byte[] wrapped = secureSession.wrap(message);
             mWebSocketClient.send(Base64.encodeToString(wrapped, Base64.DEFAULT));
         } catch (SecureSessionException e) {
             e.printStackTrace();

android/WebsocketExampleClientProject/WebsocketExampleClientProject.iml

@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

android/WebsocketExampleClientProject/build.gradle

@@ -2,6 +2,7 @@
 
 allprojects {
     repositories {
+        google()
         jcenter()
         flatDir {
             dirs 'libs'

android/WebsocketExampleClientProject/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip