Skip to content

Commit dd47d57

Browse files
tgalaltgalal
committed
Merge branch 'eldereng-master'
2 parents 4930acf + fa41bd4 commit dd47d57

File tree

14 files changed

+1311
-571
lines changed

14 files changed

+1311
-571
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
44
and this project (kinda) adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6+
## [3.3.0] 2021-12-14
7+
8+
### Changed
9+
10+
- Updated to whatsapp protocol 4.0
11+
- Updated consonance to 0.1.5
12+
- Fixed registration error due to obsolete keys in returned data
13+
- Updated android env app version to 2.21.21.18
14+
615
## [3.2.3] 2019-05-07
716

817
### Changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ The project started as the protocol engine behind [Wazapp for Meego](https://wik
1212
library it can be used to power any custom WhatsApp client.
1313

1414
```
15-
updated: 2019-05-07
16-
yowsup version: 3.2.3
17-
yowsup-cli version: 3.2.0
15+
updated: 2021-12-14
16+
yowsup version: 3.3.0
17+
yowsup-cli version: 3.2.1
1818
requires:
1919
- python>=2.7,<=3.7
20-
- consonance==0.1.3-1
20+
- consonance==0.1.5
2121
- python-axolotl==0.2.2
2222
- protobuf>=3.6.0
2323
- six==1.10

‎requirements.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
appdirs==1.4.4
2+
cffi==1.15.0
3+
consonance==0.1.5
4+
cryptography==36.0.0
5+
dissononce==0.34.3
6+
protobuf==4.0.0rc2
7+
pycparser==2.21
8+
python-axolotl==0.2.2
9+
python-axolotl-curve25519==0.4.1.post2
10+
six==1.10.0
11+
transitions==0.8.10

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import platform
66
import sys
77

8-
deps = ['consonance==0.1.3-1', 'argparse', 'python-axolotl==0.2.2', 'six==1.10', 'appdirs', 'protobuf>=3.6.0']
8+
deps = ['consonance==0.1.5', 'argparse', 'python-axolotl==0.2.2', 'six==1.10', 'appdirs', 'protobuf>=3.6.0']
99

1010
if sys.version_info < (2, 7):
1111
deps.append('importlib')

‎tox.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ deps =
1616
appdirs
1717
python-axolotl==0.2.2
1818
protobuf>=3.6.0
19-
consonance==0.1.3-1
19+
consonance==0.1.5

‎yowsup-cli‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
__version__ = "3.2.0"
2+
__version__ = "3.2.1"
33
__author__ = "Tarek Galal"
44

55
from yowsup.env import YowsupEnv
@@ -402,9 +402,9 @@ class RegistrationArgParser(YowArgParser):
402402
if result["status"] in ("sent", "ok"):
403403
if "login" in result:
404404
config.login = result["login"]
405-
if "edge_routing_info" in result:
405+
if "edge_routing_info" in result and result["edge_routing_info"]:
406406
config.edge_routing_info = base64.b64decode(result["edge_routing_info"])
407-
if "chat_dns_domain" in result:
407+
if "chat_dns_domain" in result and result["chat_dns_domain"]:
408408
config.chat_dns_domain = result["chat_dns_domain"]
409409
self._profile.write_config(config)
410410
print(self.resultToString(result))
@@ -422,9 +422,9 @@ class RegistrationArgParser(YowArgParser):
422422
if not self._preview:
423423
if result["status"] == "ok":
424424
config.login = result["login"]
425-
if "edge_routing_info" in result:
425+
if "edge_routing_info" in result and result["edge_routing_info"]:
426426
config.edge_routing_info = base64.b64decode(result["edge_routing_info"])
427-
if "chat_dns_domain" in result:
427+
if "chat_dns_domain" in result and result["chat_dns_domain"]:
428428
config.chat_dns_domain = result["chat_dns_domain"]
429429
self._profile.write_config(self._profile.config)
430430

‎yowsup/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import logging
22

3-
__version__ = "3.2.3"
3+
__version__ = "3.3.0"
44
__author__ = "Tarek Galal"
55

66
logger = logging.getLogger(__name__)

‎yowsup/env/env_android.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ class AndroidYowsupEnv(YowsupEnv):
1717
"YHNtYoIvt5R3X6YZylbPftF/8ayWTALBgcqhkjOOAQDBQADLwAwLAIUAKYCp0d6z4QQdyN74JDfQ2WCyi8CFDUM4CaNB+ceVXd" \
1818
"KtOrNTQcc0e+t"
1919

20-
_MD5_CLASSES = "/QhoCBMppKpKQumhTC8kcQ=="
20+
_MD5_CLASSES = "WuFH18yXKRVezywQm+S24A=="
2121
_KEY = "eQV5aq/Cg63Gsq1sshN9T3gh+UUp0wIw0xgHYT1bnCjEqOJQKCRrWxdAe2yvsDeCJL+Y4G3PRD2HUF7oUgiGo8vGlNJOaux26k+A2F3hj8A="
2222

23-
_VERSION = "2.19.244"
23+
_VERSION = "2.21.21.18" # 2.20.206.24
2424
_OS_NAME = "Android"
2525
_OS_VERSION = "8.0.0"
2626
_DEVICE_NAME = "star2lte"

‎yowsup/layers/coder/test_decoder.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ def setUp(self):
88
self.decoder.streamStarted = True
99

1010
def test_decode(self):
11-
data = bytearray([0, 248, 6, 95, 179, 252, 3, 120, 121, 122, 252, 4, 102, 111, 114, 109, 252, 3, 97, 98, 99, 248, 1, 248, 4, 93,
12-
236, 104, 255, 130, 18, 63, 252, 6, 49, 50, 51, 52, 53, 54])
11+
data = bytearray([0, 248, 6, 9, 11, 252, 3, 120, 121, 122, 5, 252, 3, 97, 98, 99, 248, 1, 248, 4, 50, 238, 86, 255, 130, 18, 63,
12+
252, 6, 49, 50, 51, 52, 53, 54])
1313
node = self.decoder.getProtocolTreeNode(data)
14-
targetNode = ProtocolTreeNode("message", {"form": "abc", "to":"xyz"}, [ProtocolTreeNode("media", {"width" : "123"}, data=b"123456")])
14+
targetNode = ProtocolTreeNode("message", {"from": "abc", "to":"xyz"}, [ProtocolTreeNode("media", {"width" : "123"}, data=b"123456")])
1515
self.assertEqual(node, targetNode)

‎yowsup/layers/coder/test_encoder.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ def setUp(self):
99
self.encoder = WriteEncoder(TokenDictionary())
1010

1111
def test_encode(self):
12-
node = ProtocolTreeNode("message", {"form": "abc", "to":"xyz"}, [ProtocolTreeNode("media", {"width" : "123"}, data=b"123456")])
12+
node = ProtocolTreeNode("message", {"from": "abc", "to":"xyz"}, [ProtocolTreeNode("media", {"width" : "123"}, data=b"123456")])
1313
result = self.encoder.protocolTreeNodeToBytes(node)
1414

1515
self.assertTrue(result in (
16-
[0, 248, 6, 95, 179, 252, 3, 120, 121, 122, 252, 4, 102, 111, 114, 109, 252, 3, 97, 98, 99, 248, 1, 248, 4, 93,
17-
236, 104, 255, 130, 18, 63, 252, 6, 49, 50, 51, 52, 53, 54],
18-
[0, 248, 6, 95, 252, 4, 102, 111, 114, 109, 252, 3, 97, 98, 99, 179, 252, 3, 120, 121, 122, 248, 1, 248, 4, 93,
19-
236, 104, 255, 130, 18, 63, 252, 6, 49, 50, 51, 52, 53, 54]
16+
[0, 248, 6, 9, 11, 252, 3, 120, 121, 122, 5, 252, 3, 97, 98, 99, 248, 1, 248, 4, 50, 238, 86, 255, 130, 18, 63,
17+
252, 6, 49, 50, 51, 52, 53, 54],
18+
[0, 248, 6, 9, 5, 252, 3, 97, 98, 99, 11, 252, 3, 120, 121, 122, 248, 1, 248, 4, 50, 238, 86, 255, 130, 18, 63,
19+
252, 6, 49, 50, 51, 52, 53, 54]
2020
)
2121
)
2222

0 commit comments

Comments
 (0)