...
 
Commits (3)
Changes in `3.1.2 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.2>`_
=========================================================================
This release updates the Android bindings to use a newer Android SDK version.
Changes in `3.1.1 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.1>`_
=========================================================================
......
cmake_minimum_required(VERSION 3.4)
project(olm VERSION 3.1.1 LANGUAGES CXX C)
project(olm VERSION 3.1.2 LANGUAGES CXX C)
option(OLM_TESTS "Build tests" ON)
option(BUILD_SHARED_LIBS "Build as a shared library" ON)
......
......@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# The libolm version
MAJOR = 3
MINOR = 1
PATCH = 1
PATCH = 2
s.name = "OLMKit"
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
......
......@@ -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 311
versionName "3.1.1"
version "3.1.1"
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'
}
......@@ -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()) {
......
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
MAJOR := 3
MINOR := 1
PATCH := 1
PATCH := 2
{
"name": "olm",
"version": "3.1.1",
"version": "3.1.2",
"description": "An implementation of the Double Ratchet cryptographic ratchet",
"main": "olm.js",
"files": [
......
......@@ -2,7 +2,7 @@ __title__ = "python-olm"
__description__ = ("python CFFI bindings for the olm "
"cryptographic ratchet library")
__url__ = "https://github.com/poljar/python-olm"
__version__ = "3.1.1"
__version__ = "3.1.2"
__author__ = "Damir Jelić"
__author_email__ = "[email protected]"
__license__ = "Apache 2.0"
......