From 5892b66eec0783f34e70f5cb1f54a8ff78250960 Mon Sep 17 00:00:00 2001
From: mhutti1 <mhutti1@gmail.com>
Date: Sat, 6 Aug 2016 10:09:50 +0100
Subject: [PATCH] Android Splash Screen only displays on app start via icon
 click #272

---
 AndroidManifest.xml                           | 12 +++++++++--
 res/raw/welcome.html                          |  2 +-
 .../kiwixmobile/KiwixMobileActivity.java      |  1 -
 .../kiwixmobile/utils/SplashActivity.java     | 20 +++++++++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 src/org/kiwix/kiwixmobile/utils/SplashActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e9b0f69a4..fd483f3b5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,9 +25,9 @@
       android:label="@string/app_name"
       android:theme="@style/AppTheme"
       android:supportsRtl="true">
+
     <activity
-      android:name=".KiwixMobileActivity"
-      android:configChanges="orientation|keyboardHidden|screenSize|locale"
+      android:name=".utils.SplashActivity"
       android:theme="@style/AppTheme.Launcher"
       android:label="@string/app_name">
       <intent-filter>
@@ -35,6 +35,14 @@
 
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
+    </activity>
+
+    <activity
+      android:name=".KiwixMobileActivity"
+      android:configChanges="orientation|keyboardHidden|screenSize|locale"
+      android:theme="@style/AppTheme"
+      android:label="@string/app_name">
+
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
 
diff --git a/res/raw/welcome.html b/res/raw/welcome.html
index fec53139b..b686755d9 100644
--- a/res/raw/welcome.html
+++ b/res/raw/welcome.html
@@ -32,7 +32,7 @@
     <section id="where-do-i-find-content">
         <h2>Where is the content?</h2>
 
-        <p>Our content is hosted on the <a href="http://kiwix.org/m/">kiwix website</a>.</p>
+        <p>Our content is hosted on the kiwix website.</p>
 
         <p>They are available as ZIM files. There are <strong>a lot</strong> of them:</p>
         <ul>
diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
index b7eab0615..c483984e3 100644
--- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
+++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
@@ -272,7 +272,6 @@ public class KiwixMobileActivity extends AppCompatActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     requestWindowFeature(Window.FEATURE_PROGRESS);
-    setTheme(R.style.AppTheme);
     super.onCreate(savedInstanceState);
     handleLocaleCheck();
     setContentView(R.layout.main);
diff --git a/src/org/kiwix/kiwixmobile/utils/SplashActivity.java b/src/org/kiwix/kiwixmobile/utils/SplashActivity.java
new file mode 100644
index 000000000..d44a5d773
--- /dev/null
+++ b/src/org/kiwix/kiwixmobile/utils/SplashActivity.java
@@ -0,0 +1,20 @@
+package org.kiwix.kiwixmobile.utils;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import org.kiwix.kiwixmobile.KiwixMobileActivity;
+
+
+public class SplashActivity extends AppCompatActivity {
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    Intent intent = new Intent(this, KiwixMobileActivity.class);
+    startActivity(intent);
+    finish();
+  }
+}
\ No newline at end of file