Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
724d9ea2
Commit
724d9ea2
authored
Oct 27, 2016
by
pedroGitt
Browse files
Add new API to provide the SDK version
parent
1f1cbf2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
View file @
724d9ea2
...
...
@@ -62,9 +62,11 @@ public class OlmAccountTest {
// load native lib
mOlmManager
=
new
OlmManager
();
String
version
=
mOlmManager
.
getOlmLibVersion
();
assertNotNull
(
version
);
Log
.
d
(
LOG_TAG
,
"## setUpClass(): lib version="
+
version
);
String
olmLibVersion
=
mOlmManager
.
getOlmLibVersion
();
assertNotNull
(
olmLibVersion
);
String
olmSdkVersion
=
mOlmManager
.
getSdkOlmVersion
();
assertNotNull
(
olmLibVersion
);
Log
.
d
(
LOG_TAG
,
"## setUpClass(): Versions - Android Olm SDK = "
+
olmSdkVersion
+
" Olm lib ="
+
olmLibVersion
);
}
@AfterClass
...
...
java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
View file @
724d9ea2
...
...
@@ -24,6 +24,7 @@ import android.util.Log;
*/
public
class
OlmManager
{
private
static
final
String
LOG_TAG
=
"OlmManager"
;
private
static
final
String
SDK_OLM_VERSION
=
"V0.1.0_1"
;
static
{
try
{
...
...
@@ -33,6 +34,12 @@ public class OlmManager {
}
}
public
String
getSdkOlmVersion
()
{
//Date currentDate = Calendar.getInstance().getTime();
//String retVal = new SimpleDateFormat("yyyyMMdd_HH:mm:ss").format(currentDate);
return
SDK_OLM_VERSION
;
}
/**
* Get the OLM lib version.
* @return the lib version as a string
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment