fixed protectedscreen

komrade/app/main.py

@@ -470,6 +470,9 @@ class MainApp(MDApp, Logger):
     
     async def callback_on_hop(self,rtr):
         if not hasattr(self,'hops'): self.hops=[]
+        if not hasattr(self,'map') or not self.map:
+            from komrade.app.screens.map import MapWidget
+            self.map=MapWidget()
         if not self.map.opened:
             self.map.open()
             # self.map.draw()

komrade/app/root.kv

@@ -235,7 +235,8 @@ MyLayout:
         background_palette: 'Red'
         theme_text_color:'Custom'
         background_hue: '500'
-        right_action_items: [['account-circle-outline', partial(root.change_screen, 'profile')],['card-text', partial(root.change_screen, 'feed')],['message-outline', partial(root.change_screen, 'messages')],['pencil-plus-outline', partial(root.change_screen, 'post')],['exit-run', partial(root.change_screen, 'login')]]
+        # right_action_items: [['account-circle-outline', partial(root.change_screen, 'profile')],['card-text', partial(root.change_screen, 'feed')],['message-outline', partial(root.change_screen, 'messages')],['pencil-plus-outline', partial(root.change_screen, 'post')],['exit-run', partial(root.change_screen, 'login')]]
+        right_action_items: [['home', partial(root.change_screen, 'feed')],['message', partial(root.change_screen, 'messages')],['pencil-plus', partial(root.change_screen, 'post')],['account-circle', partial(root.change_screen, 'profile')],['exit-run', partial(root.change_screen, 'login')]]
         #left_action_items: [[f"assets/fist2.png", partial(root.change_screen, 'feed')]]
         
         # ['bell-outline', partial(root.change_screen, 'login')]

komrade/app/screens/base.py

@@ -62,9 +62,10 @@ class BaseScreen(MDScreen):
 
 
 
-class ProtectedScreen(BaseScreen): pass
-    # def on_pre_enter(self):
-    #     if not self.channel in self.app.api.keys:
-    #         self.root.change_screen('login')
-    #         return
-        
+class ProtectedScreen(BaseScreen):
+    def on_pre_enter(self):
+        if not hasattr(self.app,'is_logged_in') or not self.app.is_logged_in or not hasattr(self.app,'komrade') or not self.app.komrade:
+            self.root.change_screen('login')
+            self.log('changing screen???')
+            return None
+        return True

komrade/app/screens/feed/feed.py

@@ -275,12 +275,12 @@ class PostCardInputPopup(PostCardPopup):
 
 
 
-class FeedScreen(BaseScreen):
+class FeedScreen(ProtectedScreen):
     posts = ListProperty()
 
     def on_pre_enter(self):
+        if not super().on_pre_enter(): return
         if not hasattr(self,'get_posts'): self.get_posts=self.app.komrade.posts
-        super().on_pre_enter()
         for post in self.posts:
             self.ids.post_carousel.remove_widget(post)
         
@@ -302,6 +302,7 @@ class FeedScreen(BaseScreen):
                 self.ids.post_carousel.add_widget(post_obj)
 
         asyncio.create_task(go())
+        return True
     # def on_pre_enter(self):
     #     self.clear_deck()
     #     # for i,x 

komrade/app/screens/messages/messages.py

@@ -4,8 +4,7 @@ from screens.post.post import *
 
 class MessagesScreen(FeedScreen): 
     def on_pre_enter(self):
-        if not self.app.komrade: return
+        if not super().on_pre_enter(): return
 
         self.get_posts = self.app.komrade.messages
-        super().on_pre_enter()
 

komrade/app/screens/post/post.py

@@ -104,7 +104,7 @@ class PostScreen(ProtectedScreen):
 
 
     def on_pre_enter(self):
-        super().on_pre_enter()
+        if not super().on_pre_enter(): return
         self.to_channels = {}
         
         # clear
@@ -323,10 +323,16 @@ class PostScreen(ProtectedScreen):
         async def do_post():
             file_id = self.img_id if hasattr(self,'img_id') else None
             file_ext = self.img_ext if hasattr(self,'img_ext') else None
-            await self.app.post(content=content, channel = channel, file_id=file_id, file_ext=file_ext)
+            #await self.app.post(content=content, channel = channel, file_id=file_id, file_ext=file_ext)
+            # post?
+            await self.app.komrade.post(content)
             import time
             self.close_dialog()
-            self.app.change_screen_from_uri('/inbox/'+channel)
+            if hasattr(self.app,'map') and self.app.map:
+                self.app.map.dismiss()
+                self.app.map=None
+
+            self.app.change_screen('feed')
         
         # self.open_dialog('')
         #Thread(target=do_post).start()

komrade/app/screens/profile/profile.py

@@ -189,15 +189,12 @@ def update_screen_on_carousel_move(self,dt,width=75):
 
 
 
-
-class ProfileScreen(BaseScreen): 
-    #def on_pre_enter(self):
-    #    global app
-    #    if app.is_logged_in():
-    #        app.root.change_screen('feed')
+from screens.base import ProtectedScreen
+class ProfileScreen(ProtectedScreen): 
     username = None
     clock_scheduled=None
 
+   
     def make_profile_img(self,width,do_crop=True,circ_img=None,bw=False,circularize=True):
         img_src = os.path.join(PATH_GUI_ASSETS, 'avatars', f'{self.app.username}.png')
         if not os.path.exists(img_src): 
@@ -217,10 +214,7 @@ class ProfileScreen(BaseScreen):
         return (circ_img,byte,avatar,avatar_layout) 
 
     def on_pre_enter(self, width=300):
-
-        # query author info
-        #if not self.username: self.username=self.app.username
-        # @TODO
+        if not super().on_pre_enter(): return
 
         if not self.clock_scheduled:
             Clock.schedule_interval(partial(update_screen_on_carousel_move, self), 0.1)

komrade/backend/komrades.py

@@ -498,7 +498,7 @@ class KomradeX(Caller):
     #def post(self,something):
     #    return self.msg(WORLD_NAME,something)
     
-    def post(self,something):
+    async def post(self,something):
         # sign it!
         self.log('something =',something)
 
@@ -541,7 +541,7 @@ class KomradeX(Caller):
         # ).wrap(post_pkg_b)
         # self.log(post_pkg_b_encr4world)
 
-        res_op = self.ring_ring(
+        res_op = await self.ring_ring(
             {
                 'data':post_pkg_b
             },