aboutsummaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rw-r--r--android/olm-sdk/build.gradle13
-rw-r--r--android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java6
-rw-r--r--android/olm-sdk/src/main/jni/Application.mk2
3 files changed, 11 insertions, 10 deletions
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 456880b..660ecbc 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -3,15 +3,14 @@ import org.apache.tools.ant.taskdefs.condition.Os
apply plugin: 'com.android.library'
android {
- compileSdkVersion 27
- buildToolsVersion '27.0.3'
+ compileSdkVersion 28
defaultConfig {
minSdkVersion 11
- targetSdkVersion 21
- versionCode 310
- versionName "3.1.0"
- version "3.1.0"
+ targetSdkVersion 28
+ versionCode 312
+ versionName "3.1.2"
+ version "3.1.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -120,7 +119,7 @@ def gitRevisionDate() {
dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support:support-annotations:27.1.1'
+ androidTestImplementation 'com.android.support:support-annotations:28.0.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
}
diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java
index 4bd1579..a0589e9 100644
--- a/android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmSAS.java
@@ -40,6 +40,8 @@ public class OlmSAS {
/**
* Gets the Public Key encoded in Base64 with no padding
+ * @return The public key
+ * @throws OlmException the failure reason
*/
public String getPublicKey() throws OlmException {
try {
@@ -60,7 +62,7 @@ public class OlmSAS {
* Sets the public key of other user.
*
* @param otherPkey other user public key (base64 encoded with no padding)
- * @throws OlmException
+ * @throws OlmException the failure reason
*/
public void setTheirPublicKey(String otherPkey) throws OlmException {
try {
@@ -79,7 +81,7 @@ public class OlmSAS {
* per the Matrix spec.
* @param byteNumber The size of the short code to generate
* @return The generated shortcode
- * @throws OlmException
+ * @throws OlmException the failure reason
*/
public byte[] generateShortCode(String info, int byteNumber) throws OlmException {
if (theirPublicKey == null || theirPublicKey.isEmpty()) {
diff --git a/android/olm-sdk/src/main/jni/Application.mk b/android/olm-sdk/src/main/jni/Application.mk
index e11f39a..e052911 100644
--- a/android/olm-sdk/src/main/jni/Application.mk
+++ b/android/olm-sdk/src/main/jni/Application.mk
@@ -1,3 +1,3 @@
APP_PLATFORM := android-16
APP_ABI := arm64-v8a armeabi-v7a x86_64 x86
-APP_STL := gnustl_static
+APP_STL := c++_static \ No newline at end of file