From 97749cd8f7ad59ad8ce48073c2d8f1b3695d5986 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 12 Feb 2016 19:27:51 +0100
Subject: Fixed runtime errors with axolotl libraries. Now the libraries from
 maven are added.

---
 build.gradle                                       |   1 +
 libs/3rdParty/jcenter/axolotl-android-1.3.4.aar    | Bin 2368 -> 0 bytes
 libs/3rdParty/jcenter/axolotl-java-1.3.4.jar       | Bin 334671 -> 0 bytes
 libs/3rdParty/jcenter/curve25519-android-0.2.4.aar | Bin 371365 -> 0 bytes
 libs/3rdParty/jcenter/curve25519-java-0.2.4.jar    | Bin 123600 -> 0 bytes
 libs/3rdParty/maven/axolotl-android-1.3.4.aar      | Bin 0 -> 2368 bytes
 libs/3rdParty/maven/axolotl-java-1.3.4.jar         | Bin 0 -> 334671 bytes
 libs/3rdParty/maven/curve25519-android-0.2.4.aar   | Bin 0 -> 371365 bytes
 libs/3rdParty/maven/curve25519-java-0.2.4.jar      | Bin 0 -> 123600 bytes
 libs/3rdParty/maven/protobuf-java-2.5.0.jar        | Bin 0 -> 533455 bytes
 10 files changed, 1 insertion(+)
 delete mode 100644 libs/3rdParty/jcenter/axolotl-android-1.3.4.aar
 delete mode 100644 libs/3rdParty/jcenter/axolotl-java-1.3.4.jar
 delete mode 100644 libs/3rdParty/jcenter/curve25519-android-0.2.4.aar
 delete mode 100644 libs/3rdParty/jcenter/curve25519-java-0.2.4.jar
 create mode 100644 libs/3rdParty/maven/axolotl-android-1.3.4.aar
 create mode 100644 libs/3rdParty/maven/axolotl-java-1.3.4.jar
 create mode 100644 libs/3rdParty/maven/curve25519-android-0.2.4.aar
 create mode 100644 libs/3rdParty/maven/curve25519-java-0.2.4.jar
 create mode 100644 libs/3rdParty/maven/protobuf-java-2.5.0.jar

diff --git a/build.gradle b/build.gradle
index 9df3c583..a45cccda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     compile name: 'axolotl-java-1.3.4'
     compile name: 'curve25519-android-0.2.4', ext: 'aar' // axolotl, loaded from jcenter
     compile name: 'curve25519-java-0.2.4' // axolotl, loaded from jcenter
+	compile name: 'protobuf-java-2.5.0' // axolotl, loaded from maven
     compile name: 'android-crop-1.0.1', ext: 'aar'
     compile name: 'roundedimageview-2.2.0', ext: 'aar'
     compile name: 'switchbutton-1.2.8', ext: 'aar' // loaded from jcenter
diff --git a/libs/3rdParty/jcenter/axolotl-android-1.3.4.aar b/libs/3rdParty/jcenter/axolotl-android-1.3.4.aar
deleted file mode 100644
index f1ee4f0e..00000000
Binary files a/libs/3rdParty/jcenter/axolotl-android-1.3.4.aar and /dev/null differ
diff --git a/libs/3rdParty/jcenter/axolotl-java-1.3.4.jar b/libs/3rdParty/jcenter/axolotl-java-1.3.4.jar
deleted file mode 100644
index d8402ad6..00000000
Binary files a/libs/3rdParty/jcenter/axolotl-java-1.3.4.jar and /dev/null differ
diff --git a/libs/3rdParty/jcenter/curve25519-android-0.2.4.aar b/libs/3rdParty/jcenter/curve25519-android-0.2.4.aar
deleted file mode 100644
index 98c34058..00000000
Binary files a/libs/3rdParty/jcenter/curve25519-android-0.2.4.aar and /dev/null differ
diff --git a/libs/3rdParty/jcenter/curve25519-java-0.2.4.jar b/libs/3rdParty/jcenter/curve25519-java-0.2.4.jar
deleted file mode 100644
index f4c55678..00000000
Binary files a/libs/3rdParty/jcenter/curve25519-java-0.2.4.jar and /dev/null differ
diff --git a/libs/3rdParty/maven/axolotl-android-1.3.4.aar b/libs/3rdParty/maven/axolotl-android-1.3.4.aar
new file mode 100644
index 00000000..f1ee4f0e
Binary files /dev/null and b/libs/3rdParty/maven/axolotl-android-1.3.4.aar differ
diff --git a/libs/3rdParty/maven/axolotl-java-1.3.4.jar b/libs/3rdParty/maven/axolotl-java-1.3.4.jar
new file mode 100644
index 00000000..d8402ad6
Binary files /dev/null and b/libs/3rdParty/maven/axolotl-java-1.3.4.jar differ
diff --git a/libs/3rdParty/maven/curve25519-android-0.2.4.aar b/libs/3rdParty/maven/curve25519-android-0.2.4.aar
new file mode 100644
index 00000000..98c34058
Binary files /dev/null and b/libs/3rdParty/maven/curve25519-android-0.2.4.aar differ
diff --git a/libs/3rdParty/maven/curve25519-java-0.2.4.jar b/libs/3rdParty/maven/curve25519-java-0.2.4.jar
new file mode 100644
index 00000000..f4c55678
Binary files /dev/null and b/libs/3rdParty/maven/curve25519-java-0.2.4.jar differ
diff --git a/libs/3rdParty/maven/protobuf-java-2.5.0.jar b/libs/3rdParty/maven/protobuf-java-2.5.0.jar
new file mode 100644
index 00000000..4c4e686a
Binary files /dev/null and b/libs/3rdParty/maven/protobuf-java-2.5.0.jar differ
-- 
cgit v1.2.3