diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 Binary files /dev/null and b/.DS_Store differ diff --git a/README.rst b/README.rst index 6a509d494fb8da7734b65f22fef0e9a7d1424cf4..4568fffa460d915d39778548d819517a5b0ec03c 100644 --- a/README.rst +++ b/README.rst @@ -36,7 +36,7 @@ To build the javascript bindings, install emscripten from http://kripken.github. To build the android project for Android bindings, run: .. code:: bash - cd java/android/OlmLibSdk + cd android ./gradlew clean assembleRelease Release process diff --git a/android/.DS_Store b/android/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 Binary files /dev/null and b/android/.DS_Store differ diff --git a/java/android/OlmLibSdk/README.rst b/android/README.rst similarity index 89% rename from java/android/OlmLibSdk/README.rst rename to android/README.rst index 6a9eae8003e707302d553d35426419c8d4c82298..46beaab66b4a421e4a16101721bf69c580e2f709 100644 --- a/java/android/OlmLibSdk/README.rst +++ b/android/README.rst @@ -22,7 +22,7 @@ Add in the dependencies category:: Development ----------- -import the project from the ``/java/android/OlmLibSdk`` path. +import the project from the ``android/`` path. The project contains some JNI files and some Java wraper files. diff --git a/java/android/OlmLibSdk/build.gradle b/android/build.gradle similarity index 100% rename from java/android/OlmLibSdk/build.gradle rename to android/build.gradle diff --git a/java/android/OlmLibSdk/gradle.properties b/android/gradle.properties similarity index 100% rename from java/android/OlmLibSdk/gradle.properties rename to android/gradle.properties diff --git a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.jar rename to android/gradle/wrapper/gradle-wrapper.jar diff --git a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.properties rename to android/gradle/wrapper/gradle-wrapper.properties diff --git a/java/android/OlmLibSdk/gradlew b/android/gradlew similarity index 100% rename from java/android/OlmLibSdk/gradlew rename to android/gradlew diff --git a/java/android/OlmLibSdk/gradlew.bat b/android/gradlew.bat similarity index 100% rename from java/android/OlmLibSdk/gradlew.bat rename to android/gradlew.bat diff --git a/java/android/OlmLibSdk/olm-sdk/build.gradle b/android/olm-sdk/build.gradle similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/build.gradle rename to android/olm-sdk/build.gradle diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java rename to android/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml b/android/olm-sdk/src/main/AndroidManifest.xml similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml rename to android/olm-sdk/src/main/AndroidManifest.xml diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java b/android/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java rename to android/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmException.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmException.java rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java rename to android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk b/android/olm-sdk/src/main/jni/Android.mk similarity index 97% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk rename to android/olm-sdk/src/main/jni/Android.mk index ffe1f6799dec753c607a3ef11215d7186e0f714a..97d747c1f3d261b90d1024c5e2093022a360a6c0 100644 --- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk +++ b/android/olm-sdk/src/main/jni/Android.mk @@ -6,7 +6,7 @@ MAJOR := 2 MINOR := 0 PATCH := 0 OLM_VERSION := $(MAJOR).$(MINOR).$(PATCH) -SRC_ROOT_DIR := ../../../../../../.. +SRC_ROOT_DIR := ../../../../.. $(info LOCAL_PATH=$(LOCAL_PATH)) $(info SRC_ROOT_DIR=$(SRC_ROOT_DIR)) diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk b/android/olm-sdk/src/main/jni/Application.mk similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk rename to android/olm-sdk/src/main/jni/Application.mk diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp b/android/olm-sdk/src/main/jni/olm_account.cpp similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp rename to android/olm-sdk/src/main/jni/olm_account.cpp diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h b/android/olm-sdk/src/main/jni/olm_account.h similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h rename to android/olm-sdk/src/main/jni/olm_account.h diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp b/android/olm-sdk/src/main/jni/olm_inbound_group_session.cpp similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp rename to android/olm-sdk/src/main/jni/olm_inbound_group_session.cpp diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h b/android/olm-sdk/src/main/jni/olm_inbound_group_session.h similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h rename to android/olm-sdk/src/main/jni/olm_inbound_group_session.h diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h b/android/olm-sdk/src/main/jni/olm_jni.h similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h rename to android/olm-sdk/src/main/jni/olm_jni.h diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp b/android/olm-sdk/src/main/jni/olm_jni_helper.cpp similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp rename to android/olm-sdk/src/main/jni/olm_jni_helper.cpp diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.h b/android/olm-sdk/src/main/jni/olm_jni_helper.h similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.h rename to android/olm-sdk/src/main/jni/olm_jni_helper.h diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp b/android/olm-sdk/src/main/jni/olm_manager.cpp similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp rename to android/olm-sdk/src/main/jni/olm_manager.cpp diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.h b/android/olm-sdk/src/main/jni/olm_manager.h similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.h rename to android/olm-sdk/src/main/jni/olm_manager.h diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp b/android/olm-sdk/src/main/jni/olm_outbound_group_session.cpp similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp rename to android/olm-sdk/src/main/jni/olm_outbound_group_session.cpp diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.h b/android/olm-sdk/src/main/jni/olm_outbound_group_session.h similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.h rename to android/olm-sdk/src/main/jni/olm_outbound_group_session.h diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp b/android/olm-sdk/src/main/jni/olm_session.cpp similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp rename to android/olm-sdk/src/main/jni/olm_session.cpp diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h b/android/olm-sdk/src/main/jni/olm_session.h similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h rename to android/olm-sdk/src/main/jni/olm_session.h diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp b/android/olm-sdk/src/main/jni/olm_utility.cpp similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp rename to android/olm-sdk/src/main/jni/olm_utility.cpp diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h b/android/olm-sdk/src/main/jni/olm_utility.h similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h rename to android/olm-sdk/src/main/jni/olm_utility.h diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/res/values/strings.xml b/android/olm-sdk/src/main/res/values/strings.xml similarity index 100% rename from java/android/OlmLibSdk/olm-sdk/src/main/res/values/strings.xml rename to android/olm-sdk/src/main/res/values/strings.xml diff --git a/java/android/OlmLibSdk/settings.gradle b/android/settings.gradle similarity index 100% rename from java/android/OlmLibSdk/settings.gradle rename to android/settings.gradle