diff --git a/code/boot.js b/code/boot.js index c66dcadf..220e1531 100644 --- a/code/boot.js +++ b/code/boot.js @@ -566,8 +566,8 @@ function boot() { window.iitcLoaded = true; window.runHooks('iitcLoaded'); - if (typeof android !== 'undefined' && android && android.removeSplashScreen) { - android.removeSplashScreen(); + if (typeof android !== 'undefined' && android && android.bootFinished) { + android.bootFinished(); } } diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java index f1ae0f6e..833c85ab 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java @@ -104,8 +104,8 @@ public class IITC_JSInterface { } @JavascriptInterface - public void removeSplashScreen() { - Log.d("iitcm", "removing splash screen"); + public void bootFinished() { + Log.d("iitcm", "...boot finished"); mIitc.runOnUiThread(new Runnable() { @Override diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java index 25bad9d8..c0966c28 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java @@ -76,7 +76,7 @@ public class IITC_WebView extends WebView { public boolean onConsoleMessage(ConsoleMessage consoleMessage) { if (consoleMessage.messageLevel() == ConsoleMessage.MessageLevel.ERROR) { Log.d("iitcm", consoleMessage.message()); - mJsInterface.removeSplashScreen(); + ((IITC_Mobile) getContext()).setLoadingState(false); } return super.onConsoleMessage(consoleMessage); } diff --git a/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java b/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java index e7df6056..431dee3c 100644 --- a/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java +++ b/mobile/src/com/cradle/iitc_mobile/async/CheckHttpResponse.java @@ -43,7 +43,7 @@ public class CheckHttpResponse extends AsyncTask { int code = response.getStatusLine().getStatusCode(); if (code != HttpStatus.SC_OK) { Log.d("iitcm", "received error code: " + code); - mJsInterface.removeSplashScreen(); + ((IITC_Mobile) mContext).setLoadingState(false); // TODO: remove when google login issue is fixed if (urls[0].contains("uberauth=WILL_NOT_SIGN_IN")) { return true;