pip version 0.10.3.3. Bug fixes

MathNodes · Oct 20, 2022 · 50b7170 · 50b7170
1 parent 2fddbe3
commit 50b7170
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ CHANGELOG
 * FIX: Poor resize of screen with node cards. Resizes fast and clean
 * FIX: Offline node consumed/allocated data progress bar and status text
 * FIX: Divide by 0 bug and convert 0.00B to float
+* FIX: Switch set to off if user cancels connection
 
 
 # v0.10.2-pip (11/10/2022)

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 setup(
     name='meile-gui',
-    version='0.10.3.2',
+    version='0.10.3.3',
     description='Meile dVPN powered by the Sentinel Network',
     long_description=readme,
     long_description_content_type="text/markdown",

diff --git a/src/kv/meile.kv b/src/kv/meile.kv
@@ -125,9 +125,7 @@ WindowManager:
             NodeRV:
                 md_bg_color: get_color_from_hex("#0d021b")    
                 id: rv
-            #ContinentMap:
-            #    id: continent_map
-
+
         MDBottomNavigation:
             size_hint_y: .1
             panel_color: get_color_from_hex("#0d021b")
@@ -207,15 +205,17 @@ WindowManager:
                 normal_color: app.theme_cls.accent_color
 
         MDFloatLayout:
-            MDRaisedButton:
-                pos_hint: {'x' : .1 , 'top': .9 }
-                text: "REFRESH"
-                on_release: root.refresh_wallet()
+
             Image:
                 source: root.get_qr_code_address()
                 pos_hint: {'x': 0, 'top': 1}
                 size_hint_y: .5
 
+            MDRaisedButton:
+                pos_hint: {'x' : .1 , 'top': .9 }
+                text: "REFRESH"
+                on_release: root.refresh_wallet()
+
             MDRaisedButton:
                 pos_hint: {'x' : .8 , 'top': .9 }
                 text: "RE-FUEL"
@@ -799,11 +799,13 @@ WindowManager:
     wallet_password: ""
     wallet_name: ""
     padding: 0,10,0,10
+
     MDTextField:
         multiline: True
         hint_text: "Mnemonic Seed"
         text: root.seed_phrase
         readonly: True
+
     MDBoxLayout:
         id: seed_box
         orientation: "horizontal"
@@ -1092,7 +1094,6 @@ WindowManager:
             type: "top"
             padding: 0,20,0,0
 
-
             MDTextField:
                 hint_text: "Address"
                 mode: "fill"

diff --git a/src/meile_gui.egg-info/PKG-INFO b/src/meile_gui.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meile-gui
-Version: 0.10.3.2
+Version: 0.10.3.3
 Summary: Meile dVPN powered by the Sentinel Network
 Home-page: https://meile.app
 Author: MathNodes

diff --git a/src/ui/screens.py b/src/ui/screens.py
@@ -13,7 +13,6 @@
 from typedef.win import CoinsList
 from cli.warp import WarpHandler
 
-
 from kivy.uix.screenmanager import Screen, SlideTransition
 from kivymd.uix.button import MDFlatButton, MDRaisedButton,MDTextButton, MDFillRoundFlatButton
 from kivymd.uix.dialog import MDDialog
@@ -28,11 +27,8 @@
 from kivymd.theming import ThemableBehavior
 from kivy.core.window import Window
 from kivymd.uix.behaviors.elevation import RectangularElevationBehavior
-#from kivy.garden.mapview import MapMarker
 from kivy_garden.mapview import MapMarkerPopup, MapView
 
-
-
 from save_thread_result import ThreadWithResult
 import requests
 from functools import partial
@@ -42,7 +38,6 @@
 import re
 from time import sleep
 
-
 class WalletRestore(Screen):
     screemanager = ObjectProperty()
 
@@ -576,10 +571,6 @@ def build_help_screen_interface(self):
         Meile.app.root.transition = SlideTransition(direction = "left")
         Meile.app.root.current = WindowNames.HELP
 
-    def wallet_create(self, inst):
-        pass
-
-
     def add_sub_rv_data(self, node, flagloc):
 
         if node[FinalSubsKeys[1]] == "Offline":

diff --git a/src/ui/widgets.py b/src/ui/widgets.py
@@ -20,7 +20,6 @@
 from kivy.core.clipboard import Clipboard
 from kivy.animation import Animation
 
-
 from functools import partial
 from urllib3.exceptions import InsecureRequestWarning
 import requests
@@ -409,64 +408,66 @@ def connect_to_node(self, ID, naddress, moniker, switchValue, *kwargs):
         if Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).CONNECTED:
             return 
 
