master
quadrismegistus 4 years ago
parent dbd67746f7
commit 40a3d7f5a6

@ -179,6 +179,7 @@ class MessagePopupCard(MDDialog2):
def on_touch_down(self,touch):
self.ok_to_continue=True
logger.info('oof!')
self.dismiss()
# if hasattr(self,'msg_dialog'):
# logger.info(str(self.msg_dialog))
@ -797,7 +798,9 @@ class MainApp(MDApp, Logger):
async def get_input(self,msg,comrad_name='Telephone',get_pass=False,yesno=False,**y):
from comrad.app.screens.feed.feed import PostCardInputPopup
# if hasattr(self,'msg_dialog') and self.msg_dialog:# and hasattr(self.msg_dialog,'card') and self.msg_dialog.card:
if hasattr(self,'msg_dialog') and self.msg_dialog: self.msg_dialog.dismiss()
# and hasattr(self.msg_dialog,'card') and self.msg_dialog.card:
# self.msg_dialog0=self.msg_dialog
# self.msg_dialog0.dismiss()
# self.msg_dialog0=None
@ -812,6 +815,7 @@ class MainApp(MDApp, Logger):
logger.info(f'get_input got user response {response}')
if self.msg_dialog:
self.msg_dialog.dismiss()
self.root.remove_widget(self.msg_dialog)
self.msg_dialog=None
# async def task():
# await asyncio.sleep(1)

@ -10,7 +10,7 @@ from flask_classful import FlaskView
OP_PASS = None
class TheSwitchboard(FlaskView, Logger):
default_methods = ['GET']
default_methods = ['POST']
excluded_methods = ['phone','op','send','printt','log','status']
@property

@ -104,7 +104,7 @@ class TheTelephone(Operator):
# self.log('resp_msg_b:',resp_msg_b)
resp_msg_b = phonecall.data
resp_msg_b = phonecall.raw
self.log(f'{self}: Received response from Operator!')# We got back:\n\n',resp_msg_b)
resp_msg_d = pickle.loads(resp_msg_b)
@ -177,7 +177,7 @@ class TheTelephone(Operator):
def comrad_request_post(self,url,data='',allow_clearnet = ALLOW_CLEARNET):
if '.onion' in url or not allow_clearnet:
return self.tor_request_post(url)
return self.tor_request_post(url,data=data)
return requests.post(url,data=data,timeout=60)
@ -202,7 +202,7 @@ class TheTelephone(Operator):
s.headers.update({'User-Agent': 'Mozilla/5.0'})
s.mount('http://', adapter)
s.mount('https://', adapter)
r = s.post(url, data=data, timeout=600)
r = s.post(url, data=data, timeout=600, stream=True)
return r
def get_tor_proxy_session(self):

Loading…
Cancel
Save