diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bbba374..75a3a8d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,109 +1,112 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.agprojects.sylk">
   
     <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus"/>
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission-sdk-23 android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
     <uses-permission android:name="android.permission.CALL_PHONE"/>
 
     <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
       android:requestLegacyExternalStorage="true"
 
       <service android:name="io.wazo.callkeep.VoiceConnectionService"
         android:label="@string/app_name"
         android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
         <intent-filter>
             <action android:name="android.telecom.ConnectionService" />
         </intent-filter>
       </service>
 
       <activity
         android:name=".SplashActivity"
         android:theme="@style/SplashTheme"
         android:label="@string/app_name"
         android:launchMode="singleTask">
         <intent-filter>
             <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
         </intent-filter>
 
          <intent-filter>
           <action android:name="android.intent.action.VIEW" />
           <category android:name="android.intent.category.DEFAULT" />
           <category android:name="android.intent.category.BROWSABLE" />
           <data android:scheme="sylk" />
         </intent-filter>
       </activity>
 
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
         android:windowSoftInputMode="adjustResize"
         android:exported="true"
         android:launchMode="singleTask"
+        android:showOnLockScreen="true"
+        android:showWhenLocked="true"
+        android:turnScreenOn="true"
       >
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
         </intent-filter>
         <intent-filter
             android:autoVerify="true">
           <action android:name="android.intent.action.VIEW" />
           <category android:name="android.intent.category.DEFAULT" />
           <category android:name="android.intent.category.BROWSABLE" />
           <data android:scheme="https"
             android:host="webrtc.sipthor.net"
             android:pathPrefix="/" />
         </intent-filter>
         <intent-filter>
           <action android:name="android.intent.action.VIEW" />
           <category android:name="android.intent.category.DEFAULT" />
           <category android:name="android.intent.category.BROWSABLE" />
           <data android:scheme="sylk" />
         </intent-filter>
 
           <intent-filter>
               <action android:name="android.intent.action.SEND" />
               <category android:name="android.intent.category.DEFAULT" />
               <data android:mimeType="text/*" />
           </intent-filter>
       </activity>
 
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
       <service android:name="io.wazo.callkeep.RNCallKeepBackgroundMessagingService" />
       <receiver android:name=".RingerBroadcastReceiver" android:exported="true" />
 
     </application>
 
 </manifest>
diff --git a/android/app/src/main/java/com/agprojects/sylk/MainActivity.java b/android/app/src/main/java/com/agprojects/sylk/MainActivity.java
index 954f7e2..6a5ea15 100644
--- a/android/app/src/main/java/com/agprojects/sylk/MainActivity.java
+++ b/android/app/src/main/java/com/agprojects/sylk/MainActivity.java
@@ -1,55 +1,80 @@
 package com.agprojects.sylk;
 
 import android.content.Intent;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import io.wazo.callkeep.RNCallKeepModule;
 
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.devio.rn.splashscreen.SplashScreen;
 import com.facebook.react.ReactActivity;
 import android.util.Log;
 
+import android.annotation.SuppressLint;
+import android.os.Build;
+import android.os.PowerManager;
+import android.view.WindowManager;
+ 
 
 public class MainActivity extends ReactActivity {
 
   /**
    * Returns the name of the main component registered from JavaScript. This is used to schedule
    * rendering of the component.
    */
   @Override
   protected String getMainComponentName() {
     return "Sylk";
   }
 
-@Override
-    public void invokeDefaultOnBackPressed() {
-        // do not call super.invokeDefaultOnBackPressed() as it will close the app.  Instead lets just put it in the background.
-        moveTaskToBack(true);
-    }
-    
-@Override
-public void onNewIntent(Intent intent) {
-  super.onNewIntent(intent);
-  setIntent(intent);
-}
+  @Override
+  public void invokeDefaultOnBackPressed() {
+     // do not call super.invokeDefaultOnBackPressed() as it will close the app.  Instead lets just put it in the background.
+     moveTaskToBack(true);
+  }
+
+  @Override
+  public void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    setIntent(intent);
+  }
 
   @Override
   protected void onCreate(Bundle savedInstanceState){
     //SplashScreen.show(this);
     super.onCreate(savedInstanceState);
   }
 
   @Override
   public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
       super.onRequestPermissionsResult(requestCode, permissions, grantResults);
       switch (requestCode) {
           case RNCallKeepModule.REQUEST_READ_PHONE_STATE:
               RNCallKeepModule.onRequestPermissionsResult(requestCode, permissions, grantResults);
               break;
       }
   }
+  
+  @Override
+  protected void onStart() {
+     super.onStart();
+     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+       setShowWhenLocked(true);
+       setTurnScreenOn(true);
+     } else {
+       PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
+       PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP, "myapp:wakeLock");
+       wl.acquire();
+
+       getWindow().addFlags(
+               WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+               | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+               | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+               | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+       );
+     }
+   }
 }