-        self.add_loading_popup("Connecting...")
-
-        yield 0.6
-        UUID = Meile.app.root.get_screen(WindowNames.PRELOAD).UUID
-        try:
-            SERVER_ADDRESS = "https://aimokoivunen.mathnodes.com:5000"
-            API_ENDPOINT   = "/api/ping"
-            uuid_dict = {'uuid' : "%s" % UUID, 'os' : "L"}
-            ping = requests.post(SERVER_ADDRESS + API_ENDPOINT, json=uuid_dict)
-            if ping.status_code == 200:
-                print('ping')
-            else:
-                print("noping")
-        except Exception as e:
-            print(str(e))
-            pass
-
-        connected = HandleWalletFunctions.connect(HandleWalletFunctions, ID, naddress)
-
-        if connected:
-            Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeSwitch['node'] = naddress
-            Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeSwitch['switch'] = True
-            print("%s, %s" % (Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeSwitch['node'],
-                              Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeSwitch['switch']
-                             ))
-            self.remove_loading_widget()
-            self.dialog = MDDialog(
-                title="Connected!",
-                md_bg_color=get_color_from_hex("#0d021b"),
-                buttons=[
-                        MDFlatButton(
-                            text="OK",
-                            theme_text_color="Custom",
-                            text_color=self.theme_cls.primary_color,
-                            on_release=partial(self.call_ip_get, True, moniker)
-                        ),])
-            self.dialog.open()
+        if switchValue:
+            self.add_loading_popup("Connecting...")
 
-        else:
-            self.remove_loading_widget()
-            self.dialog = MDDialog(
-                title="Something went wrong. Not connected",
-                md_bg_color=get_color_from_hex("#0d021b"),
-                buttons=[
-                        MDFlatButton(
-                            text="OK",
-                            theme_text_color="Custom",
-                            text_color=self.theme_cls.primary_color,
-                            on_release=partial(self.call_ip_get, False, "")
-                        ),])
-            self.dialog.open()
+            yield 0.6
+            UUID = Meile.app.root.get_screen(WindowNames.PRELOAD).UUID
+            try:
+                SERVER_ADDRESS = "https://aimokoivunen.mathnodes.com:5000"
+                API_ENDPOINT   = "/api/ping"
+                uuid_dict = {'uuid' : "%s" % UUID, 'os' : "L"}
+                ping = requests.post(SERVER_ADDRESS + API_ENDPOINT, json=uuid_dict)
+                if ping.status_code == 200:
+                    print('ping')
+                else:
+                    print("noping")
+            except Exception as e:
+                print(str(e))
+                pass
+
+            connected = HandleWalletFunctions.connect(HandleWalletFunctions, ID, naddress)
 
+            if connected:
+                Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeSwitch['node'] = naddress
+                Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeSwitch['switch'] = True
+                print("%s, %s" % (Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeSwitch['node'],
+                                  Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).NodeSwitch['switch']
+                                 ))
+                self.remove_loading_widget()
+                self.dialog = MDDialog(
+                    title="Connected!",
+                    md_bg_color=get_color_from_hex("#0d021b"),
+                    buttons=[
+                            MDFlatButton(
+                                text="OK",
+                                theme_text_color="Custom",
+                                text_color=self.theme_cls.primary_color,
+                                on_release=partial(self.call_ip_get, True, moniker)
+                            ),])
+                self.dialog.open()
+
+            else:
+                self.remove_loading_widget()
+                self.dialog = MDDialog(
+                    title="Something went wrong. Not connected",
+                    md_bg_color=get_color_from_hex("#0d021b"),
+                    buttons=[
+                            MDFlatButton(
+                                text="OK",
+                                theme_text_color="Custom",
+                                text_color=self.theme_cls.primary_color,
+                                on_release=partial(self.call_ip_get, False, "")
+                            ),])
+                self.dialog.open()
+
     def call_ip_get(self,result, moniker,  *kwargs):
         if result:
             Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).CONNECTED = True
             Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).set_protected_icon(True, moniker)
         else:
             Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).CONNECTED = False
+            self.ids.node_switch.active = False
 
         if not Meile.app.root.get_screen(WindowNames.MAIN_WINDOW).get_ip_address(None):
             self.remove_loading_widget()