Resolved an issue with the android hardware back button causing a bla…

…nk screen that redraws when touched. closes #174
languageininteraction · Feb 3, 2015 · 065a9b8 · 065a9b8
1 parent 88c9e9b
commit 065a9b8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/gwt-cordova/pom.xml b/gwt-cordova/pom.xml
@@ -9,7 +9,7 @@
     <groupId>nl.ru.languageininteraction</groupId>
     <artifactId>synquiz</artifactId>
     <packaging>war</packaging>
-    <version>1.0.96-testing</version>
+    <version>1.0.97-testing</version>
     <name>SynQuiz</name>
     <organization>
         <name>Language In Interaction</name>

diff --git a/gwt-cordova/setup-cordova.sh b/gwt-cordova/setup-cordova.sh
@@ -1,6 +1,6 @@
 #mvn install
 cd target
-synquizname=synquiz-1.0.96-testing
+synquizname=synquiz-1.0.97-testing
 rm -rf $synquizname-cordova
 unzip $synquizname-cordova.zip -d $synquizname-cordova
 cd $synquizname-cordova

diff --git a/gwt-cordova/src/main/java/nl/ru/languageininteraction/synaesthesia/client/AppController.java b/gwt-cordova/src/main/java/nl/ru/languageininteraction/synaesthesia/client/AppController.java
@@ -80,11 +80,11 @@ public void requestApplicationState(ApplicationState applicationState) {
                     break;
                 case locale:
                     this.presenter = new LocalePresenter(widgetTag);
-                    presenter.setState(this, null, null);
+                    presenter.setState(this, ApplicationState.menu, null);
                     break;
                 case version:
                     this.presenter = new VersionPresenter(widgetTag);
-                    presenter.setState(this, null, null);
+                    presenter.setState(this, ApplicationState.menu, null);
                     break;
                 case start:
                 case intro:
@@ -93,19 +93,19 @@ public void requestApplicationState(ApplicationState applicationState) {
 //                    break;
                 case setuser:
                     this.presenter = new UserNamePresenter(widgetTag, userResults);
-                    presenter.setState(this, null, ApplicationState.stimulusselect);
+                    presenter.setState(this, ApplicationState.menu, ApplicationState.stimulusselect);
 //                    ((MetadataPresenter) presenter).focusFirstTextBox();
                     break;
                 case instructions:
                     // the user gets here via the stimulus menu
                     this.presenter = new InstructionsPresenter(widgetTag);
-                    presenter.setState(this, null, ApplicationState.stimulusshow);
+                    presenter.setState(this, ApplicationState.menu, ApplicationState.stimulusshow);
                     break;
                 case stimulusshow:
                 case stimulusselect:
                     if (userResults.getPendingStimuliGroup() == null) {
                         this.presenter = new StimulusMenuPresenter(widgetTag, stimuliProvider, userResults);
-                        presenter.setState(this, null, null);
+                        presenter.setState(this, ApplicationState.menu, null);
                     } else {
                         trackEvent(applicationState.name(), "show", userResults.getPendingStimuliGroup().getPostName());
                         this.presenter = new ColourPickerPresenter(widgetTag, userResults, 3);
@@ -123,7 +123,7 @@ public void requestApplicationState(ApplicationState applicationState) {
                     if (userResults.canRegister()) {
                         presenter.setState(this, null, ApplicationState.metadata);
                     } else {
-                        presenter.setState(this, null, ApplicationState.stimulusselect);
+                        presenter.setState(this, ApplicationState.menu, ApplicationState.stimulusselect);
                     }
                     break;
                 case feedback:
@@ -132,16 +132,16 @@ public void requestApplicationState(ApplicationState applicationState) {
                     break;
                 case metadata:
                     this.presenter = new MetadataPresenter(widgetTag, userResults);
-                    presenter.setState(this, null, ApplicationState.registration);
+                    presenter.setState(this, ApplicationState.menu, ApplicationState.registration);
 //                    ((MetadataPresenter) presenter).focusFirstTextBox();
                     break;
                 case registration:
                     if (userResults.getStimuliGroups().isEmpty()) {
                         this.presenter = new RegisterDisabledPresenter(widgetTag);
-                        presenter.setState(this, null, ApplicationState.stimulusselect);
+                        presenter.setState(this, ApplicationState.menu, ApplicationState.stimulusselect);
                     } else {
                         this.presenter = new RegisterPresenter(widgetTag, userResults);
-                        presenter.setState(this, null, ApplicationState.version);
+                        presenter.setState(this, ApplicationState.menu, ApplicationState.version);
                     }
                     break;
                 case registrationcomplete:
@@ -224,6 +224,6 @@ private native void addKeyboardEvents() /*-{
      }-*/;
 
     private native void exitApplication() /*-{
-     $doc.navigator.app.exitApp();
+     $wnd.navigator.app.exitApp();
      }-*/;
 }
diff --git a/...ain/java/nl/ru/languageininteraction/synaesthesia/client/presenter/AbstractPresenter.java b/...ain/java/nl/ru/languageininteraction/synaesthesia/client/presenter/AbstractPresenter.java
@@ -63,7 +63,7 @@ public String getLabel() {
 
                 @Override
                 public void eventFired(Button button) {
-                    appEventListner.requestApplicationState(AppEventListner.ApplicationState.menu);
+                    appEventListner.requestApplicationState(AppEventListner.ApplicationState.end);
                 }
 
                 @Override