Skip to content

Commit

Permalink
Fixed commit d422074 re-formatting issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Domenico Iezzi committed Dec 9, 2017
1 parent b99ceb8 commit 2f24058
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ __pycache__/
build/
dist/
*.egg-info/
.idea/
41 changes: 28 additions & 13 deletions gpapi/googleplay.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,12 @@ class GooglePlayAPI(object):
CHECKINURL = BASE + "checkin"
AUTHURL = BASE + "auth"

proxies_config = None

def __init__(self, debug=False, device_codename='bacon',
locale=None, timezone=None,
sim_operator=None, cell_operator=None):
sim_operator=None, cell_operator=None,
proxies_config=proxies_config):
self.authSubToken = None
self.gsfId = None
self.debug = debug
Expand Down Expand Up @@ -110,7 +113,8 @@ def checkin(self, email, ac2dmToken):

stringRequest = request.SerializeToString()
res = requests.post(self.CHECKINURL, data=stringRequest,
headers=headers, verify=ssl_verify)
headers=headers, verify=ssl_verify,
proxies=self.proxies_config)
response = googleplay_pb2.AndroidCheckinResponse()
response.ParseFromString(res.content)

Expand All @@ -123,7 +127,8 @@ def checkin(self, email, ac2dmToken):
request2.accountCookie.append(ac2dmToken)
stringRequest = request2.SerializeToString()
requests.post(self.CHECKINURL, data=stringRequest,
headers=headers, verify=ssl_verify)
headers=headers, verify=ssl_verify,
proxies=self.proxies_config)

return response.androidId

Expand All @@ -141,7 +146,8 @@ def uploadDeviceConfig(self):
headers["X-DFE-Filter-Level"] = "3"
stringRequest = upload.SerializeToString()
res = requests.post(self.UPLOADURL, data=stringRequest,
headers=headers, verify=ssl_verify)
headers=headers, verify=ssl_verify,
proxies=self.proxies_config)
googleplay_pb2.ResponseWrapper.FromString(res.content)

def login(self, email=None, password=None, gsfId=None, authSubToken=None):
Expand All @@ -159,7 +165,8 @@ def login(self, email=None, password=None, gsfId=None, authSubToken=None):
encryptedPass = self.encrypt_password(email, password).decode('utf-8')
# AC2DM token
params = self.deviceBuilder.getLoginParams(email, encryptedPass)
response = requests.post(self.AUTHURL, data=params, verify=ssl_verify)
response = requests.post(self.AUTHURL, data=params, verify=ssl_verify,
proxies=self.proxies_config)
data = response.text.split()
params = {}
for d in data:
Expand Down Expand Up @@ -196,7 +203,8 @@ def login(self, email=None, password=None, gsfId=None, authSubToken=None):

def getAuthSubToken(self, email, passwd):
requestParams = self.deviceBuilder.getAuthParams(email, passwd)
response = requests.post(self.AUTHURL, data=requestParams, verify=ssl_verify)
response = requests.post(self.AUTHURL, data=requestParams, verify=ssl_verify,
proxies=self.proxies_config)
data = response.text.split()
params = {}
for d in data:
Expand Down Expand Up @@ -227,7 +235,8 @@ def getSecondRoundToken(self, previousParams, firstToken):
previousParams.pop('EncryptedPasswd')
response = requests.post(self.AUTHURL,
data=previousParams,
verify=ssl_verify)
verify=ssl_verify,
proxies=self.proxies_config)
data = response.text.split()
params = {}
for d in data:
Expand Down Expand Up @@ -255,11 +264,13 @@ def executeRequestApi2(self, path, datapost=None,
if datapost is not None:
response = requests.post(url, data=str(datapost),
headers=headers, verify=ssl_verify,
timeout=60)
timeout=60,
proxies=self.proxies_config)
else:
response = requests.get(url, headers=headers,
verify=ssl_verify,
timeout=60)
timeout=60,
proxies=self.proxies_config)

message = googleplay_pb2.ResponseWrapper.FromString(response.content)
if message.commands.displayErrorMessage != "":
Expand Down Expand Up @@ -457,11 +468,13 @@ def _deliver_data(self, url, cookies, progress_bar):
if not progress_bar:
return requests.get(url, headers=headers,
cookies=cookies, verify=ssl_verify,
timeout=60).content
timeout=60,
proxies=self.proxies_config).content
response_content = bytes()
response = requests.get(url, headers=headers,
cookies=cookies, verify=ssl_verify,
stream=True, timeout=60)
stream=True, timeout=60,
proxies=self.proxies_config)
total_length = int(response.headers.get('content-length'))
chunk_size = 32 * (1 << 10) # 32 KB
bar = progress.Bar(expected_size=(total_length >> 10))
Expand Down Expand Up @@ -508,7 +521,8 @@ def delivery(self, packageName, versionCode=None, offerType=1,
url = "https://android.clients.google.com/fdfe/%s" % path
response = requests.get(url, headers=headers,
params=params, verify=ssl_verify,
timeout=60)
timeout=60,
proxies=self.proxies_config)
resObj = googleplay_pb2.ResponseWrapper.FromString(response.content)
if resObj.commands.displayErrorMessage != "":
raise RequestError(resObj.commands.displayErrorMessage)
Expand Down Expand Up @@ -573,7 +587,8 @@ def download(self, packageName, versionCode=None, offerType=1,
url = self.FDFE + path
response = requests.post(url, headers=headers,
params=params, verify=ssl_verify,
timeout=60)
timeout=60,
proxies=self.proxies_config)

resObj = googleplay_pb2.ResponseWrapper.FromString(response.content)
if resObj.commands.displayErrorMessage != "":
Expand Down

0 comments on commit 2f24058

Please sign in to comment.