From 82f92ce1e23f42f2a3be094fef36a8eff04e6ad8 Mon Sep 17 00:00:00 2001
From: akshayaurora <akshayaurora@gmail.com>
Date: Thu, 4 Oct 2018 23:40:23 +0530
Subject: [PATCH] fix go_back_in_history

---
 eventsapp/network/__init__.py           |  4 ----
 eventsapp/uix/screens/screenfeedback.py |  8 ++++----
 eventsapp/utils/__init__.py             | 14 ++++++++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/eventsapp/network/__init__.py b/eventsapp/network/__init__.py
index fbce166..3cb5446 100644
--- a/eventsapp/network/__init__.py
+++ b/eventsapp/network/__init__.py
@@ -25,7 +25,6 @@ def write_oldata(fpath, data):
 
 def on_success(oldata, endpoint, req, bl):
     # got new data, update the schedule
-    print 'success',  endpoint
     ndata = None
     with open(req.file_path) as f:
         ndata = f.read()
@@ -59,12 +58,10 @@ def _check_data(req, oldata):
 
 
 def on_failure(oldata, endpoint, req, bl):
-    print 'failure', endpoint, req.file_path
     _check_data(req, oldata)
 
 
 def on_error(oldata, endpoint, req, bl):
-    print 'error', endpoint, req.file_path
     _check_data(req, oldata)
 
 
@@ -73,7 +70,6 @@ def fetch_remote_data(dt):
     '''
     for args in fetch_remote_data._args:
         endpoint, filepath, oldata = args
-        print 'fetch', endpoint, filepath
         UrlRequest(
             #FIXME: initial url should be abstracted out too.
             'https://raw.githubusercontent.com/pythonindia/'
diff --git a/eventsapp/uix/screens/screenfeedback.py b/eventsapp/uix/screens/screenfeedback.py
index 4b65fb7..a63f572 100644
--- a/eventsapp/uix/screens/screenfeedback.py
+++ b/eventsapp/uix/screens/screenfeedback.py
@@ -74,11 +74,11 @@ def on_pre_enter(self):
 
     def on_pre_leave(self):
         self.manager.transition.direction = 'down'
-
-    def on_leave(self):
-        self.manager.transition.direction = 'left'
         self.ids.sldr.value = 0
-        self.ids.root.talk = ''
+        self.ids.talk = ''
         self.ids.ti_description.text = ''
         self.ids.ti_name.text = ''
         self.ids.ti_ticketid.text = ''
+
+    def on_leave(self):
+        self.manager.transition.direction = 'left'
diff --git a/eventsapp/utils/__init__.py b/eventsapp/utils/__init__.py
index 8e9d1f8..704b512 100644
--- a/eventsapp/utils/__init__.py
+++ b/eventsapp/utils/__init__.py
@@ -3,6 +3,7 @@
 from kivy.app import App
 from kivy.utils import platform
 from kivy.uix.screenmanager import ScreenManagerException
+
 if platform == 'android':
     from jnius import autoclass, cast
     JS = autoclass('java.lang.String')
@@ -113,14 +114,19 @@ def go_back_in_history():
     app = App.get_running_app()
     from utils import pause_app
     try:
-        if not len(app._navigation_higherarchy):
+        scr = app._navigation_higherarchy.pop()
+        if scr.name == 'ScreenSchedule':
+            # we are at top of Nav higherarchy
             pause_app()
             return
-        scr = app._navigation_higherarchy.pop()
+
+        # we are not at root of Nav higherarchy
+        scr = app._navigation_higherarchy[-1]
         load_screen(
             scr.name,
             manager=scr.manager,
             store_back=False)
-    except ScreenManagerException:
+    except IndexError, ScreenManagerException:
         # check if current screen is schedule screen?
-        pause_app()
+        if app.navigation_manager.current == 'ScreenSchedule':
+            pause_app()