Merge branch 'release/2.5.2'

Author: tgalal

MANIFEST.in

@@ -0,0 +1 @@
+include yowsup/common/mime.types

README.md

@@ -2,8 +2,8 @@
 
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=Z9KKEUVYEY6BN" target="_blank"><img src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" /></a>
 
-## Updates (April 1, 2016)
-Yowsup v2.4.102 is out, See [release notes](https://github.com/tgalal/yowsup/releases/tag/v2.4.102)
+## Updates (March 23, 2017)
+Yowsup v2.5.2 is out, See [release notes](https://github.com/tgalal/yowsup/releases/tag/v2.5.2)
 
 ==========================================================
 

setup.py

@@ -5,7 +5,7 @@
 import platform
 import sys
 
-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.7']
+deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.35', 'six']
 
 if sys.version_info < (2,7):
     deps += ['importlib']
@@ -33,6 +33,7 @@
     #long_description=long_description,
     packages= find_packages(),
     include_package_data=True,
+    data_files = [('yowsup/common', ['yowsup/common/mime.types'])],
     platforms='any',
     #test_suite='',
     classifiers = [

tox.ini

@@ -5,7 +5,7 @@
 
 [tox]
 skip_missing_interpreters = true
-envlist = py26, py27, py32, py33, py34, py35
+envlist = py26, py27, py32, py33, py34, py35, py36
 
 [testenv]
 commands = nosetests yowsup

yowsup/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "2.4.103"
+__version__ = "2.5.2"
 __author__ = "Tarek Galal"

yowsup/common/optionalmodules.py

@@ -40,7 +40,7 @@ def __init__(self, failMessage = None, require = False):
 class AxolotlOptionalModule(OptionalModule):
     def __init__(self, failMessage = None, require = False):
         super(AxolotlOptionalModule, self).__init__("axolotl",
-                failmessage=failMessage,
+                failMessage=failMessage,
                 require=require)
 
 if __name__ == "__main__":

yowsup/common/tools.py

@@ -1,4 +1,5 @@
 import time,datetime,re, hashlib
+import calendar
 from dateutil import tz
 import os
 from .constants import YowConstants
@@ -107,9 +108,8 @@ def utcToLocal(dt):
 
     @staticmethod
     def utcTimestamp():
-        #utc = tz.gettz('UTC')
         utcNow = datetime.datetime.utcnow()
-        return TimeTools.datetimeToTimestamp(utcNow)
+        return calendar.timegm(utcNow.timetuple())
 
     @staticmethod
     def datetimeToTimestamp(dt):
@@ -152,8 +152,10 @@ def generatePreviewFromImage(image):
 class MimeTools:
     MIME_FILE = os.path.join(os.path.dirname(__file__), 'mime.types')
     mimetypes.init() # Load default mime.types
-    mimetypes.init([MIME_FILE]) # Append whatsapp mime.types
-    decode_hex = codecs.getdecoder("hex_codec")
+    try:
+        mimetypes.init([MIME_FILE]) # Append whatsapp mime.types
+    except exception as e:
+        logger.warning("Mime types supported can't be read. System mimes will be used. Cause: " + e.message)
 
     @staticmethod
     def getMIME(filepath):

yowsup/demos/cli/layer.py

@@ -8,11 +8,9 @@
 import datetime
 import os
 import logging
-from yowsup.layers.protocol_receipts.protocolentities    import *
 from yowsup.layers.protocol_groups.protocolentities      import *
 from yowsup.layers.protocol_presence.protocolentities    import *
 from yowsup.layers.protocol_messages.protocolentities    import *
-from yowsup.layers.protocol_acks.protocolentities        import *
 from yowsup.layers.protocol_ib.protocolentities          import *
 from yowsup.layers.protocol_iq.protocolentities          import *
 from yowsup.layers.protocol_contacts.protocolentities    import *
@@ -25,7 +23,6 @@
 from yowsup.common.optionalmodules import PILOptionalModule, AxolotlOptionalModule
 
 logger = logging.getLogger(__name__)
-
 class YowsupCliLayer(Cli, YowInterfaceLayer):
     PROP_RECEIPT_AUTO       = "org.openwhatsapp.yowsup.prop.cli.autoreceipt"
     PROP_RECEIPT_KEEPALIVE  = "org.openwhatsapp.yowsup.prop.cli.keepalive"
@@ -78,6 +75,7 @@ def jidToAlias(self, jid):
     def setCredentials(self, username, password):
         self.getLayerInterface(YowAuthenticationProtocolLayer).setCredentials(username, password)
 
+        return "%s@s.whatsapp.net" % username
 
     @EventCallback(EVENT_START)
     def onStart(self, layerEvent):
@@ -343,13 +341,6 @@ def keys_get(self, jids):
                 entity = GetKeysIqProtocolEntity(jids)
                 self.toLower(entity)
 
-    @clicmd("Send prekeys")
-    def keys_set(self):
-        with AxolotlOptionalModule(failMessage = self.__class__.FAIL_OPT_AXOLOTL) as axoOptMod:
-            from yowsup.layers.axolotl import YowAxolotlLayer
-            if self.assertConnected():
-                self.broadcastEvent(YowLayerEvent(YowAxolotlLayer.EVENT_PREKEYS_SET))
-
     @clicmd("Send init seq")
     def seq(self):
         priv = PrivacyListIqProtocolEntity()

yowsup/demos/cli/stack.py

@@ -2,7 +2,7 @@
 from .layer import YowsupCliLayer
 from yowsup.layers.auth import AuthError
 from yowsup.layers import YowLayerEvent
-from yowsup.layers.auth import YowAuthenticationProtocolLayer
+from yowsup.layers.axolotl.props import PROP_IDENTITY_AUTOTRUST
 import sys
 
 class YowsupCliStack(object):
@@ -16,6 +16,7 @@ def __init__(self, credentials, encryptionEnabled = True):
 
         # self.stack.setCredentials(credentials)
         self.stack.setCredentials(credentials)
+        self.stack.setProp(PROP_IDENTITY_AUTOTRUST, True)
 
     def start(self):
         print("Yowsup Cli client\n==================\nType /help for available commands\n")

yowsup/demos/contacts/stack.py

@@ -1,15 +1,10 @@
-from yowsup.stacks import YowStack
 from .layer import SyncLayer
+
+from yowsup.stacks import  YowStackBuilder
+from yowsup.layers.auth import AuthError
 from yowsup.layers import YowLayerEvent
-from yowsup.layers.auth                        import YowCryptLayer, YowAuthenticationProtocolLayer, AuthError
-from yowsup.layers.coder                       import YowCoderLayer
-from yowsup.layers.network                     import YowNetworkLayer
-from yowsup.layers.stanzaregulator             import YowStanzaRegulator
-from yowsup.layers.protocol_receipts           import YowReceiptProtocolLayer
-from yowsup.layers.protocol_acks               import YowAckProtocolLayer
-from yowsup.layers.logger                      import YowLoggerLayer
-from yowsup.layers.protocol_contacts           import YowContactsIqProtocolLayer
-from yowsup.layers                             import YowParallelLayer
+from yowsup.layers.auth import YowAuthenticationProtocolLayer
+from yowsup.layers.network import YowNetworkLayer
 
 class YowsupSyncStack(object):
     def __init__(self, credentials, contacts, encryptionEnabled = False):
@@ -19,30 +14,13 @@ def __init__(self, credentials, contacts, encryptionEnabled = False):
         :param encryptionEnabled:
         :return:
         """
-        if encryptionEnabled:
-            from yowsup.layers.axolotl                     import YowAxolotlLayer
-            layers = (
-                SyncLayer,
-                YowParallelLayer([YowAuthenticationProtocolLayer, YowContactsIqProtocolLayer, YowReceiptProtocolLayer, YowAckProtocolLayer]),
-                YowAxolotlLayer,
-                YowLoggerLayer,
-                YowCoderLayer,
-                YowCryptLayer,
-                YowStanzaRegulator,
-                YowNetworkLayer
-            )
-        else:
-            layers = (
-                SyncLayer,
-                YowParallelLayer([YowAuthenticationProtocolLayer, YowContactsIqProtocolLayer, YowReceiptProtocolLayer, YowAckProtocolLayer]),
-                YowLoggerLayer,
-                YowCoderLayer,
-                YowCryptLayer,
-                YowStanzaRegulator,
-                YowNetworkLayer
-            )
+        stackBuilder = YowStackBuilder()
+
+        self.stack = stackBuilder \
+            .pushDefaultLayers(encryptionEnabled) \
+            .push(SyncLayer) \
+            .build()
 
-        self.stack = YowStack(layers)
         self.stack.setProp(SyncLayer.PROP_CONTACTS, contacts)
         self.stack.setProp(YowAuthenticationProtocolLayer.PROP_PASSIVE, True)
         self.stack.setCredentials(credentials)