From 3b79c22ba96cdebd8f52f84f9d91a04276442968 Mon Sep 17 00:00:00 2001
From: RicomenPL <rafalbo99@outlook.com>
Date: Sun, 9 Apr 2017 15:33:55 +0200
Subject: [PATCH] Delete possibility of return to splashscreen

---
 app/src/main/AndroidManifest.xml                  |  3 ++-
 .../wulkanowy/activity/started/LoadingTask.java   |  1 +
 .../activity/started/StartedActivity.java         |  2 ++
 app/src/main/res/values-pl/strings.xml            |  1 +
 app/src/main/res/values/loginData.xml             | 15 +++++++--------
 app/src/main/res/values/strings.xml               |  1 +
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9b5747792..9584a528a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
         android:theme="@android:style/Theme.DeviceDefault">
         <activity
             android:name=".activity.started.StartedActivity"
-            android:theme = "@style/NoActionBar">
+            android:theme = "@style/NoActionBar"
+            android:noHistory="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/leszcz_team/wulkanowy/activity/started/LoadingTask.java b/app/src/main/java/leszcz_team/wulkanowy/activity/started/LoadingTask.java
index 4e785b0c7..f467e75e1 100644
--- a/app/src/main/java/leszcz_team/wulkanowy/activity/started/LoadingTask.java
+++ b/app/src/main/java/leszcz_team/wulkanowy/activity/started/LoadingTask.java
@@ -30,6 +30,7 @@ public class LoadingTask extends AsyncTask<Void, Void, Void> {
         Intent intent = new Intent(activity,MainActivity.class);
         activity.startActivity(intent);
 
+
     }
 }
 
diff --git a/app/src/main/java/leszcz_team/wulkanowy/activity/started/StartedActivity.java b/app/src/main/java/leszcz_team/wulkanowy/activity/started/StartedActivity.java
index 5ccd82749..d05aae9c5 100644
--- a/app/src/main/java/leszcz_team/wulkanowy/activity/started/StartedActivity.java
+++ b/app/src/main/java/leszcz_team/wulkanowy/activity/started/StartedActivity.java
@@ -18,5 +18,7 @@ public class StartedActivity extends Activity {
 
         new LoadingTask(this).execute();
 
+
+
     }
 }
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0ce47cd28..66e9ab019 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -13,4 +13,5 @@
     <string name="error_feature_text">Funkcja którą chciałeś uruchomić nie działa</string>
     <string name="login_accepted">Pomyślnie zalogowano</string>
     <string name="login_denied">Logowanie nie powiodło się</string>
+    <string name="please_wait">Proszę czekać...</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/loginData.xml b/app/src/main/res/values/loginData.xml
index f0cbfe76e..f4390b33b 100644
--- a/app/src/main/res/values/loginData.xml
+++ b/app/src/main/res/values/loginData.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="urlStepOneRelease">https://cufs.vulcan.net.pl/Default/Account/LogOn</string>
-    <string name="urlStepTwoRelease">https://cufs.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&amp;wtrealm=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&amp;wctx=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx</string>
-    <string name="urlStepThreeRelease">https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx"</string>
-    <string name="urlStepOneDebug">https://cufsdemo.vulcan.net.pl/Default/Account/LogOn</string>
-    <string name="urlStepTwoDebug">https://cufsdemo.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&amp;wtrealm=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&amp;wctx=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx</string>
-    <string name="urlStepThreeDebug">https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx"</string>
-    <string name="emailDebug">u43063@demouonetplus.vulcan.net.pl</string>
-    <string name="countyDebug">demouonetplus</string>
+    <string name="urlStepOneRelease" translatable="false">https://cufs.vulcan.net.pl/Default/Account/LogOn</string>
+    <string name="urlStepTwoRelease" translatable="false">https://cufs.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&amp;wtrealm=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&amp;wctx=https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx</string>
+    <string name="urlStepThreeRelease" translatable="false">https://uonetplus.vulcan.net.pl/{locationID}/LoginEndpoint.aspx"</string>
+    <string name="urlStepOneDebug" translatable="false">https://cufsdemo.vulcan.net.pl/Default/Account/LogOn</string>
+    <string name="urlStepTwoDebug" translatable="false">https://cufsdemo.vulcan.net.pl/{locationID}/FS/LS?wa=wsignin1.0&amp;wtrealm=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx&amp;wctx=https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx</string>
+    <string name="urlStepThreeDebug" translatable="false">https://uonetplusdemo.vulcan.net.pl/{locationID}/LoginEndpoint.aspx"</string>
+    <string name="countyDebug" translatable="false">demouonetplus</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9859e9ff6..e08747351 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,4 +12,5 @@
     <string name="error_feature_text">The function you wanted to run does not work</string>
     <string name="login_accepted">Login is successful</string>
     <string name="login_denied">Login is failed</string>
+    <string name="please_wait">Please wait...</string>
 </resources>