Merge pull request #1566 from goffi-contrib/omemo_recipe_update

[OMEMO] updated omemo recipe

Author: AndreMiras

pythonforandroid/recipes/omemo-backend-signal/__init__.py

@@ -0,0 +1,23 @@
+from pythonforandroid.recipe import PythonRecipe
+
+
+class OmemoBackendSignalRecipe(PythonRecipe):
+    name = 'omemo-backend-signal'
+    version = '0.2.2'
+    url = 'https://pypi.python.org/packages/source/o/omemo-backend-signal/omemo-backend-signal-{version}.tar.gz'
+    site_packages_name = 'omemo-backend-signal'
+    depends = [
+        ('python2', 'python3crystax'),
+        'setuptools',
+        'protobuf_cpp',
+        'x3dh',
+        'DoubleRatchet',
+        'hkdf==0.0.3',
+        'cryptography',
+        'omemo',
+    ]
+    patches = ['wireformat.patch']
+    call_hostpython_via_targetpython = False
+
+
+recipe = OmemoBackendSignalRecipe()

pythonforandroid/recipes/omemo/wireformat.patch renamed to pythonforandroid/recipes/omemo-backend-signal/wireformat.patch

@@ -1,6 +1,6 @@
-diff -urN OMEMO-0.7.1.ori/omemo/signal/wireformat/whispertextprotocol_pb2.py OMEMO-0.7.1/omemo/signal/wireformat/whispertextprotocol_pb2.py
---- OMEMO-0.7.1.ori/omemo/signal/wireformat/whispertextprotocol_pb2.py	2018-09-02 21:04:26.000000000 +0200
-+++ OMEMO-0.7.1/omemo/signal/wireformat/whispertextprotocol_pb2.py	2018-11-02 10:39:15.196715321 +0100
+diff -urN omemo-backend-signal-0.2.2.ori/omemo_backend_signal/whispertextprotocol_pb2.py omemo-backend-signal-0.2.2/omemo_backend_signal/whispertextprotocol_pb2.py
+--- omemo-backend-signal-0.2.2.ori/omemo_backend_signal/whispertextprotocol_pb2.py	2018-09-02 21:04:26.000000000 +0200
++++ omemo-backend-signal-0.2.2/omemo_backend_signal/whispertextprotocol_pb2.py	2018-11-02 10:39:15.196715321 +0100
 @@ -21,7 +21,6 @@
    syntax='proto2',
    serialized_pb=_b('\n\x19WhisperTextProtocol.proto\"R\n\rSignalMessage\x12\x16\n\x0e\x64h_ratchet_key\x18\x01 \x01(\x0c\x12\t\n\x01n\x18\x02 \x01(\r\x12\n\n\x02pn\x18\x03 \x01(\r\x12\x12\n\nciphertext\x18\x04 \x01(\x0c\"\x7f\n\x13PreKeySignalMessage\x12\x17\n\x0fregistration_id\x18\x05 \x01(\r\x12\x0f\n\x07otpk_id\x18\x01 \x01(\r\x12\x0e\n\x06spk_id\x18\x06 \x01(\r\x12\n\n\x02\x65k\x18\x02 \x01(\x0c\x12\n\n\x02ik\x18\x03 \x01(\x0c\x12\x16\n\x0esignal_message\x18\x04 \x01(\x0c')

pythonforandroid/recipes/omemo/__init__.py

@@ -3,18 +3,15 @@
 
 class OmemoRecipe(PythonRecipe):
     name = 'omemo'
-    version = '0.7.1'
+    version = '0.10.3'
     url = 'https://pypi.python.org/packages/source/O/OMEMO/OMEMO-{version}.tar.gz'
     site_packages_name = 'omemo'
     depends = [
         ('python2', 'python3crystax'),
         'setuptools',
-        'protobuf_cpp',
         'x3dh',
-        'DoubleRatchet',
-        'hkdf==0.0.3',
+        'cryptography',
     ]
-    patches = ['remove_dependencies.patch', 'wireformat.patch']
     call_hostpython_via_targetpython = False