terminal: version 2.2.0

* ios: settings for auto-accepting images, link previews, spinner for link previews

* android: settings for auto-accepting images, link previews, spinner for link previews, privacy settings

* update translation

Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>

* translation

Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>

* translation

Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>

Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>

README.md

@@ -63,12 +63,12 @@ If you are considering developing with SimpleX platform please get in touch for
 
 ## News and updates
 
-[Apr 04, 2022. Instant notifications for SimpleX Chat mobile apps](./blog/20220404-simplex-chat-instant-notifications.md). We would really appreciate any feedback on the design we are implementing.
+[May 11, 2022. v2.0 released - sending images and files in mobile apps](./blog/20220511-simplex-chat-v2-images-files.md)
+
+[Apr 04, 2022. Instant notifications for SimpleX Chat mobile apps](./blog/20220404-simplex-chat-instant-notifications.md)
 
 [Mar 08, 2022 Mobile apps for iOS and Android released](./blog/20220308-simplex-chat-mobile-apps.md)
 
-[Feb 14, 2022. SimpleX Chat: join our public beta for iOS](./blog/20220214-simplex-chat-ios-public-beta.md)
-
 [All updates](./blog)
 
 ## Make a private connection

apps/android/.idea/codeStyles/Project.xml

@@ -1,5 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <ComposeCustomCodeStyleSettings>
+      <option name="USE_CUSTOM_FORMATTING_FOR_MODIFIERS" value="false" />
+    </ComposeCustomCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="SPACE_BEFORE_EXTEND_COLON" value="false" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="3" />
@@ -123,9 +126,11 @@
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="RIGHT_MARGIN" value="140" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="0" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
       <option name="CALL_PARAMETERS_WRAP" value="0" />
       <option name="METHOD_PARAMETERS_WRAP" value="0" />
       <option name="EXTENDS_LIST_WRAP" value="0" />

apps/android/.idea/gradle.xml

@@ -13,7 +13,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

apps/android/app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "chat.simplex.app"
         minSdk 29
         targetSdk 32
-        versionCode 30
-        versionName "2.0"
+        versionCode 36
+        versionName "2.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
@@ -76,6 +76,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
     implementation 'androidx.activity:activity-compose:1.4.0'
+    implementation 'androidx.fragment:fragment:1.4.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.3.2'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
     implementation "androidx.compose.material:material-icons-extended:$compose_version"
@@ -103,6 +104,9 @@ dependencies {
     // Link Previews
     implementation 'org.jsoup:jsoup:1.13.1'
 
+    // Biometric authentication
+    implementation 'androidx.biometric:biometric:1.2.0-alpha04'
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

apps/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="chat.simplex.app">
 
   <uses-feature android:name="android.hardware.camera" />
@@ -15,7 +16,10 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+      tools:ignore="ScopedStorage" />
+  <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+  <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 
   <application
       android:name="SimplexApp"
@@ -61,6 +65,9 @@
       </intent-filter>
     </activity>
 
+    <activity android:name=".views.call.IncomingCallActivity"
+        android:showOnLockScreen="true"/>
+
     <provider
         android:name="androidx.core.content.FileProvider"
         android:authorities="chat.simplex.app.provider"

apps/android/app/src/main/assets/www/call.html

@@ -1,11 +1,24 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
     <link href="./style.css" rel="stylesheet" />
+    <script src="./lz-string.min.js"></script>
   </head>
   <body>
-    <video id="remote-video-stream" autoplay playsinline></video>
-    <video id="local-video-stream" muted autoplay playsinline></video>
+    <video
+      id="remote-video-stream"
+      autoplay
+      playsinline
+      poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
+    ></video>
+    <video
+      id="local-video-stream"
+      muted
+      autoplay
+      playsinline
+      poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
+    ></video>
   </body>
   <footer>
     <script src="./call.js"></script>

apps/android/app/src/main/assets/www/lz-string.min.js

@@ -0,0 +1 @@
+var LZString=function(){function o(o,r){if(!t[o]){t[o]={};for(var n=0;n<o.length;n++)t[o][o.charAt(n)]=n}return t[o][r]}var r=String.fromCharCode,n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-$",t={},i={compressToBase64:function(o){if(null==o)return"";var r=i._compress(o,6,function(o){return n.charAt(o)});switch(r.length%4){default:case 0:return r;case 1:return r+"===";case 2:return r+"==";case 3:return r+"="}},decompressFromBase64:function(r){return null==r?"":""==r?null:i._decompress(r.length,32,function(e){return o(n,r.charAt(e))})},compressToUTF16:function(o){return null==o?"":i._compress(o,15,function(o){return r(o+32)})+" "},decompressFromUTF16:function(o){return null==o?"":""==o?null:i._decompress(o.length,16384,function(r){return o.charCodeAt(r)-32})},compressToUint8Array:function(o){for(var r=i.compress(o),n=new Uint8Array(2*r.length),e=0,t=r.length;t>e;e++){var s=r.charCodeAt(e);n[2*e]=s>>>8,n[2*e+1]=s%256}return n},decompressFromUint8Array:function(o){if(null===o||void 0===o)return i.decompress(o);for(var n=new Array(o.length/2),e=0,t=n.length;t>e;e++)n[e]=256*o[2*e]+o[2*e+1];var s=[];return n.forEach(function(o){s.push(r(o))}),i.decompress(s.join(""))},compressToEncodedURIComponent:function(o){return null==o?"":i._compress(o,6,function(o){return e.charAt(o)})},decompressFromEncodedURIComponent:function(r){return null==r?"":""==r?null:(r=r.replace(/ /g,"+"),i._decompress(r.length,32,function(n){return o(e,r.charAt(n))}))},compress:function(o){return i._compress(o,16,function(o){return r(o)})},_compress:function(o,r,n){if(null==o)return"";var e,t,i,s={},p={},u="",c="",a="",l=2,f=3,h=2,d=[],m=0,v=0;for(i=0;i<o.length;i+=1)if(u=o.charAt(i),Object.prototype.hasOwnProperty.call(s,u)||(s[u]=f++,p[u]=!0),c=a+u,Object.prototype.hasOwnProperty.call(s,c))a=c;else{if(Object.prototype.hasOwnProperty.call(p,a)){if(a.charCodeAt(0)<256){for(e=0;h>e;e++)m<<=1,v==r-1?(v=0,d.push(n(m)),m=0):v++;for(t=a.charCodeAt(0),e=0;8>e;e++)m=m<<1|1&t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}else{for(t=1,e=0;h>e;e++)m=m<<1|t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t=0;for(t=a.charCodeAt(0),e=0;16>e;e++)m=m<<1|1&t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}l--,0==l&&(l=Math.pow(2,h),h++),delete p[a]}else for(t=s[a],e=0;h>e;e++)m=m<<1|1&t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;l--,0==l&&(l=Math.pow(2,h),h++),s[c]=f++,a=String(u)}if(""!==a){if(Object.prototype.hasOwnProperty.call(p,a)){if(a.charCodeAt(0)<256){for(e=0;h>e;e++)m<<=1,v==r-1?(v=0,d.push(n(m)),m=0):v++;for(t=a.charCodeAt(0),e=0;8>e;e++)m=m<<1|1&t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}else{for(t=1,e=0;h>e;e++)m=m<<1|t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t=0;for(t=a.charCodeAt(0),e=0;16>e;e++)m=m<<1|1&t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}l--,0==l&&(l=Math.pow(2,h),h++),delete p[a]}else for(t=s[a],e=0;h>e;e++)m=m<<1|1&t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;l--,0==l&&(l=Math.pow(2,h),h++)}for(t=2,e=0;h>e;e++)m=m<<1|1&t,v==r-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;for(;;){if(m<<=1,v==r-1){d.push(n(m));break}v++}return d.join("")},decompress:function(o){return null==o?"":""==o?null:i._decompress(o.length,32768,function(r){return o.charCodeAt(r)})},_decompress:function(o,n,e){var t,i,s,p,u,c,a,l,f=[],h=4,d=4,m=3,v="",w=[],A={val:e(0),position:n,index:1};for(i=0;3>i;i+=1)f[i]=i;for(p=0,c=Math.pow(2,2),a=1;a!=c;)u=A.val&A.position,A.position>>=1,0==A.position&&(A.position=n,A.val=e(A.index++)),p|=(u>0?1:0)*a,a<<=1;switch(t=p){case 0:for(p=0,c=Math.pow(2,8),a=1;a!=c;)u=A.val&A.position,A.position>>=1,0==A.position&&(A.position=n,A.val=e(A.index++)),p|=(u>0?1:0)*a,a<<=1;l=r(p);break;case 1:for(p=0,c=Math.pow(2,16),a=1;a!=c;)u=A.val&A.position,A.position>>=1,0==A.position&&(A.position=n,A.val=e(A.index++)),p|=(u>0?1:0)*a,a<<=1;l=r(p);break;case 2:return""}for(f[3]=l,s=l,w.push(l);;){if(A.index>o)return"";for(p=0,c=Math.pow(2,m),a=1;a!=c;)u=A.val&A.position,A.position>>=1,0==A.position&&(A.position=n,A.val=e(A.index++)),p|=(u>0?1:0)*a,a<<=1;switch(l=p){case 0:for(p=0,c=Math.pow(2,8),a=1;a!=c;)u=A.val&A.position,A.position>>=1,0==A.position&&(A.position=n,A.val=e(A.index++)),p|=(u>0?1:0)*a,a<<=1;f[d++]=r(p),l=d-1,h--;break;case 1:for(p=0,c=Math.pow(2,16),a=1;a!=c;)u=A.val&A.position,A.position>>=1,0==A.position&&(A.position=n,A.val=e(A.index++)),p|=(u>0?1:0)*a,a<<=1;f[d++]=r(p),l=d-1,h--;break;case 2:return w.join("")}if(0==h&&(h=Math.pow(2,m),m++),f[l])v=f[l];else{if(l!==d)return null;v=s+s.charAt(0)}w.push(v),f[d++]=s+v.charAt(0),h--,s=v,0==h&&(h=Math.pow(2,m),m++)}}};return i}();"function"==typeof define&&define.amd?define(function(){return LZString}):"undefined"!=typeof module&&null!=module&&(module.exports=LZString);

apps/android/app/src/main/assets/www/style.css

@@ -1,12 +1,10 @@
-video::-webkit-media-controls {
-  display: none;
-}
 html,
 body {
   padding: 0;
   margin: 0;
   background-color: black;
 }
+
 #remote-video-stream {
   position: absolute;
   width: 100%;
@@ -21,6 +19,23 @@ body {
   object-fit: cover;
   margin: 16px;
   border-radius: 16px;
-  bottom: 0;
+  top: 0;
   right: 0;
 }
+
+*::-webkit-media-controls {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+*::-webkit-media-controls-panel {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+*::-webkit-media-controls-play-button {
+  display: none !important;
+  -webkit-appearance: none !important;
+}
+*::-webkit-media-controls-start-playback-button {
+  display: none !important;
+  -webkit-appearance: none !important;
+}

apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt

@@ -4,23 +4,31 @@ import android.app.Application
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.os.SystemClock.elapsedRealtime
 import android.util.Log
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
-import androidx.compose.runtime.Composable
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Replay
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.AndroidViewModel
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.*
 import androidx.work.*
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.NtfManager
+import chat.simplex.app.ui.theme.SimpleButton
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.SplashView
+import chat.simplex.app.views.call.ActiveCallView
+import chat.simplex.app.views.call.IncomingCallAlertView
 import chat.simplex.app.views.chat.ChatView
 import chat.simplex.app.views.chatlist.ChatListView
 import chat.simplex.app.views.chatlist.openChat
@@ -28,17 +36,22 @@ import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.connectViaUri
 import chat.simplex.app.views.newchat.withUriAction
 import chat.simplex.app.views.onboarding.*
+import kotlinx.coroutines.delay
 import java.util.concurrent.TimeUnit
 
-//import kotlinx.serialization.decodeFromString
-
-class MainActivity: ComponentActivity() {
+class MainActivity: FragmentActivity(), LifecycleEventObserver {
   private val vm by viewModels<SimplexViewModel>()
   private val chatController by lazy { (application as SimplexApp).chatController }
+  private val userAuthorized = mutableStateOf<Boolean?>(null)
+  private val enteredBackground = mutableStateOf<Long?>(null)
+  private val laFailed = mutableStateOf(false)
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
-//    testJson()
+    ProcessLifecycleOwner.get().lifecycle.addObserver(this)
+    // testJson()
+    val m = vm.chatModel
+    processNotificationIntent(intent, m)
     setContent {
       SimpleXTheme {
         Surface(
@@ -46,7 +59,14 @@ class MainActivity: ComponentActivity() {
             .background(MaterialTheme.colors.background)
             .fillMaxSize()
         ) {
-          MainPage(vm.chatModel)
+          MainPage(
+            m,
+            userAuthorized,
+            laFailed,
+            ::runAuthenticate,
+            ::setPerformLA,
+            showLANotice = { m.controller.showLANotice(this) }
+          )
         }
       }
     }
@@ -58,14 +78,66 @@ class MainActivity: ComponentActivity() {
     processIntent(intent, vm.chatModel)
   }
 
+  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
+    withApi {
+      when (event) {
+        Lifecycle.Event.ON_STOP -> {
+          enteredBackground.value = elapsedRealtime()
+        }
+        Lifecycle.Event.ON_START -> {
+          val enteredBackgroundVal = enteredBackground.value
+          if (enteredBackgroundVal == null || elapsedRealtime() - enteredBackgroundVal >= 30 * 1e+3) {
+            runAuthenticate()
+          }
+        }
+      }
+    }
+  }
+
+  private fun runAuthenticate() {
+    val m = vm.chatModel
+    if (!m.controller.appPrefs.performLA.get()) {
+      userAuthorized.value = true
+    } else {
+      userAuthorized.value = false
+      ModalManager.shared.closeModals()
+      authenticate(
+        generalGetString(R.string.auth_unlock),
+        generalGetString(R.string.auth_log_in_using_credential),
+        this@MainActivity,
+        completed = { laResult ->
+          when (laResult) {
+            LAResult.Success -> {
+              userAuthorized.value = true
+            }
+            is LAResult.Error -> {
+              laFailed.value = true
+              laErrorToast(applicationContext, laResult.errString)
+            }
+            LAResult.Failed -> {
+              laFailed.value = true
+              laFailedToast(applicationContext)
+            }
+            LAResult.Unavailable -> {
+              userAuthorized.value = true
+              m.performLA.value = false
+              m.controller.appPrefs.performLA.set(false)
+              laUnavailableTurningOffAlert()
+            }
+          }
+        }
+      )
+    }
+  }
+
   private fun schedulePeriodicServiceRestartWorker() {
-    val workerVersion = chatController.getAutoRestartWorkerVersion()
+    val workerVersion = chatController.appPrefs.autoRestartWorkerVersion.get()
     val workPolicy = if (workerVersion == SimplexService.SERVICE_START_WORKER_VERSION) {
       Log.d(TAG, "ServiceStartWorker version matches: choosing KEEP as existing work policy")
       ExistingPeriodicWorkPolicy.KEEP
     } else {
       Log.d(TAG, "ServiceStartWorker version DOES NOT MATCH: choosing REPLACE as existing work policy")
-      chatController.setAutoRestartWorkerVersion(SimplexService.SERVICE_START_WORKER_VERSION)
+      chatController.appPrefs.autoRestartWorkerVersion.set(SimplexService.SERVICE_START_WORKER_VERSION)
       ExistingPeriodicWorkPolicy.REPLACE
     }
     val work = PeriodicWorkRequestBuilder<SimplexService.ServiceStartWorker>(SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES, TimeUnit.MINUTES)
@@ -75,6 +147,82 @@ class MainActivity: ComponentActivity() {
     Log.d(TAG, "ServiceStartWorker: Scheduling period work every ${SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES} minutes")
     WorkManager.getInstance(this)?.enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
   }
+
+  private fun setPerformLA(on: Boolean) {
+    vm.chatModel.controller.appPrefs.laNoticeShown.set(true)
+    if (on) {
+      enableLA()
+    } else {
+      disableLA()
+    }
+  }
+
+  private fun enableLA() {
+    val m = vm.chatModel
+    authenticate(
+      generalGetString(R.string.auth_enable_simplex_lock),
+      generalGetString(R.string.auth_confirm_credential),
+      this@MainActivity,
+      completed = { laResult ->
+        val prefPerformLA = m.controller.appPrefs.performLA
+        when (laResult) {
+          LAResult.Success -> {
+            m.performLA.value = true
+            prefPerformLA.set(true)
+            laTurnedOnAlert()
+          }
+          is LAResult.Error -> {
+            m.performLA.value = false
+            prefPerformLA.set(false)
+            laErrorToast(applicationContext, laResult.errString)
+          }
+          LAResult.Failed -> {
+            m.performLA.value = false
+            prefPerformLA.set(false)
+            laFailedToast(applicationContext)
+          }
+          LAResult.Unavailable -> {
+            m.performLA.value = false
+            prefPerformLA.set(false)
+            laUnavailableInstructionAlert()
+          }
+        }
+      }
+    )
+  }
+
+  private fun disableLA() {
+    val m = vm.chatModel
+    authenticate(
+      generalGetString(R.string.auth_disable_simplex_lock),
+      generalGetString(R.string.auth_confirm_credential),
+      this@MainActivity,
+      completed = { laResult ->
+        val prefPerformLA = m.controller.appPrefs.performLA
+        when (laResult) {
+          LAResult.Success -> {
+            m.performLA.value = false
+            prefPerformLA.set(false)
+          }
+          is LAResult.Error -> {
+            m.performLA.value = true
+            prefPerformLA.set(true)
+            laErrorToast(applicationContext, laResult.errString)
+          }
+          LAResult.Failed -> {
+            m.performLA.value = true
+            prefPerformLA.set(true)
+            laFailedToast(applicationContext)
+          }
+          LAResult.Unavailable -> {
+            m.performLA.value = false
+            prefPerformLA.set(false)
+            laUnavailableTurningOffAlert()
+          }
+        }
+      }
+    )
+  }
 }
 
 class SimplexViewModel(application: Application): AndroidViewModel(application) {
@@ -83,15 +231,85 @@ class SimplexViewModel(application: Application): AndroidViewModel(application)
 }
 
 @Composable
-fun MainPage(chatModel: ChatModel) {
+fun MainPage(
+  chatModel: ChatModel,
+  userAuthorized: MutableState<Boolean?>,
+  laFailed: MutableState<Boolean>,
+  runAuthenticate: () -> Unit,
+  setPerformLA: (Boolean) -> Unit,
+  showLANotice: () -> Unit
+) {
+  // this with LaunchedEffect(userAuthorized.value) fixes bottom sheet visibly collapsing after authentication
+  var chatsAccessAuthorized by remember { mutableStateOf(false) }
+  LaunchedEffect(userAuthorized.value) {
+    if (chatModel.controller.appPrefs.performLA.get()) {
+      delay(500L)
+    }
+    chatsAccessAuthorized = userAuthorized.value == true
+  }
+  var showAdvertiseLAAlert by remember { mutableStateOf(false) }
+  LaunchedEffect(showAdvertiseLAAlert) {
+    if (
+      !chatModel.controller.appPrefs.laNoticeShown.get()
+      && showAdvertiseLAAlert
+      && chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete
+      && chatModel.chats.isNotEmpty()
+      && chatModel.activeCallInvitation.value == null
+    ) {
+      showLANotice()
+    }
+  }
+  LaunchedEffect(chatModel.showAdvertiseLAUnavailableAlert.value) {
+    if (chatModel.showAdvertiseLAUnavailableAlert.value) {
+      laUnavailableInstructionAlert()
+    }
+  }
+  LaunchedEffect(chatModel.clearOverlays.value) {
+    if (chatModel.clearOverlays.value) {
+      ModalManager.shared.closeModals()
+      chatModel.clearOverlays.value = false
+    }
+  }
+
+  @Composable
+  fun retryAuthView() {
+    Box(
+      Modifier.fillMaxSize(),
+      contentAlignment = Alignment.Center
+    ) {
+      SimpleButton(
+        stringResource(R.string.auth_retry),
+        icon = Icons.Outlined.Replay,
+        click = {
+          laFailed.value = false
+          runAuthenticate()
+        }
+      )
+    }
+  }
+
   Box {
     val onboarding = chatModel.onboardingStage.value
     val userCreated = chatModel.userCreated.value
     when {
       onboarding == null || userCreated == null -> SplashView()
-      onboarding == OnboardingStage.OnboardingComplete && userCreated ->
-        if (chatModel.chatId.value == null) ChatListView(chatModel)
-        else ChatView(chatModel)
+      !chatsAccessAuthorized -> {
+        if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
+          retryAuthView()
+        } else {
+          SplashView()
+        }
+      }
+      onboarding == OnboardingStage.OnboardingComplete && userCreated -> {
+        Box {
+          if (chatModel.showCallView.value) ActiveCallView(chatModel)
+          else {
+            showAdvertiseLAAlert = true
+            if (chatModel.chatId.value == null) ChatListView(chatModel, setPerformLA = { setPerformLA(it) })
+            else ChatView(chatModel)
+          }
+        }
+      }
       onboarding == OnboardingStage.Step1_SimpleXInfo ->
         Box(Modifier.padding(horizontal = 20.dp)) {
           SimpleXInfo(chatModel, onboarding = true)
@@ -99,25 +317,45 @@ fun MainPage(chatModel: ChatModel) {
       onboarding == OnboardingStage.Step2_CreateProfile -> CreateProfile(chatModel)
     }
     ModalManager.shared.showInView()
+    val invitation = chatModel.activeCallInvitation.value
+    if (invitation != null) IncomingCallAlertView(invitation, chatModel)
     AlertManager.shared.showInView()
   }
 }
 
+fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
+  when (intent?.action) {
+    NtfManager.OpenChatAction -> {
+      val chatId = intent.getStringExtra("chatId")
+      Log.d(TAG, "processNotificationIntent: OpenChatAction $chatId")
+      if (chatId != null) {
+        val cInfo = chatModel.getChat(chatId)?.chatInfo
+        chatModel.clearOverlays.value = true
+        if (cInfo != null) withApi { openChat(cInfo, chatModel) }
+      }
+    }
+    NtfManager.ShowChatsAction -> {
+      Log.d(TAG, "processNotificationIntent: ShowChatsAction")
+      chatModel.chatId.value = null
+      chatModel.clearOverlays.value = true
+    }
+    NtfManager.AcceptCallAction -> {
+      val chatId = intent.getStringExtra("chatId")
+      if (chatId == null || chatId == "") return
+      Log.d(TAG, "processNotificationIntent: AcceptCallAction $chatId")
+      chatModel.clearOverlays.value = true
+      val invitation = chatModel.callInvitations[chatId]
+      if (invitation == null) {
+        AlertManager.shared.showAlertMsg(generalGetString(R.string.call_already_ended))
+      } else {
+        chatModel.callManager.acceptIncomingCall(invitation = invitation)
+      }
+    }
+  }
+}
+
 fun processIntent(intent: Intent?, chatModel: ChatModel) {
   when (intent?.action) {
-    NtfManager.OpenChatAction -> {
-      val chatId = intent.getStringExtra("chatId")
-      Log.d(TAG, "processIntent: OpenChatAction $chatId")
-      if (chatId != null) {
-        val cInfo = chatModel.getChat(chatId)?.chatInfo
-        chatModel.clearOverlays.value = true
-        if (cInfo != null) withApi { openChat(chatModel, cInfo) }
-      }
-    }
-    NtfManager.ShowChatsAction -> {
-      Log.d(TAG, "processIntent: ShowChatsAction")
-      chatModel.clearOverlays.value = true
-    }
     "android.intent.action.VIEW" -> {
       val uri = intent.data
       if (uri != null) connectIfOpenedViaUri(uri, chatModel)
@@ -154,7 +392,6 @@ fun connectIfOpenedViaUri(uri: Uri, chatModel: ChatModel) {
     }
   }
 }
-
 //fun testJson() {
 //  val str: String = """
 //  """.trimIndent()

apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt

@@ -30,7 +30,7 @@ external fun chatRecvMsg(ctrl: ChatCtrl) : String
 class SimplexApp: Application(), LifecycleEventObserver {
   val chatController: ChatController by lazy {
     val ctrl = chatInit(getFilesDirectory(applicationContext))
-    ChatController(ctrl, ntfManager, applicationContext)
+    ChatController(ctrl, ntfManager, applicationContext, appPreferences)
   }
 
   val chatModel: ChatModel by lazy {
@@ -38,7 +38,11 @@ class SimplexApp: Application(), LifecycleEventObserver {
   }
 
   private val ntfManager: NtfManager by lazy {
-    NtfManager(applicationContext)
+    NtfManager(applicationContext, appPreferences)
+  }
+
+  private val appPreferences: AppPreferences by lazy {
+    AppPreferences(applicationContext)
   }
 
   override fun onCreate() {
@@ -52,7 +56,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
       } else {
         chatController.startChat(user)
         SimplexService.start(applicationContext)
-        chatController.showBackgroundServiceNotice()
+        chatController.showBackgroundServiceNoticeIfNeeded()
       }
     }
   }
@@ -62,9 +66,13 @@ class SimplexApp: Application(), LifecycleEventObserver {
     withApi {
       when (event) {
         Lifecycle.Event.ON_STOP ->
-          if (!chatController.getRunServiceInBackground()) SimplexService.stop(applicationContext)
+          if (!appPreferences.runServiceInBackground.get()) SimplexService.stop(applicationContext)
         Lifecycle.Event.ON_START ->
           SimplexService.start(applicationContext)
+        Lifecycle.Event.ON_RESUME ->
+          if (chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete) {
+            chatController.showBackgroundServiceNoticeIfNeeded()
+          }
       }
     }
   }

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -8,8 +8,7 @@ import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.font.*
 import androidx.compose.ui.text.style.TextDecoration
 import chat.simplex.app.R
-import chat.simplex.app.ui.theme.SecretColor
-import chat.simplex.app.ui.theme.SimplexBlue
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.call.*
 import chat.simplex.app.views.helpers.generalGetString
 import chat.simplex.app.views.onboarding.OnboardingStage
@@ -38,13 +37,20 @@ class ChatModel(val controller: ChatController) {
 
   // set when app is opened via contact or invitation URI
   val appOpenUrl = mutableStateOf<Uri?>(null)
+
+  // preferences
   val runServiceInBackground = mutableStateOf(true)
+  val performLA = mutableStateOf(false)
+  val showAdvertiseLAUnavailableAlert = mutableStateOf(false)
 
   // current WebRTC call
+  val callManager = CallManager(this)
   val callInvitations = mutableStateMapOf<String, CallInvitation>()
-  val activeCallInvitation = mutableStateOf<ContactRef?>(null)
+  val activeCallInvitation = mutableStateOf<CallInvitation?>(null)
   val activeCall = mutableStateOf<Call?>(null)
   val callCommand = mutableStateOf<WCallCommand?>(null)
+  val showCallView = mutableStateOf(false)
+  val switchingCall = mutableStateOf(false)
 
   fun updateUserProfile(profile: Profile) {
     val user = currentUser.value
@@ -75,6 +81,20 @@ class ChatModel(val controller: ChatController) {
     }
   }
 
+  fun updateChats(newChats: List<Chat>) {
+    val mergedChats = arrayListOf<Chat>()
+    for (newChat in newChats) {
+      val i = getChatIndex(newChat.chatInfo.id)
+      if (i >= 0) {
+        mergedChats.add(newChat.copy(serverInfo = chats[i].serverInfo))
+      } else {
+        mergedChats.add(newChat)
+      }
+    }
+    chats.clear()
+    chats.addAll(mergedChats)
+  }
+
   fun updateNetworkStatus(id: ChatId, status: Chat.NetworkStatus) {
     val i = getChatIndex(id)
     if (i >= 0) {
@@ -172,8 +192,28 @@ class ChatModel(val controller: ChatController) {
     }
   }
 
+  fun clearChat(cInfo: ChatInfo) {
+    // clear preview
+    val i = getChatIndex(cInfo.id)
+    if (i >= 0) {
+      chats[i] = chats[i].copy(chatItems = arrayListOf(), chatStats = Chat.ChatStats(), chatInfo = cInfo)
+    }
+    // clear current chat
+    if (chatId.value == cInfo.id) {
+      chatItems.clear()
+    }
+  }
+
   fun markChatItemsRead(cInfo: ChatInfo) {
+    // update preview
     val chatIdx = getChatIndex(cInfo.id)
+    if (chatIdx >= 0) {
+      val chat = chats[chatIdx]
+      val lastId = chat.chatItems.lastOrNull()?.id
+      if (lastId != null) {
+        chats[chatIdx] = chat.copy(chatStats = chat.chatStats.copy(unreadCount = 0, minUnreadItemId = lastId + 1))
+      }
+    }
     // update current chat
     if (chatId.value == cInfo.id) {
       var i = 0
@@ -184,12 +224,6 @@ class ChatModel(val controller: ChatController) {
         }
         i += 1
       }
-      val chat = chats[chatIdx]
-      val pItem  = chat.chatItems.lastOrNull()
-      chats[chatIdx] = chat.copy(
-        chatItems = if (pItem == null) arrayListOf() else arrayListOf(pItem.withStatus(CIStatus.RcvRead())),
-        chatStats = chat.chatStats.copy(unreadCount = 0, minUnreadItemId = chat.chatItems.last().id + 1)
-      )
     }
   }
 
@@ -256,6 +290,7 @@ interface SomeChat {
   val apiId: Long
   val ready: Boolean
   val createdAt: Instant
+  val updatedAt: Instant
 }
 
 @Serializable
@@ -307,6 +342,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = contact.apiId
     override val ready get() = contact.ready
     override val createdAt get() = contact.createdAt
+    override val updatedAt get() = contact.updatedAt
     override val displayName get() = contact.displayName
     override val fullName get() = contact.fullName
     override val image get() = contact.image
@@ -324,6 +360,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = groupInfo.apiId
     override val ready get() = groupInfo.ready
     override val createdAt get() = groupInfo.createdAt
+    override val updatedAt get() = groupInfo.updatedAt
     override val displayName get() = groupInfo.displayName
     override val fullName get() = groupInfo.fullName
     override val image get() = groupInfo.image
@@ -341,6 +378,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = contactRequest.apiId
     override val ready get() = contactRequest.ready
     override val createdAt get() = contactRequest.createdAt
+    override val updatedAt get() = contactRequest.updatedAt
     override val displayName get() = contactRequest.displayName
     override val fullName get() = contactRequest.fullName
     override val image get() = contactRequest.image
@@ -358,6 +396,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
     override val apiId get() = contactConnection.apiId
     override val ready get() = contactConnection.ready
     override val createdAt get() = contactConnection.createdAt
+    override val updatedAt get() = contactConnection.updatedAt
     override val displayName get() = contactConnection.displayName
     override val fullName get() = contactConnection.fullName
     override val image get() = contactConnection.image
@@ -376,7 +415,8 @@ class Contact(
   val profile: Profile,
   val activeConn: Connection,
   val viaGroup: Long? = null,
-  override val createdAt: Instant
+  override val createdAt: Instant,
+  override val updatedAt: Instant
 ): SomeChat, NamedChat {
   override val chatType get() = ChatType.Direct
   override val id get() = "@$contactId"
@@ -392,7 +432,8 @@ class Contact(
       localDisplayName = "alice",
       profile = Profile.sampleData,
       activeConn = Connection.sampleData,
-      createdAt = Clock.System.now()
+      createdAt = Clock.System.now(),
+      updatedAt = Clock.System.now()
     )
   }
 }
@@ -421,10 +462,10 @@ class Connection(val connId: Long, val connStatus: ConnStatus) {
 
 @Serializable
 class Profile(
-  val displayName: String,
-  val fullName: String,
-  val image: String? = null
-  ) {
+  override val displayName: String,
+  override val fullName: String,
+  override val image: String? = null
+): NamedChat {
   companion object {
     val sampleData = Profile(
       displayName = "alice",
@@ -438,7 +479,8 @@ class GroupInfo (
   val groupId: Long,
   override val localDisplayName: String,
   val groupProfile: GroupProfile,
-  override val createdAt: Instant
+  override val createdAt: Instant,
+  override val updatedAt: Instant
 ): SomeChat, NamedChat {
   override val chatType get() = ChatType.Group
   override val id get() = "#$groupId"
@@ -453,7 +495,8 @@ class GroupInfo (
       groupId = 1,
       localDisplayName = "team",
       groupProfile = GroupProfile.sampleData,
-      createdAt = Clock.System.now()
+      createdAt = Clock.System.now(),
+      updatedAt = Clock.System.now()
     )
   }
 }
@@ -525,7 +568,7 @@ class UserContactRequest (
   override val localDisplayName: String,
   val profile: Profile,
   override val createdAt: Instant,
-  val updatedAt: Instant
+  override val updatedAt: Instant
 ): SomeChat, NamedChat {
   override val chatType get() = ChatType.ContactRequest
   override val id get() = "<@$contactRequestId"
@@ -553,7 +596,7 @@ class PendingContactConnection(
   val pccConnStatus: ConnStatus,
   val viaContactUri: Boolean,
   override val createdAt: Instant,
-  val updatedAt: Instant
+  override val updatedAt: Instant
 ): SomeChat, NamedChat {
   override val chatType get() = ChatType.ContactConnection
   override val id get () = ":$pccConnId"
@@ -649,13 +692,6 @@ data class ChatItem (
     if (chatDir is CIDirection.GroupRcv) chatDir.groupMember.memberProfile.displayName
     else null
 
-  val isMsgContent: Boolean get() =
-    when (content) {
-      is CIContent.SndMsgContent -> true
-      is CIContent.RcvMsgContent -> true
-      else -> false
-    }
-
   val isDeletedContent: Boolean get() =
     when (content) {
       is CIContent.SndDeleted -> true
@@ -807,10 +843,11 @@ sealed class CIContent: ItemContent {
 
   @Serializable @SerialName("sndMsgContent") class SndMsgContent(override val msgContent: MsgContent): CIContent()
   @Serializable @SerialName("rcvMsgContent") class RcvMsgContent(override val msgContent: MsgContent): CIContent()
-  @Serializable @SerialName("sndDeleted") class SndDeleted(val deleteMode: CIDeleteMode): CIContent() { override val msgContent get() = null }
-  @Serializable @SerialName("rcvDeleted")  class RcvDeleted(val deleteMode: CIDeleteMode): CIContent() { override val msgContent get() = null }
-  @Serializable @SerialName("sndCall") class SndCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent get() = null }
-  @Serializable @SerialName("rcvCall") class RcvCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent get() = null }
+  @Serializable @SerialName("sndDeleted") class SndDeleted(val deleteMode: CIDeleteMode): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvDeleted")  class RcvDeleted(val deleteMode: CIDeleteMode): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("sndCall") class SndCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvCall") class RcvCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvIntegrityError") class RcvIntegrityError(val msgError: MsgErrorType): CIContent() { override val msgContent: MsgContent? get() = null }
 
   override val text: String get() = when(this) {
     is SndMsgContent -> msgContent.text
@@ -819,6 +856,7 @@ sealed class CIContent: ItemContent {
     is RcvDeleted -> generalGetString(R.string.deleted_description)
     is SndCall -> status.text(duration)
     is RcvCall -> status.text(duration)
+    is RcvIntegrityError -> msgError.text
   }
 }
 
@@ -1042,7 +1080,7 @@ enum class FormatColor(val color: String) {
 
   val uiColor: Color @Composable get() = when (this) {
     red -> Color.Red
-    green -> Color.Green
+    green -> SimplexGreen
     blue -> SimplexBlue
     yellow -> Color.Yellow
     cyan -> Color.Cyan
@@ -1082,3 +1120,18 @@ enum class CICallStatus {
 
   fun duration(sec: Int): String = "%02d:%02d".format(sec / 60, sec % 60)
 }
+
+@Serializable
+sealed class MsgErrorType() {
+  @Serializable @SerialName("msgSkipped") class MsgSkipped(val fromMsgId: Long, val toMsgId: Long): MsgErrorType()
+  @Serializable @SerialName("msgBadId") class MsgBadId(val msgId: Long): MsgErrorType()
+  @Serializable @SerialName("msgBadHash") class MsgBadHash(): MsgErrorType()
+  @Serializable @SerialName("msgDuplicate") class MsgDuplicate(): MsgErrorType()
+
+  val text: String get() = when (this) {
+    is MsgSkipped -> String.format(generalGetString(R.string.integrity_msg_skipped), toMsgId - fromMsgId + 1)
+    is MsgBadHash -> generalGetString(R.string.integrity_msg_bad_hash) // not used now
+    is MsgBadId -> generalGetString(R.string.integrity_msg_bad_id) // not used now
+    is MsgDuplicate -> generalGetString(R.string.integrity_msg_duplicate) // not used now
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/model/NtfManager.kt

@@ -1,20 +1,31 @@
 package chat.simplex.app.model
 
 import android.app.*
-import android.content.Context
-import android.content.Intent
+import android.content.*
+import android.graphics.BitmapFactory
+import android.media.AudioAttributes
+import android.net.Uri
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import chat.simplex.app.*
+import chat.simplex.app.views.call.*
+import chat.simplex.app.views.helpers.base64ToBitmap
+import chat.simplex.app.views.helpers.generalGetString
 import kotlinx.datetime.Clock
 
-class NtfManager(val context: Context) {
+class NtfManager(val context: Context, private val appPreferences: AppPreferences) {
   companion object {
     const val MessageChannel: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
     const val MessageGroup: String = "chat.simplex.app.MESSAGE_NOTIFICATION"
     const val OpenChatAction: String = "chat.simplex.app.OPEN_CHAT"
     const val ShowChatsAction: String = "chat.simplex.app.SHOW_CHATS"
+
+    // DO NOT change notification channel settings / names
+    const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION"
+    const val LockScreenCallChannel: String = "chat.simplex.app.LOCK_SCREEN_CALL_NOTIFICATION"
+    const val AcceptCallAction: String = "chat.simplex.app.ACCEPT_CALL"
+    const val CallNotificationId: Int = -1
   }
 
   private val manager: NotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -22,11 +33,22 @@ class NtfManager(val context: Context) {
   private val msgNtfTimeoutMs = 30000L
 
   init {
-    manager.createNotificationChannel(NotificationChannel(
-      MessageChannel,
-      "SimpleX Chat messages",
-      NotificationManager.IMPORTANCE_HIGH
-    ))
+    manager.createNotificationChannel(NotificationChannel(MessageChannel, "SimpleX Chat messages", NotificationManager.IMPORTANCE_HIGH))
+    manager.createNotificationChannel(NotificationChannel(LockScreenCallChannel, "SimpleX Chat calls (lock screen)", NotificationManager.IMPORTANCE_HIGH))
+    manager.createNotificationChannel(callNotificationChannel())
+  }
+
+  private fun callNotificationChannel(): NotificationChannel {
+    val callChannel = NotificationChannel(CallChannel, "SimpleX Chat calls", NotificationManager.IMPORTANCE_HIGH)
+    val attrs = AudioAttributes.Builder()
+      .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+      .setUsage(AudioAttributes.USAGE_NOTIFICATION)
+      .build()
+    val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
+    Log.d(TAG,"callNotificationChannel sound: $soundUri")
+    callChannel.setSound(soundUri, attrs)
+    callChannel.enableVibration(true)
+    return callChannel
   }
 
   fun cancelNotificationsForChat(chatId: String) {
@@ -42,21 +64,25 @@ class NtfManager(val context: Context) {
   }
 
   fun notifyMessageReceived(cInfo: ChatInfo, cItem: ChatItem) {
-    Log.d(TAG, "notifyMessageReceived ${cInfo.id}")
+    notifyMessageReceived(chatId = cInfo.id, displayName = cInfo.displayName, msgText = hideSecrets(cItem))
+  }
+
+  fun notifyMessageReceived(chatId: String, displayName: String, msgText: String) {
+    Log.d(TAG, "notifyMessageReceived $chatId")
     val now = Clock.System.now().toEpochMilliseconds()
-    val recentNotification = (now - prevNtfTime.getOrDefault(cInfo.id, 0) < msgNtfTimeoutMs)
-    prevNtfTime[cInfo.id] = now
+    val recentNotification = (now - prevNtfTime.getOrDefault(chatId, 0) < msgNtfTimeoutMs)
+    prevNtfTime[chatId] = now
 
     val notification = NotificationCompat.Builder(context, MessageChannel)
-      .setContentTitle(cInfo.displayName)
-      .setContentText(hideSecrets(cItem))
+      .setContentTitle(displayName)
+      .setContentText(msgText)
       .setPriority(NotificationCompat.PRIORITY_HIGH)
       .setGroup(MessageGroup)
       .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
       .setSmallIcon(R.drawable.ntf_icon)
       .setColor(0x88FFFF)
       .setAutoCancel(true)
-      .setContentIntent(getMsgPendingIntent(cInfo))
+      .setContentIntent(chatPendingIntent(OpenChatAction, chatId))
       .setSilent(recentNotification)
       .build()
 
@@ -66,16 +92,62 @@ class NtfManager(val context: Context) {
       .setGroup(MessageGroup)
       .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
       .setGroupSummary(true)
-      .setContentIntent(getSummaryNtfIntent())
+      .setContentIntent(chatPendingIntent(ShowChatsAction))
       .build()
 
     with(NotificationManagerCompat.from(context)) {
       // using cInfo.id only shows one notification per chat and updates it when the message arrives
-      notify(cInfo.id.hashCode(), notification)
+      notify(chatId.hashCode(), notification)
       notify(0, summary)
     }
   }
 
+  fun notifyCallInvitation(invitation: CallInvitation) {
+    if (isAppOnForeground(context)) return
+    val contactId = invitation.contact.id
+    Log.d(TAG, "notifyCallInvitation $contactId")
+    val keyguardManager = getKeyguardManager(context)
+    val image = invitation.contact.image
+    var ntfBuilder =
+      if (keyguardManager.isDeviceLocked && appPreferences.callOnLockScreen.get() != CallOnLockScreen.DISABLE) {
+        val fullScreenIntent = Intent(context, IncomingCallActivity::class.java)
+        val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
+        NotificationCompat.Builder(context, LockScreenCallChannel)
+          .setFullScreenIntent(fullScreenPendingIntent, true)
+          .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+          .setSilent(true)
+      } else {
+        val soundUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://" + context.packageName + "/" + R.raw.ring_once)
+        NotificationCompat.Builder(context, CallChannel)
+          .setContentIntent(chatPendingIntent(OpenChatAction, invitation.contact.id))
+          .addAction(R.drawable.ntf_icon, generalGetString(R.string.accept), chatPendingIntent(AcceptCallAction, contactId))
+          .setSound(soundUri)
+      }
+    val text = generalGetString(
+      if (invitation.peerMedia == CallMediaType.Video) {
+        if (invitation.sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
+      } else {
+        if (invitation.sharedKey == null) R.string.audio_call_no_encryption else R.string.encrypted_audio_call
+      }
+    )
+    ntfBuilder = ntfBuilder
+      .setContentTitle(invitation.contact.displayName)
+      .setContentText(text)
+      .setPriority(NotificationCompat.PRIORITY_HIGH)
+      .setCategory(NotificationCompat.CATEGORY_CALL)
+      .setSmallIcon(R.drawable.ntf_icon)
+      .setLargeIcon(if (image == null) BitmapFactory.decodeResource(context.resources, R.drawable.icon) else base64ToBitmap(image))
+      .setColor(0x88FFFF)
+      .setAutoCancel(true)
+    with(NotificationManagerCompat.from(context)) {
+      notify(CallNotificationId, ntfBuilder.build())
+    }
+  }
+
+  fun cancelCallNotification() {
+    manager.cancel(CallNotificationId)
+  }
+
   private fun hideSecrets(cItem: ChatItem) : String {
     val md = cItem.formattedText
     return if (md == null) {
@@ -93,25 +165,13 @@ class NtfManager(val context: Context) {
     }
   }
 
-  private fun getMsgPendingIntent(cInfo: ChatInfo) : PendingIntent{
-    Log.d(TAG, "getMsgPendingIntent ${cInfo.id}")
+  private fun chatPendingIntent(intentAction: String, chatId: String? = null): PendingIntent {
+    Log.d(TAG, "chatPendingIntent for $intentAction")
     val uniqueInt = (System.currentTimeMillis() and 0xfffffff).toInt()
-    val intent = Intent(context, MainActivity::class.java)
+    var intent = Intent(context, MainActivity::class.java)
       .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-      .putExtra("chatId", cInfo.id)
-      .setAction(OpenChatAction)
-    return TaskStackBuilder.create(context).run {
-      addNextIntentWithParentStack(intent)
-      getPendingIntent(uniqueInt, PendingIntent.FLAG_IMMUTABLE)
-    }
-  }
-
-  private fun getSummaryNtfIntent() : PendingIntent{
-    Log.d(TAG, "getSummaryNtfIntent")
-    val uniqueInt = (System.currentTimeMillis() and 0xfffffff).toInt()
-    val intent = Intent(context, MainActivity::class.java)
-      .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP)
-      .setAction(ShowChatsAction)
+      .setAction(intentAction)
+    if (chatId != null) intent = intent.putExtra("chatId", chatId)
     return TaskStackBuilder.create(context).run {
       addNextIntentWithParentStack(intent)
       getPendingIntent(uniqueInt, PendingIntent.FLAG_IMMUTABLE)

apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt

@@ -1,9 +1,14 @@
 package chat.simplex.app.model
 
+import android.annotation.SuppressLint
 import android.app.ActivityManager
 import android.app.ActivityManager.RunningAppProcessInfo
-import android.content.Context
-import android.content.SharedPreferences
+import android.app.Application
+import android.content.*
+import android.net.Uri
+import android.os.Build
+import android.os.PowerManager
+import android.provider.Settings
 import android.util.Log
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
@@ -13,13 +18,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.views.call.*
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.onboarding.OnboardingStage
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
 import kotlinx.serialization.*
@@ -29,29 +34,116 @@ import kotlin.concurrent.thread
 
 typealias ChatCtrl = Long
 
-open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: NtfManager, val appContext: Context) {
-  var chatModel = ChatModel(this)
-  private val sharedPreferences: SharedPreferences = appContext.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)
+fun isAppOnForeground(context: Context): Boolean {
+  val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+  val appProcesses = activityManager.runningAppProcesses ?: return false
+  val packageName = context.packageName
+  for (appProcess in appProcesses) {
+    if (appProcess.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND && appProcess.processName == packageName) {
+      return true
+    }
+  }
+  return false
+}
+
+enum class CallOnLockScreen {
+  DISABLE,
+  SHOW,
+  ACCEPT;
+
+  companion object {
+    val default = SHOW
+  }
+}
+
+class AppPreferences(val context: Context) {
+  private val sharedPreferences: SharedPreferences = context.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)
+
+  val runServiceInBackground = mkBoolPreference(SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND, true)
+  val backgroundServiceNoticeShown = mkBoolPreference(SHARED_PREFS_SERVICE_NOTICE_SHOWN, false)
+  val backgroundServiceBatteryNoticeShown = mkBoolPreference(SHARED_PREFS_SERVICE_BATTERY_NOTICE_SHOWN, false)
+  val autoRestartWorkerVersion = mkIntPreference(SHARED_PREFS_AUTO_RESTART_WORKER_VERSION, 0)
+  val webrtcPolicyRelay = mkBoolPreference(SHARED_PREFS_WEBRTC_POLICY_RELAY, true)
+  private val _callOnLockScreen = mkStrPreference(SHARED_PREFS_WEBRTC_CALLS_ON_LOCK_SCREEN, CallOnLockScreen.default.name)
+  val callOnLockScreen: Preference<CallOnLockScreen> = Preference(
+    get = fun(): CallOnLockScreen {
+      val value = _callOnLockScreen.get() ?: return CallOnLockScreen.default
+      return try {
+        CallOnLockScreen.valueOf(value)
+      } catch (e: Error) {
+        CallOnLockScreen.default
+      }
+    },
+    set = fun(action: CallOnLockScreen) { _callOnLockScreen.set(action.name) }
+  )
+  val performLA = mkBoolPreference(SHARED_PREFS_PERFORM_LA, false)
+  val laNoticeShown = mkBoolPreference(SHARED_PREFS_LA_NOTICE_SHOWN, false)
+  val privacyAcceptImages = mkBoolPreference(SHARED_PREFS_PRIVACY_ACCEPT_IMAGES, true)
+  val privacyLinkPreviews = mkBoolPreference(SHARED_PREFS_PRIVACY_LINK_PREVIEWS, true)
+  val experimentalCalls = mkBoolPreference(SHARED_PREFS_EXPERIMENTAL_CALLS, false)
+
+  private fun mkIntPreference(prefName: String, default: Int) =
+    Preference(
+      get = fun() = sharedPreferences.getInt(prefName, default),
+      set = fun(value) = sharedPreferences.edit().putInt(prefName, value).apply()
+    )
+
+  private fun mkBoolPreference(prefName: String, default: Boolean) =
+    Preference(
+      get = fun() = sharedPreferences.getBoolean(prefName, default),
+      set = fun(value) = sharedPreferences.edit().putBoolean(prefName, value).apply()
+    )
+
+  private fun mkStrPreference(prefName: String, default: String?): Preference<String?> =
+    Preference(
+      get = fun() = sharedPreferences.getString(prefName, default),
+      set = fun(value) = sharedPreferences.edit().putString(prefName, value).apply()
+    )
+
+  companion object {
+    private const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_APP_PREFS"
+    private const val SHARED_PREFS_AUTO_RESTART_WORKER_VERSION = "AutoRestartWorkerVersion"
+    private const val SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND = "RunServiceInBackground"
+    private const val SHARED_PREFS_SERVICE_NOTICE_SHOWN = "BackgroundServiceNoticeShown"
+    private const val SHARED_PREFS_SERVICE_BATTERY_NOTICE_SHOWN = "BackgroundServiceBatteryNoticeShown"
+    private const val SHARED_PREFS_WEBRTC_POLICY_RELAY = "WebrtcPolicyRelay"
+    private const val SHARED_PREFS_WEBRTC_CALLS_ON_LOCK_SCREEN = "CallsOnLockScreen"
+    private const val SHARED_PREFS_PERFORM_LA = "PerformLA"
+    private const val SHARED_PREFS_LA_NOTICE_SHOWN = "LANoticeShown"
+    private const val SHARED_PREFS_PRIVACY_ACCEPT_IMAGES = "PrivacyAcceptImages"
+    private const val SHARED_PREFS_PRIVACY_LINK_PREVIEWS = "PrivacyLinkPreviews"
+    private const val SHARED_PREFS_EXPERIMENTAL_CALLS = "ExperimentalCalls"
+
+  }
+}
+
+open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager, val appContext: Context, val appPrefs: AppPreferences) {
+  val chatModel = ChatModel(this)
 
   init {
-    chatModel.runServiceInBackground.value = getRunServiceInBackground()
+    chatModel.runServiceInBackground.value = appPrefs.runServiceInBackground.get()
+    chatModel.performLA.value = appPrefs.performLA.get()
   }
 
   suspend fun startChat(user: User) {
     Log.d(TAG, "user: $user")
     try {
-      apiStartChat()
+      val chatStarted = apiStartChat()
       apiSetFilesFolder(getAppFilesDirectory(appContext))
       chatModel.userAddress.value = apiGetUserAddress()
       chatModel.userSMPServers.value = getUserSMPServers()
       val chats = apiGetChats()
-      chatModel.chats.clear()
-      chatModel.chats.addAll(chats)
+      if (chatStarted) {
+        chatModel.chats.clear()
+        chatModel.chats.addAll(chats)
+      } else {
+        chatModel.updateChats(chats)
+      }
       chatModel.currentUser.value = user
       chatModel.userCreated.value = true
       chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
-      Log.d(TAG, "started chat")
-    } catch(e: Error) {
+      Log.d(TAG, "chat started")
+    } catch (e: Error) {
       Log.e(TAG, "failed starting chat $e")
       throw e
     }
@@ -60,26 +152,10 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
   fun startReceiver() {
     Log.d(TAG, "ChatController startReceiver")
     thread(name="receiver") {
-      withApi { recvMspLoop() }
+      GlobalScope.launch { withContext(Dispatchers.IO) { recvMspLoop() } }
     }
   }
 
-  open fun isAppOnForeground(context: Context): Boolean {
-    val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
-    val appProcesses = activityManager.runningAppProcesses ?: return false
-    val packageName = context.packageName
-    for (appProcess in appProcesses) {
-      if (appProcess.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND && appProcess.processName == packageName) {
-        return true
-      }
-    }
-    return false
-  }
-
-  fun cancelNotificationsForChat(chatId: String) {
-    ntfManager.cancelNotificationsForChat(chatId)
-  }
-
   suspend fun sendCmd(cmd: CC): CR {
     return withContext(Dispatchers.IO) {
       val c = cmd.cmdString
@@ -130,10 +206,13 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
     throw Error("user not created ${r.responseType} ${r.details}")
   }
 
-  suspend fun apiStartChat() {
+  suspend fun apiStartChat(): Boolean {
     val r = sendCmd(CC.StartChat())
-    if (r is CR.ChatStarted || r is CR.ChatRunning) return
-    throw Error("failed starting chat: ${r.responseType} ${r.details}")
+    when (r) {
+      is CR.ChatStarted -> return true
+      is CR.ChatRunning -> return false
+      else -> throw Error("failed starting chat: ${r.responseType} ${r.details}")
+    }
   }
 
   suspend fun apiSetFilesFolder(filesFolder: String) {
@@ -268,6 +347,13 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
     return false
   }
 
+  suspend fun apiClearChat(type: ChatType, id: Long): ChatInfo? {
+    val r = sendCmd(CC.ApiClearChat(type, id))
+    if (r is CR.ChatCleared) return r.chatInfo
+    Log.e(TAG, "apiClearChat bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
   suspend fun apiUpdateProfile(profile: Profile): Profile? {
     val r = sendCmd(CC.ApiUpdateProfile(profile))
     if (r is CR.UserProfileNoChange) return profile
@@ -332,20 +418,20 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
     return r is CR.CmdOk
   }
 
-  suspend fun apiSendCallOffer(contact: Contact, rtcSession: String, rtcIceCandidates: List<String>, media: CallMediaType, capabilities: CallCapabilities): Boolean {
+  suspend fun apiSendCallOffer(contact: Contact, rtcSession: String, rtcIceCandidates: String, media: CallMediaType, capabilities: CallCapabilities): Boolean {
     val webRtcSession = WebRTCSession(rtcSession, rtcIceCandidates)
     val callOffer = WebRTCCallOffer(CallType(media, capabilities), webRtcSession)
     val r = sendCmd(CC.ApiSendCallOffer(contact, callOffer))
     return r is CR.CmdOk
   }
 
-  suspend fun apiSendCallAnswer(contact: Contact, rtcSession: String, rtcIceCandidates: List<String>): Boolean {
+  suspend fun apiSendCallAnswer(contact: Contact, rtcSession: String, rtcIceCandidates: String): Boolean {
     val answer = WebRTCSession(rtcSession, rtcIceCandidates)
     val r = sendCmd(CC.ApiSendCallAnswer(contact, answer))
     return r is CR.CmdOk
   }
 
-  suspend fun apiSendCallExtraInfo(contact: Contact, rtcIceCandidates: List<String>): Boolean {
+  suspend fun apiSendCallExtraInfo(contact: Contact, rtcIceCandidates: String): Boolean {
     val extraInfo = WebRTCExtraInfo(rtcIceCandidates)
     val r = sendCmd(CC.ApiSendCallExtraInfo(contact, extraInfo))
     return r is CR.CmdOk
@@ -356,15 +442,9 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
     return r is CR.CmdOk
   }
 
-  suspend fun apiCallStatus(contact: Contact, status: String): Boolean {
-    try {
-      val callStatus = WebRTCCallStatus.valueOf(status)
-      val r = sendCmd(CC.ApiCallStatus(contact, callStatus))
-      return r is CR.CmdOk
-    } catch (e: Error) {
-      Log.d(TAG,"apiCallStatus: call status $status not used")
-      return false
-    }
+  suspend fun apiCallStatus(contact: Contact, status: WebRTCCallStatus): Boolean {
+    val r = sendCmd(CC.ApiCallStatus(contact, status))
+    return r is CR.CmdOk
   }
 
   suspend fun apiChatRead(type: ChatType, id: Long, range: CC.ItemRange): Boolean {
@@ -437,15 +517,10 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
         val cItem = r.chatItem.chatItem
         chatModel.addChatItem(cInfo, cItem)
         val file = cItem.file
-        if (cItem.content.msgContent is MsgContent.MCImage && file != null && file.fileSize <= MAX_IMAGE_SIZE) {
-          withApi {
-            val chatItem = apiReceiveFile(file.fileId)
-            if (chatItem != null) {
-              chatItemSimpleUpdate(chatItem)
-            }
-          }
+        if (cItem.content.msgContent is MsgContent.MCImage && file != null && file.fileSize <= MAX_IMAGE_SIZE && appPrefs.privacyAcceptImages.get()) {
+          withApi { receiveFile(file.fileId) }
         }
-        if (!isAppOnForeground(appContext) || chatModel.chatId.value != cInfo.id) {
+        if (!cItem.isCall && (!isAppOnForeground(appContext) || chatModel.chatId.value != cInfo.id)) {
           ntfManager.notifyMessageReceived(cInfo, cItem)
         }
       }
@@ -491,11 +566,64 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
           removeFile(appContext, fileName)
         }
       }
+      is CR.CallInvitation -> {
+        val invitation = CallInvitation(r.contact, r.callType.media, r.sharedKey, r.callTs)
+        chatModel.callManager.reportNewIncomingCall(invitation)
+      }
+      is CR.CallOffer -> {
+        // TODO askConfirmation?
+        // TODO check encryption is compatible
+        withCall(r, r.contact) { call ->
+          chatModel.activeCall.value = call.copy(callState = CallState.OfferReceived, peerMedia = r.callType.media, sharedKey = r.sharedKey)
+          val useRelay = chatModel.controller.appPrefs.webrtcPolicyRelay.get()
+          chatModel.callCommand.value = WCallCommand.Offer(offer = r.offer.rtcSession, iceCandidates = r.offer.rtcIceCandidates, media = r.callType.media, aesKey = r.sharedKey, relay = useRelay)
+        }
+      }
+      is CR.CallAnswer -> {
+        withCall(r, r.contact) { call ->
+          chatModel.activeCall.value = call.copy(callState = CallState.AnswerReceived)
+          chatModel.callCommand.value = WCallCommand.Answer(answer = r.answer.rtcSession, iceCandidates = r.answer.rtcIceCandidates)
+        }
+      }
+      is CR.CallExtraInfo -> {
+        withCall(r, r.contact) { _ ->
+          chatModel.callCommand.value = WCallCommand.Ice(iceCandidates = r.extraInfo.rtcIceCandidates)
+        }
+      }
+      is CR.CallEnded -> {
+        val invitation = chatModel.callInvitations.remove(r.contact.id)
+        if (invitation != null) {
+          chatModel.callManager.reportCallRemoteEnded(invitation = invitation)
+        }
+        withCall(r, r.contact) { _ ->
+          chatModel.callCommand.value = WCallCommand.End
+          withApi {
+            chatModel.activeCall.value = null
+            chatModel.showCallView.value = false
+          }
+        }
+      }
       else ->
         Log.d(TAG , "unsupported event: ${r.responseType}")
     }
   }
 
+  private fun withCall(r: CR, contact: Contact, perform: (Call) -> Unit) {
+    val call = chatModel.activeCall.value
+    if (call != null && call.contact.apiId == contact.apiId) {
+      perform(call)
+    } else {
+      Log.d(TAG, "processReceivedMsg: ignoring ${r.responseType}, not in call with the contact ${contact.id}")
+    }
+  }
+
+  suspend fun receiveFile(fileId: Long) {
+    val chatItem = apiReceiveFile(fileId)
+    if (chatItem != null) {
+      chatItemSimpleUpdate(chatItem)
+    }
+  }
+
   private fun chatItemSimpleUpdate(aChatItem: AChatItem) {
     val cInfo = aChatItem.chatInfo
     val cItem = aChatItem.chatItem
@@ -526,67 +654,183 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
     chatModel.updateNetworkStatus(contact.id, Chat.NetworkStatus.Error(err))
   }
 
-  fun showBackgroundServiceNotice() {
-    if (!getBackgroundServiceNoticeShown()) {
-      AlertManager.shared.showAlert {
-        AlertDialog(
-          onDismissRequest = AlertManager.shared::hideAlert,
-          title = {
-            Row {
-              Icon(
-                Icons.Outlined.Bolt,
-                contentDescription = stringResource(R.string.icon_descr_instant_notifications),
-              )
-              Text(stringResource(R.string.private_instant_notifications), fontWeight = FontWeight.Bold)
-            }
-          },
-          text = {
-            Column {
-              Text(
-                annotatedStringResource(R.string.to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery),
-                Modifier.padding(bottom = 8.dp)
-              )
-              Text(annotatedStringResource(R.string.it_can_disabled_via_settings_notifications_still_shown))
-            }
-          },
-          confirmButton = {
-            Button(onClick = AlertManager.shared::hideAlert) { Text(stringResource(R.string.ok)) }
-          }
-        )
+  fun showBackgroundServiceNoticeIfNeeded() {
+    Log.d(TAG, "showBackgroundServiceNoticeIfNeeded")
+    if (!appPrefs.backgroundServiceNoticeShown.get()) {
+      // the branch for the new users who has never seen service notice
+      if (isIgnoringBatteryOptimizations(appContext)) {
+        showBGServiceNotice()
+      } else {
+        showBGServiceNoticeIgnoreOptimization()
+      }
+      // set both flags, so that if the user doesn't allow ignoring optimizations, the service will be disabled without additional notice
+      appPrefs.backgroundServiceNoticeShown.set(true)
+      appPrefs.backgroundServiceBatteryNoticeShown.set(true)
+    } else if (!isIgnoringBatteryOptimizations(appContext) && appPrefs.runServiceInBackground.get()) {
+      // the branch for users who have app installed, and have seen the service notice,
+      // but the battery optimization for the app is on (Android 12) AND the service is running
+      if (appPrefs.backgroundServiceBatteryNoticeShown.get()) {
+        // users have been presented with battery notice before - they did not allow ignoring optimizitions -> disable service
+        showDisablingServiceNotice()
+        appPrefs.runServiceInBackground.set(false)
+        chatModel.runServiceInBackground.value = false
+      } else {
+        // show battery optimization notice
+        showBGServiceNoticeIgnoreOptimization()
+        appPrefs.backgroundServiceBatteryNoticeShown.set(true)
       }
-      setBackgroundServiceNoticeShown()
     }
   }
 
-  fun getAutoRestartWorkerVersion(): Int = sharedPreferences.getInt(SHARED_PREFS_AUTO_RESTART_WORKER_VERSION, 0)
+  private fun showBGServiceNotice() = AlertManager.shared.showAlert {
+    AlertDialog(
+      onDismissRequest = AlertManager.shared::hideAlert,
+      title = {
+        Row {
+          Icon(
+            Icons.Outlined.Bolt,
+            contentDescription = stringResource(R.string.icon_descr_instant_notifications),
+          )
+          Text(stringResource(R.string.private_instant_notifications), fontWeight = FontWeight.Bold)
+        }
+      },
+      text = {
+        Column {
+          Text(
+            annotatedStringResource(R.string.to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery),
+            Modifier.padding(bottom = 8.dp)
+          )
+          Text(annotatedStringResource(R.string.it_can_disabled_via_settings_notifications_still_shown))
+        }
+      },
+      confirmButton = {
+        Button(onClick = AlertManager.shared::hideAlert) { Text(stringResource(R.string.ok)) }
+      }
+    )
+  }
 
-  fun setAutoRestartWorkerVersion(version: Int) =
-    sharedPreferences.edit()
-      .putInt(SHARED_PREFS_AUTO_RESTART_WORKER_VERSION, version)
-      .apply()
+  private fun showBGServiceNoticeIgnoreOptimization() = AlertManager.shared.showAlert {
+    val ignoreOptimization = {
+      AlertManager.shared.hideAlert()
+      askAboutIgnoringBatteryOptimization(appContext)
+    }
+    AlertDialog(
+      onDismissRequest = ignoreOptimization,
+      title = {
+        Row {
+          Icon(
+            Icons.Outlined.Bolt,
+            contentDescription = stringResource(R.string.icon_descr_instant_notifications),
+          )
+          Text(stringResource(R.string.private_instant_notifications), fontWeight = FontWeight.Bold)
+        }
+      },
+      text = {
+        Column {
+          Text(
+            annotatedStringResource(R.string.to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery),
+            Modifier.padding(bottom = 8.dp)
+          )
+          Text(annotatedStringResource(R.string.turn_off_battery_optimization))
+        }
+      },
+      confirmButton = {
+        Button(onClick = ignoreOptimization) { Text(stringResource(R.string.ok)) }
+      }
+    )
+  }
 
-  fun getRunServiceInBackground(): Boolean = sharedPreferences.getBoolean(SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND, true)
+  private fun showDisablingServiceNotice() = AlertManager.shared.showAlert {
+    AlertDialog(
+      onDismissRequest = AlertManager.shared::hideAlert,
+      title = {
+        Row {
+          Icon(
+            Icons.Outlined.Bolt,
+            contentDescription = stringResource(R.string.icon_descr_instant_notifications),
+          )
+          Text(stringResource(R.string.private_instant_notifications_disabled), fontWeight = FontWeight.Bold)
+        }
+      },
+      text = {
+        Column {
+          Text(
+            annotatedStringResource(R.string.turning_off_background_service),
+            Modifier.padding(bottom = 8.dp)
+          )
+        }
+      },
+      confirmButton = {
+        Button(onClick = AlertManager.shared::hideAlert) { Text(stringResource(R.string.ok)) }
+      }
+    )
+  }
 
-  fun setRunServiceInBackground(runService: Boolean) =
-    sharedPreferences.edit()
-      .putBoolean(SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND, runService)
-      .apply()
+  fun showLANotice(activity: FragmentActivity) {
+    Log.d(TAG, "showLANotice")
+    if (!appPrefs.laNoticeShown.get()) {
+      appPrefs.laNoticeShown.set(true)
+      AlertManager.shared.showAlertDialog(
+        title = generalGetString(R.string.la_notice_title_simplex_lock),
+        text = generalGetString(R.string.la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled),
+        confirmText = generalGetString(R.string.la_notice_turn_on),
+        onConfirm = {
+          authenticate(
+            generalGetString(R.string.auth_enable_simplex_lock),
+            generalGetString(R.string.auth_confirm_credential),
+            activity,
+            completed = { laResult ->
+              when (laResult) {
+                LAResult.Success -> {
+                  chatModel.performLA.value = true
+                  appPrefs.performLA.set(true)
+                  laTurnedOnAlert()
+                }
+                is LAResult.Error -> {
+                  chatModel.performLA.value = false
+                  appPrefs.performLA.set(false)
+                  laErrorToast(appContext, laResult.errString)
+                }
+                LAResult.Failed -> {
+                  chatModel.performLA.value = false
+                  appPrefs.performLA.set(false)
+                  laFailedToast(appContext)
+                }
+                LAResult.Unavailable -> {
+                  chatModel.performLA.value = false
+                  appPrefs.performLA.set(false)
+                  chatModel.showAdvertiseLAUnavailableAlert.value = true
+                }
+              }
+            }
+          )
+        }
+      )
+    }
+  }
 
-  fun getBackgroundServiceNoticeShown(): Boolean = sharedPreferences.getBoolean(SHARED_PREFS_SERVICE_NOTICE_SHOWN, false)
+  fun isIgnoringBatteryOptimizations(context: Context): Boolean {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return true
+    val powerManager = context.getSystemService(Application.POWER_SERVICE) as PowerManager
+    return powerManager.isIgnoringBatteryOptimizations(context.packageName)
+  }
 
-  fun setBackgroundServiceNoticeShown() =
-    sharedPreferences.edit()
-      .putBoolean(SHARED_PREFS_SERVICE_NOTICE_SHOWN, true)
-      .apply()
+  private fun askAboutIgnoringBatteryOptimization(context: Context) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) return
 
-  companion object {
-    private const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_APP_PREFS"
-    private const val SHARED_PREFS_AUTO_RESTART_WORKER_VERSION = "AutoRestartWorkerVersion"
-    private const val SHARED_PREFS_RUN_SERVICE_IN_BACKGROUND = "RunServiceInBackground"
-    private const val SHARED_PREFS_SERVICE_NOTICE_SHOWN = "BackgroundServiceNoticeShown"
+    Intent().apply {
+      @SuppressLint("BatteryLife")
+      action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+      data = Uri.parse("package:${context.packageName}")
+      // This flag is needed when you start a new activity from non-Activity context
+      addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+      context.startActivity(this)
+    }
   }
 }
 
+class Preference<T>(val get: () -> T, val set: (T) -> Unit)
+
 // ChatCommand
 sealed class CC {
   class Console(val cmd: String): CC()
@@ -604,6 +848,7 @@ sealed class CC {
   class AddContact: CC()
   class Connect(val connReq: String): CC()
   class ApiDeleteChat(val type: ChatType, val id: Long): CC()
+  class ApiClearChat(val type: ChatType, val id: Long): CC()
   class ApiUpdateProfile(val profile: Profile): CC()
   class ApiParseMarkdown(val text: String): CC()
   class CreateMyAddress: CC()
@@ -637,6 +882,7 @@ sealed class CC {
     is AddContact -> "/connect"
     is Connect -> "/connect $connReq"
     is ApiDeleteChat -> "/_delete ${chatRef(type, id)}"
+    is ApiClearChat -> "/_clear chat ${chatRef(type, id)}"
     is ApiUpdateProfile -> "/_profile ${json.encodeToString(profile)}"
     is ApiParseMarkdown -> "/_parse $text"
     is CreateMyAddress -> "/address"
@@ -650,7 +896,7 @@ sealed class CC {
     is ApiSendCallAnswer -> "/_call answer @${contact.apiId} ${json.encodeToString(answer)}"
     is ApiSendCallExtraInfo -> "/_call extra @${contact.apiId} ${json.encodeToString(extraInfo)}"
     is ApiEndCall -> "/_call end @${contact.apiId}"
-    is ApiCallStatus -> "/_call status @${contact.apiId} ${callStatus}"
+    is ApiCallStatus -> "/_call status @${contact.apiId} ${callStatus.value}"
     is ApiChatRead -> "/_read chat ${chatRef(type, id)} from=${range.from} to=${range.to}"
     is ReceiveFile -> "/freceive $fileId"
   }
@@ -671,6 +917,7 @@ sealed class CC {
     is AddContact -> "addContact"
     is Connect -> "connect"
     is ApiDeleteChat -> "apiDeleteChat"
+    is ApiClearChat -> "apiClearChat"
     is ApiUpdateProfile -> "updateProfile"
     is ApiParseMarkdown -> "apiParseMarkdown"
     is CreateMyAddress -> "createMyAddress"
@@ -742,6 +989,7 @@ sealed class CR {
   @Serializable @SerialName("sentInvitation") class SentInvitation: CR()
   @Serializable @SerialName("contactAlreadyExists") class ContactAlreadyExists(val contact: Contact): CR()
   @Serializable @SerialName("contactDeleted") class ContactDeleted(val contact: Contact): CR()
+  @Serializable @SerialName("chatCleared") class ChatCleared(val chatInfo: ChatInfo): CR()
   @Serializable @SerialName("userProfileNoChange") class UserProfileNoChange: CR()
   @Serializable @SerialName("userProfileUpdated") class UserProfileUpdated(val fromProfile: Profile, val toProfile: Profile): CR()
   @Serializable @SerialName("apiParsedMarkdown") class ParsedMarkdown(val formattedText: List<FormattedText>? = null): CR()
@@ -774,8 +1022,8 @@ sealed class CR {
   @Serializable @SerialName("sndFileCancelled") class SndFileCancelled(val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
   @Serializable @SerialName("sndFileRcvCancelled") class SndFileRcvCancelled(val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
   @Serializable @SerialName("sndGroupFileCancelled") class SndGroupFileCancelled(val chatItem: AChatItem, val fileTransferMeta: FileTransferMeta, val sndFileTransfers: List<SndFileTransfer>): CR()
-  @Serializable @SerialName("callInvitation") class CallInvitation(val contact: Contact, val callType: CallType, val sharedKey: String?): CR()
-  @Serializable @SerialName("callOffer") class CallOffer(val contact: Contact, val callType: CallType, val offer: WebRTCSession, val sharedKey: String?, val askConfirmation: Boolean): CR()
+  @Serializable @SerialName("callInvitation") class CallInvitation(val contact: Contact, val callType: CallType, val sharedKey: String? = null, val callTs: Instant): CR()
+  @Serializable @SerialName("callOffer") class CallOffer(val contact: Contact, val callType: CallType, val offer: WebRTCSession, val sharedKey: String? = null, val askConfirmation: Boolean): CR()
   @Serializable @SerialName("callAnswer") class CallAnswer(val contact: Contact, val answer: WebRTCSession): CR()
   @Serializable @SerialName("callExtraInfo") class CallExtraInfo(val contact: Contact, val extraInfo: WebRTCExtraInfo): CR()
   @Serializable @SerialName("callEnded") class CallEnded(val contact: Contact): CR()
@@ -799,6 +1047,7 @@ sealed class CR {
     is SentInvitation -> "sentInvitation"
     is ContactAlreadyExists -> "contactAlreadyExists"
     is ContactDeleted -> "contactDeleted"
+    is ChatCleared -> "chatCleared"
     is UserProfileNoChange -> "userProfileNoChange"
     is UserProfileUpdated -> "userProfileUpdated"
     is ParsedMarkdown -> "apiParsedMarkdown"
@@ -857,6 +1106,7 @@ sealed class CR {
     is SentInvitation -> noDetails()
     is ContactAlreadyExists -> json.encodeToString(contact)
     is ContactDeleted -> json.encodeToString(contact)
+    is ChatCleared -> json.encodeToString(chatInfo)
     is UserProfileNoChange -> noDetails()
     is UserProfileUpdated -> json.encodeToString(toProfile)
     is ParsedMarkdown -> json.encodeToString(formattedText)

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Color.kt

@@ -8,13 +8,19 @@ val Purple700 = Color(0xFF3700B3)
 val Teal200 = Color(0xFF03DAC5)
 val Gray = Color(0x22222222)
 val SimplexBlue = Color(0, 136, 255, 255)  // If this value changes also need to update #0088ff in string resource files
-val SimplexGreen = Color(98, 196, 103, 255)
+val SimplexGreen = Color(77, 218, 103, 255)
 val SecretColor = Color(0x40808080)
 val LightGray = Color(241, 242, 246, 255)
 val DarkGray = Color(43, 44, 46, 255)
-val HighOrLowlight = Color(134, 135, 139, 255)
+val HighOrLowlight = Color(139, 135, 134, 255)
+val MessagePreviewDark = Color(179, 175, 174, 255)
+val MessagePreviewLight = Color(49, 45, 44, 255)
 val ToolbarLight = Color(220, 220, 220, 20)
 val ToolbarDark = Color(80, 80, 80, 20)
-val WarningOrange = Color(255, 149, 0, 255)
+val SettingsBackgroundLight = Color(220, 216, 215, 90)
+val GroupDark = Color(80, 80, 80, 60)
+val IncomingCallLight = Color(239, 237, 236, 255)
+val IncomingCallDark = Color(34, 30, 29, 255)
+val WarningOrange = Color(255, 127, 0, 255)
 val FileLight = Color(183, 190, 199, 255)
 val FileDark = Color(101, 101, 106, 255)

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt

@@ -3,6 +3,7 @@ package chat.simplex.app.ui.theme
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
 
 private val DarkColorPalette = darkColors(
   primary = SimplexBlue,  // If this value changes also need to update #0088ff in string resource files
@@ -13,10 +14,8 @@ private val DarkColorPalette = darkColors(
 //  background = Color(0xFF121212),
 //  surface = Color(0xFF121212),
 //  error = Color(0xFFCF6679),
-//  onPrimary = Color.Black,
-//  onSecondary = Color.Black,
-//  onBackground = Color.White,
-//  onSurface = Color.White,
+  onBackground = Color(0xFFFFFBFA),
+  onSurface = Color(0xFFFFFBFA),
 //  onError: Color = Color.Black,
 )
 private val LightColorPalette = lightColors(

apps/android/app/src/main/java/chat/simplex/app/ui/theme/Type.kt

@@ -30,7 +30,7 @@ val Typography = Typography(
   h3 = TextStyle(
     fontFamily = Inter,
     fontWeight = FontWeight.Normal,
-    fontSize = 19.sp
+    fontSize = 18.5.sp
   ),
   body1 = TextStyle(
     fontFamily = Inter,

apps/android/app/src/main/java/chat/simplex/app/views/TerminalView.kt

@@ -26,7 +26,7 @@ import kotlinx.coroutines.launch
 
 @Composable
 fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
-  val composeState = remember { mutableStateOf(ComposeState()) }
+  val composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }
   BackHandler(onBack = close)
   TerminalLayout(
     chatModel.terminalItems,
@@ -35,6 +35,7 @@ fun TerminalView(chatModel: ChatModel, close: () -> Unit) {
       withApi {
         // show "in progress"
         chatModel.controller.sendCmd(CC.Console(composeState.value.message))
+        composeState.value = ComposeState(useLinkPreviews = false)
         // hide "in progress"
       }
     },
@@ -119,7 +120,7 @@ fun PreviewTerminalLayout() {
   SimpleXTheme {
     TerminalLayout(
       terminalItems = TerminalItem.sampleData,
-      composeState = remember { mutableStateOf(ComposeState()) },
+      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) },
       sendCommand = {},
       close = {}
     )

apps/android/app/src/main/java/chat/simplex/app/views/WelcomeView.kt

@@ -87,7 +87,7 @@ fun CreateProfilePanel(chatModel: ChatModel) {
         val createModifier: Modifier
         val createColor: Color
         if (enabled) {
-          createModifier = Modifier.padding(8.dp).clickable { createProfile(chatModel, displayName.value, fullName.value) }
+          createModifier = Modifier.clickable { createProfile(chatModel, displayName.value, fullName.value) }.padding(8.dp)
           createColor = MaterialTheme.colors.primary
         } else {
           createModifier = Modifier.padding(8.dp)
@@ -115,8 +115,7 @@ fun createProfile(chatModel: ChatModel, displayName: String, fullName: String) {
     )
     chatModel.controller.startChat(user)
     SimplexService.start(chatModel.controller.appContext)
-    // TODO show it later?
-    chatModel.controller.showBackgroundServiceNotice()
+    chatModel.controller.showBackgroundServiceNoticeIfNeeded()
     chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/call/CallManager.kt

@@ -0,0 +1,101 @@
+package chat.simplex.app.views.call
+
+import android.util.Log
+import chat.simplex.app.TAG
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.views.helpers.ModalManager
+import chat.simplex.app.views.helpers.withApi
+import kotlinx.datetime.Clock
+import kotlin.time.Duration.Companion.minutes
+
+class CallManager(val chatModel: ChatModel) {
+  fun reportNewIncomingCall(invitation: CallInvitation) {
+    Log.d(TAG, "CallManager.reportNewIncomingCall")
+    with (chatModel) {
+      callInvitations[invitation.contact.id] = invitation
+      if (!chatModel.controller.appPrefs.experimentalCalls.get()) return
+      if (Clock.System.now() - invitation.callTs <= 3.minutes) {
+        activeCallInvitation.value = invitation
+        controller.ntfManager.notifyCallInvitation(invitation)
+      } else {
+        val contact = invitation.contact
+        controller.ntfManager.notifyMessageReceived(chatId = contact.id, displayName = contact.displayName, msgText = invitation.callTypeText)
+      }
+    }
+  }
+
+  fun acceptIncomingCall(invitation: CallInvitation) {
+    ModalManager.shared.closeModals()
+    val call = chatModel.activeCall.value
+    if (call == null) {
+      justAcceptIncomingCall(invitation = invitation)
+    } else {
+      withApi {
+        chatModel.switchingCall.value = true
+        try {
+          endCall(call = call)
+          justAcceptIncomingCall(invitation = invitation)
+        } finally {
+          withApi { chatModel.switchingCall.value = false }
+        }
+      }
+    }
+  }
+
+  private fun justAcceptIncomingCall(invitation: CallInvitation) {
+    with (chatModel) {
+      activeCall.value = Call(
+        contact = invitation.contact,
+        callState = CallState.InvitationAccepted,
+        localMedia = invitation.peerMedia,
+        sharedKey = invitation.sharedKey
+      )
+      showCallView.value = true
+      val useRelay = controller.appPrefs.webrtcPolicyRelay.get()
+      callCommand.value = WCallCommand.Start (media = invitation.peerMedia, aesKey = invitation.sharedKey, relay = useRelay)
+      callInvitations.remove(invitation.contact.id)
+      if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
+        activeCallInvitation.value = null
+        controller.ntfManager.cancelCallNotification()
+      }
+    }
+  }
+
+  suspend fun endCall(call: Call) {
+    with (chatModel) {
+      if (call.callState == CallState.Ended) {
+        Log.d(TAG, "CallManager.endCall: call ended")
+        activeCall.value = null
+        showCallView.value = false
+      } else {
+        Log.d(TAG, "CallManager.endCall: ending call...")
+        callCommand.value = WCallCommand.End
+        showCallView.value = false
+        controller.apiEndCall(call.contact)
+        activeCall.value = null
+      }
+    }
+  }
+
+  fun endCall(invitation: CallInvitation) {
+    with (chatModel) {
+      callInvitations.remove(invitation.contact.id)
+      if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
+        activeCallInvitation.value = null
+        controller.ntfManager.cancelCallNotification()
+      }
+      withApi {
+        if (!controller.apiRejectCall(invitation.contact)) {
+          Log.e(TAG, "apiRejectCall error")
+        }
+      }
+    }
+  }
+
+  fun reportCallRemoteEnded(invitation: CallInvitation) {
+    if (chatModel.activeCallInvitation.value?.contact?.id == invitation.contact.id) {
+      chatModel.activeCallInvitation.value = null
+      chatModel.controller.ntfManager.cancelCallNotification()
+    }
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/call/CallView.kt

@@ -1,39 +1,273 @@
 package chat.simplex.app.views.call
 
 import android.Manifest
-import android.annotation.SuppressLint
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.util.Log
 import android.view.ViewGroup
 import android.webkit.*
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.background
+import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
+import chat.simplex.app.R
 import chat.simplex.app.TAG
-import chat.simplex.app.views.helpers.TextEditor
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.helpers.ProfileImage
+import chat.simplex.app.views.helpers.withApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
+import kotlinx.coroutines.delay
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
 
-@SuppressLint("SetJavaScriptEnabled")
 @Composable
-fun VideoCallView(close: () -> Unit) {
-  BackHandler(onBack = close)
-  lateinit var wv: WebView
-  val context = LocalContext.current
-  val clipboard = ContextCompat.getSystemService(context, ClipboardManager::class.java)
+fun ActiveCallView(chatModel: ChatModel) {
+  BackHandler(onBack = {
+    val call = chatModel.activeCall.value
+    if (call != null) withApi { chatModel.callManager.endCall(call) }
+  })
+  Box(Modifier.fillMaxSize()) {
+    WebRTCView(chatModel.callCommand) { apiMsg ->
+      Log.d(TAG, "received from WebRTCView: $apiMsg")
+      val call = chatModel.activeCall.value
+      if (call != null) {
+        Log.d(TAG, "has active call $call")
+        when (val r = apiMsg.resp) {
+          is WCallResponse.Capabilities -> withApi {
+            val callType = CallType(call.localMedia, r.capabilities)
+            chatModel.controller.apiSendCallInvitation(call.contact, callType)
+            chatModel.activeCall.value = call.copy(callState = CallState.InvitationSent, localCapabilities = r.capabilities)
+          }
+          is WCallResponse.Offer -> withApi {
+            chatModel.controller.apiSendCallOffer(call.contact, r.offer, r.iceCandidates, call.localMedia, r.capabilities)
+            chatModel.activeCall.value = call.copy(callState = CallState.OfferSent, localCapabilities = r.capabilities)
+          }
+          is WCallResponse.Answer -> withApi {
+            chatModel.controller.apiSendCallAnswer(call.contact, r.answer, r.iceCandidates)
+            chatModel.activeCall.value = call.copy(callState = CallState.Negotiated)
+          }
+          is WCallResponse.Ice -> withApi {
+            chatModel.controller.apiSendCallExtraInfo(call.contact, r.iceCandidates)
+          }
+          is WCallResponse.Connection ->
+            try {
+              val callStatus = json.decodeFromString<WebRTCCallStatus>("\"${r.state.connectionState}\"")
+              if (callStatus == WebRTCCallStatus.Connected) {
+                chatModel.activeCall.value = call.copy(callState = CallState.Connected)
+              }
+              withApi { chatModel.controller.apiCallStatus(call.contact, callStatus) }
+            } catch (e: Error) {
+              Log.d(TAG,"call status ${r.state.connectionState} not used")
+            }
+          is WCallResponse.Connected -> {
+            chatModel.activeCall.value = call.copy(callState = CallState.Connected, connectionInfo = r.connectionInfo)
+          }
+          is WCallResponse.Ended -> {
+            chatModel.activeCall.value = call.copy(callState = CallState.Ended)
+            withApi { chatModel.callManager.endCall(call) }
+            chatModel.showCallView.value = false
+          }
+          is WCallResponse.Ok -> when (val cmd = apiMsg.command) {
+            is WCallCommand.Answer ->
+              chatModel.activeCall.value = call.copy(callState = CallState.Negotiated)
+            is WCallCommand.Media -> {
+              when (cmd.media) {
+                CallMediaType.Video -> chatModel.activeCall.value = call.copy(videoEnabled = cmd.enable)
+                CallMediaType.Audio -> chatModel.activeCall.value = call.copy(audioEnabled = cmd.enable)
+              }
+            }
+            is WCallCommand.Camera -> {
+              chatModel.activeCall.value = call.copy(localCamera = cmd.camera)
+              if (!call.audioEnabled) {
+                chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = false)
+              }
+            }
+            is WCallCommand.End ->
+              chatModel.showCallView.value = false
+            else -> {}
+          }
+          is WCallResponse.Error -> {
+            Log.e(TAG, "ActiveCallView: command error ${r.message}")
+          }
+        }
+      }
+    }
+    val call = chatModel.activeCall.value
+    if (call != null)  ActiveCallOverlay(call, chatModel)
+  }
+}
+
+@Composable
+private fun ActiveCallOverlay(call: Call, chatModel: ChatModel) {
+  ActiveCallOverlayLayout(
+    call = call,
+    dismiss = { withApi { chatModel.callManager.endCall(call) } },
+    toggleAudio = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = !call.audioEnabled) },
+    toggleVideo = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Video, enable = !call.videoEnabled) },
+    flipCamera = { chatModel.callCommand.value = WCallCommand.Camera(call.localCamera.flipped) }
+  )
+}
+
+@Composable
+private fun ActiveCallOverlayLayout(
+  call: Call,
+  dismiss: () -> Unit,
+  toggleAudio: () -> Unit,
+  toggleVideo: () -> Unit,
+  flipCamera: () -> Unit
+) {
+  Column(Modifier.padding(16.dp)) {
+    when (call.peerMedia ?: call.localMedia) {
+      CallMediaType.Video -> {
+        CallInfoView(call, alignment = Alignment.Start)
+        Spacer(Modifier.fillMaxHeight().weight(1f))
+        Row(Modifier.fillMaxWidth().padding(horizontal = 6.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) {
+          ToggleAudioButton(call, toggleAudio)
+          Spacer(Modifier.size(40.dp))
+          IconButton(onClick = dismiss) {
+            Icon(Icons.Filled.CallEnd, stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
+          }
+          if (call.videoEnabled) {
+            ControlButton(call, Icons.Filled.FlipCameraAndroid, R.string.icon_descr_flip_camera, flipCamera)
+            ControlButton(call, Icons.Filled.Videocam, R.string.icon_descr_video_off, toggleVideo)
+          } else {
+            Spacer(Modifier.size(48.dp))
+            ControlButton(call, Icons.Outlined.VideocamOff, R.string.icon_descr_video_on, toggleVideo)
+          }
+        }
+      }
+      CallMediaType.Audio -> {
+        Spacer(Modifier.fillMaxHeight().weight(1f))
+        Column(
+          Modifier.fillMaxWidth(),
+          horizontalAlignment = Alignment.CenterHorizontally,
+          verticalArrangement = Arrangement.Center
+        ) {
+          ProfileImage(size = 192.dp, image = call.contact.profile.image)
+          CallInfoView(call, alignment = Alignment.CenterHorizontally)
+        }
+        Spacer(Modifier.fillMaxHeight().weight(1f))
+        Box(Modifier.fillMaxWidth().padding(bottom = 48.dp), contentAlignment = Alignment.CenterStart) {
+          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
+            IconButton(onClick = dismiss) {
+              Icon(Icons.Filled.CallEnd, stringResource(R.string.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
+            }
+          }
+          Box(Modifier.padding(start = 32.dp)) {
+            ToggleAudioButton(call, toggleAudio)
+          }
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun ControlButton(call: Call, icon: ImageVector, @StringRes iconText: Int, action: () -> Unit) {
+  if (call.hasMedia) {
+    IconButton(onClick = action) {
+      Icon(icon, stringResource(iconText), tint = Color(0xFFFFFFD8), modifier = Modifier.size(40.dp))
+    }
+  } else {
+    Spacer(Modifier.size(40.dp))
+  }
+}
+
+@Composable
+private fun ToggleAudioButton(call: Call, toggleAudio: () -> Unit) {
+  if (call.audioEnabled) {
+    ControlButton(call, Icons.Outlined.Mic, R.string.icon_descr_video_off, toggleAudio)
+  } else {
+    ControlButton(call, Icons.Outlined.MicOff, R.string.icon_descr_audio_on, toggleAudio)
+  }
+}
+
+@Composable
+fun CallInfoView(call: Call, alignment: Alignment.Horizontal) {
+  @Composable fun InfoText(text: String, style: TextStyle = MaterialTheme.typography.body2) =
+    Text(text, color = Color(0xFFFFFFD8), style = style)
+  Column(horizontalAlignment = alignment) {
+    InfoText(call.contact.chatViewName, style = MaterialTheme.typography.h2)
+    InfoText(call.callState.text)
+
+    val connInfo =
+      if (call.connectionInfo == null) ""
+      else " (${call.connectionInfo.text})"
+    InfoText(call.encryptionStatus + connInfo)
+  }
+}
+
+//@Composable
+//fun CallViewDebug(close: () -> Unit) {
+//  val callCommand = remember { mutableStateOf<WCallCommand?>(null)}
+//  val commandText = remember { mutableStateOf("{\"command\": {\"type\": \"start\", \"media\": \"video\", \"aesKey\": \"FwW+t6UbnwHoapYOfN4mUBUuqR7UtvYWxW16iBqM29U=\"}}") }
+//  val clipboard = ContextCompat.getSystemService(LocalContext.current, ClipboardManager::class.java)
+//
+//  BackHandler(onBack = close)
+//  Column(
+//    horizontalAlignment = Alignment.CenterHorizontally,
+//    verticalArrangement = Arrangement.spacedBy(12.dp),
+//    modifier = Modifier
+//      .background(MaterialTheme.colors.background)
+//      .fillMaxSize()
+//  ) {
+//    WebRTCView(callCommand) { apiMsg ->
+//      // for debugging
+//      // commandText.value = apiMsg
+//      commandText.value = json.encodeToString(apiMsg)
+//    }
+//
+//    TextEditor(Modifier.height(180.dp), text = commandText)
+//
+//    Row(
+//      Modifier
+//        .fillMaxWidth()
+//        .padding(bottom = 6.dp),
+//      horizontalArrangement = Arrangement.SpaceBetween
+//    ) {
+//      Button(onClick = {
+//        val clip: ClipData = ClipData.newPlainText("js command", commandText.value)
+//        clipboard?.setPrimaryClip(clip)
+//      }) { Text("Copy") }
+//      Button(onClick = {
+//        try {
+//          val apiCall: WVAPICall = json.decodeFromString(commandText.value)
+//          commandText.value = ""
+//          println("sending: ${commandText.value}")
+//          callCommand.value = apiCall.command
+//        } catch(e: Error) {
+//          println("error parsing command: ${commandText.value}")
+//          println(e)
+//        }
+//      }) { Text("Send") }
+//      Button(onClick = {
+//        commandText.value = ""
+//      }) { Text("Clear") }
+//    }
+//  }
+//}
+
+@Composable
+fun WebRTCView(callCommand: MutableState<WCallCommand?>, onResponse: (WVAPIMessage) -> Unit) {
+  val webView = remember { mutableStateOf<WebView?>(null) }
   val permissionsState = rememberMultiplePermissionsState(
     permissions = listOf(
       Manifest.permission.CAMERA,
@@ -42,6 +276,10 @@ fun VideoCallView(close: () -> Unit) {
       Manifest.permission.INTERNET
     )
   )
+  fun processCommand(wv: WebView, cmd: WCallCommand) {
+    val apiCall = WVAPICall(command = cmd)
+    wv.evaluateJavascript("processCommand(${json.encodeToString(apiCall)})", null)
+  }
   val lifecycleOwner = LocalLifecycleOwner.current
   DisposableEffect(lifecycleOwner) {
     val observer = LifecycleEventObserver { _, event ->
@@ -50,98 +288,83 @@ fun VideoCallView(close: () -> Unit) {
       }
     }
     lifecycleOwner.lifecycle.addObserver(observer)
-
     onDispose {
-      wv.evaluateJavascript("endCall()", null)
+      val wv = webView.value
+      if (wv != null) processCommand(wv, WCallCommand.End)
       lifecycleOwner.lifecycle.removeObserver(observer)
     }
   }
-  val localContext = LocalContext.current
-  val commandToShow = remember { mutableStateOf("processCommand({command: {type: 'start', media: 'video'}})") } //, aesKey: 'FwW+t6UbnwHoapYOfN4mUBUuqR7UtvYWxW16iBqM29U='})") }
+  LaunchedEffect(callCommand.value, webView.value) {
+    val cmd = callCommand.value
+    val wv = webView.value
+    if (cmd != null && wv != null) {
+      Log.d(TAG, "WebRTCView LaunchedEffect executing $cmd")
+      processCommand(wv, cmd)
+      callCommand.value = null
+    }
+  }
   val assetLoader = WebViewAssetLoader.Builder()
-    .addPathHandler("/assets/www/", WebViewAssetLoader.AssetsPathHandler(localContext))
+    .addPathHandler("/assets/www/", WebViewAssetLoader.AssetsPathHandler(LocalContext.current))
     .build()
 
-  Column(
-    horizontalAlignment = Alignment.CenterHorizontally,
-    verticalArrangement = Arrangement.spacedBy(12.dp),
-    modifier = Modifier
-      .background(MaterialTheme.colors.background)
-      .fillMaxSize()
-  ) {
-    if (permissionsState.allPermissionsGranted) {
-      Box(
-        Modifier
-          .fillMaxWidth()
-          .aspectRatio(ratio = 1F)
-      ) {
-        AndroidView(
-          factory = { AndroidViewContext ->
-            WebView(AndroidViewContext).apply {
-              layoutParams = ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT,
-              )
-              this.webChromeClient = object: WebChromeClient() {
-                override fun onPermissionRequest(request: PermissionRequest) {
-                  if (request.origin.toString().startsWith("file:/")) {
-                    request.grant(request.resources)
-                  } else {
-                    Log.d(TAG, "Permission request from webview denied.")
-                    request.deny()
-                  }
-                }
-
-                override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
-                  val rtnValue = super.onConsoleMessage(consoleMessage)
-                  val msg = consoleMessage?.message() as String
-                  if (msg.startsWith("{")) {
-                    commandToShow.value = "processCommand($msg)"
-                  }
-                  return rtnValue
+  if (permissionsState.allPermissionsGranted) {
+    Box(Modifier.fillMaxSize()) {
+      AndroidView(
+        factory = { AndroidViewContext ->
+          WebView(AndroidViewContext).apply {
+            layoutParams = ViewGroup.LayoutParams(
+              ViewGroup.LayoutParams.MATCH_PARENT,
+              ViewGroup.LayoutParams.MATCH_PARENT,
+            )
+            this.webChromeClient = object: WebChromeClient() {
+              override fun onPermissionRequest(request: PermissionRequest) {
+                if (request.origin.toString().startsWith("file:/")) {
+                  request.grant(request.resources)
+                } else {
+                  Log.d(TAG, "Permission request from webview denied.")
+                  request.deny()
                 }
               }
-              this.webViewClient = LocalContentWebViewClient(assetLoader)
-              this.clearHistory()
-              this.clearCache(true)
-//              this.addJavascriptInterface(JavascriptInterface(), "Android")
-              val webViewSettings = this.settings
-              webViewSettings.allowFileAccess = true
-              webViewSettings.allowContentAccess = true
-              webViewSettings.javaScriptEnabled = true
-              webViewSettings.mediaPlaybackRequiresUserGesture = false
-              webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
-              this.loadUrl("file:android_asset/www/call.html")
             }
+            this.webViewClient = LocalContentWebViewClient(assetLoader)
+            this.clearHistory()
+            this.clearCache(true)
+            this.addJavascriptInterface(WebRTCInterface(onResponse), "WebRTCInterface")
+            val webViewSettings = this.settings
+            webViewSettings.allowFileAccess = true
+            webViewSettings.allowContentAccess = true
+            webViewSettings.javaScriptEnabled = true
+            webViewSettings.mediaPlaybackRequiresUserGesture = false
+            webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
+            this.loadUrl("file:android_asset/www/call.html")
           }
-        ) {
-          wv = it
+        }
+      ) { wv ->
+        Log.d(TAG, "WebRTCView: webview ready")
+        // for debugging
+        // wv.evaluateJavascript("sendMessageToNative = ({resp}) => WebRTCInterface.postMessage(JSON.stringify({command: resp}))", null)
+        withApi {
+          delay(2000L)
+          wv.evaluateJavascript("sendMessageToNative = (msg) => WebRTCInterface.postMessage(JSON.stringify(msg))", null)
+          webView.value = wv
         }
       }
-    } else {
-      Text("NEED PERMISSIONS")
     }
+  }
+}
 
-    TextEditor(Modifier.height(180.dp), text = commandToShow)
-
-    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(bottom = 6.dp),
-      horizontalArrangement = Arrangement.SpaceBetween
-    ) {
-      Button( onClick = {
-        val clip: ClipData = ClipData.newPlainText("js command", commandToShow.value)
-        clipboard?.setPrimaryClip(clip)
-      }) {Text("Copy")}
-      Button( onClick = {
-        println("sending: ${commandToShow.value}")
-        wv.evaluateJavascript(commandToShow.value, null)
-        commandToShow.value = ""
-      }) {Text("Send")}
-      Button( onClick = {
-        commandToShow.value = ""
-      }) {Text("Clear")}
+// for debugging
+// class WebRTCInterface(private val onResponse: (String) -> Unit) {
+class WebRTCInterface(private val onResponse: (WVAPIMessage) -> Unit) {
+  @JavascriptInterface
+  fun postMessage(message: String) {
+    Log.d(TAG, "WebRTCInterface.postMessage")
+    try {
+      // for debugging
+      // onResponse(message)
+      onResponse(json.decodeFromString(message))
+    } catch (e: Error) {
+      Log.e(TAG, "failed parsing WebView message: $message")
     }
   }
 }
@@ -154,3 +377,43 @@ private class LocalContentWebViewClient(private val assetLoader: WebViewAssetLoa
     return assetLoader.shouldInterceptRequest(request.url)
   }
 }
+
+@Preview
+@Composable
+fun PreviewActiveCallOverlayVideo() {
+  SimpleXTheme {
+    ActiveCallOverlayLayout(
+      call = Call(
+        contact = Contact.sampleData,
+        callState = CallState.Negotiated,
+        localMedia = CallMediaType.Video,
+        peerMedia = CallMediaType.Video,
+        connectionInfo = ConnectionInfo(RTCIceCandidate(RTCIceCandidateType.Host), RTCIceCandidate(RTCIceCandidateType.Host))
+      ),
+      dismiss = {},
+      toggleAudio = {},
+      toggleVideo = {},
+      flipCamera = {}
+    )
+  }
+}
+
+@Preview
+@Composable
+fun PreviewActiveCallOverlayAudio() {
+  SimpleXTheme {
+    ActiveCallOverlayLayout(
+      call = Call(
+        contact = Contact.sampleData,
+        callState = CallState.Negotiated,
+        localMedia = CallMediaType.Audio,
+        peerMedia = CallMediaType.Audio,
+        connectionInfo = ConnectionInfo(RTCIceCandidate(RTCIceCandidateType.Host), RTCIceCandidate(RTCIceCandidateType.Host))
+      ),
+      dismiss = {},
+      toggleAudio = {},
+      toggleVideo = {},
+      flipCamera = {}
+    )
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt

@@ -0,0 +1,227 @@
+package chat.simplex.app.views.call
+
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.Intent
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
+import android.view.WindowManager
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.viewModels
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.*
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.model.NtfManager.Companion.OpenChatAction
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.ProfileImage
+import chat.simplex.app.views.onboarding.SimpleXLogo
+import kotlinx.datetime.Clock
+
+class IncomingCallActivity: ComponentActivity() {
+  private val vm by viewModels<SimplexViewModel>()
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    val activity = this
+    setContent { IncomingCallActivityView(vm.chatModel, activity) }
+    unlockForIncomingCall()
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    lockAfterIncomingCall()
+  }
+
+  private fun unlockForIncomingCall() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+      setShowWhenLocked(true)
+      setTurnScreenOn(true)
+    } else {
+      window.addFlags(activityFlags)
+    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      getKeyguardManager(this).requestDismissKeyguard(this, null)
+    }
+  }
+
+  private fun lockAfterIncomingCall() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+      setShowWhenLocked(false)
+      setTurnScreenOn(false)
+    } else {
+      window.clearFlags(activityFlags)
+    }
+  }
+
+  companion object {
+    const val activityFlags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
+  }
+}
+
+fun getKeyguardManager(context: Context): KeyguardManager =
+  context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+
+@Composable
+fun IncomingCallActivityView(m: ChatModel, activity: IncomingCallActivity) {
+  val switchingCall = m.switchingCall.value
+  val invitation = m.activeCallInvitation.value
+  val call = m.activeCall.value
+  val showCallView = m.showCallView.value
+  LaunchedEffect(invitation, call, switchingCall, showCallView) {
+    if (!switchingCall && invitation == null && (!showCallView || call == null)) {
+      Log.d(TAG, "IncomingCallActivityView: finishing activity")
+      activity.finish()
+    }
+  }
+  SimpleXTheme {
+    Surface(
+      Modifier
+        .background(MaterialTheme.colors.background)
+        .fillMaxSize()) {
+      if (showCallView) {
+        Box {
+          ActiveCallView(m)
+          if (invitation != null) IncomingCallAlertView(invitation, m)
+        }
+      } else if (invitation != null) {
+        IncomingCallLockScreenAlert(invitation, m, activity)
+      }
+    }
+  }
+}
+
+@Composable
+fun IncomingCallLockScreenAlert(invitation: CallInvitation, chatModel: ChatModel, activity: IncomingCallActivity) {
+  val cm = chatModel.callManager
+  val cxt = LocalContext.current
+  val scope = rememberCoroutineScope()
+  var callOnLockScreen by remember { mutableStateOf(chatModel.controller.appPrefs.callOnLockScreen.get()) }
+  LaunchedEffect(true) { SoundPlayer.shared.start(cxt, scope, sound = true) }
+  DisposableEffect(true) { onDispose { SoundPlayer.shared.stop() } }
+  IncomingCallLockScreenAlertLayout(
+    invitation,
+    callOnLockScreen,
+    rejectCall = { cm.endCall(invitation = invitation) },
+    ignoreCall = { chatModel.activeCallInvitation.value = null },
+    acceptCall = { cm.acceptIncomingCall(invitation = invitation) },
+    openApp = {
+      SoundPlayer.shared.stop()
+      var intent = Intent(activity, MainActivity::class.java)
+        .setAction(OpenChatAction)
+        .putExtra("chatId", invitation.contact.id)
+      activity.startActivity(intent)
+      activity.finish()
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        getKeyguardManager(activity).requestDismissKeyguard(activity, null)
+      }
+    }
+  )
+}
+
+@Composable
+fun IncomingCallLockScreenAlertLayout(
+  invitation: CallInvitation,
+  callOnLockScreen: CallOnLockScreen?,
+  rejectCall: () -> Unit,
+  ignoreCall: () -> Unit,
+  acceptCall: () -> Unit,
+  openApp: () -> Unit
+) {
+  Column(
+    Modifier
+      .padding(30.dp)
+      .fillMaxSize(),
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    IncomingCallInfo(invitation)
+    Spacer(Modifier.fillMaxHeight().weight(1f))
+    if (callOnLockScreen == CallOnLockScreen.ACCEPT) {
+      ProfileImage(size = 192.dp, image = invitation.contact.profile.image)
+      Text(invitation.contact.chatViewName, style = MaterialTheme.typography.h2)
+      Spacer(Modifier.fillMaxHeight().weight(1f))
+      Row {
+        LockScreenCallButton(stringResource(R.string.reject), Icons.Filled.CallEnd, Color.Red, rejectCall)
+        Spacer(Modifier.size(48.dp))
+        LockScreenCallButton(stringResource(R.string.ignore), Icons.Filled.Close, MaterialTheme.colors.primary, ignoreCall)
+        Spacer(Modifier.size(48.dp))
+        LockScreenCallButton(stringResource(R.string.accept), Icons.Filled.Check, SimplexGreen, acceptCall)
+      }
+    } else if (callOnLockScreen == CallOnLockScreen.SHOW) {
+      SimpleXLogo()
+      Text(stringResource(R.string.open_simplex_chat_to_accept_call), textAlign = TextAlign.Center, lineHeight = 22.sp)
+      Text(stringResource(R.string.allow_accepting_calls_from_lock_screen), textAlign = TextAlign.Center, style = MaterialTheme.typography.body2, lineHeight = 22.sp)
+      Spacer(Modifier.fillMaxHeight().weight(1f))
+      SimpleButton(text = stringResource(R.string.open_verb), icon = Icons.Filled.Check, click = openApp)
+    }
+  }
+}
+
+@Composable
+private fun LockScreenCallButton(text: String, icon: ImageVector, color: Color, action: () -> Unit) {
+  Surface(
+    shape = RoundedCornerShape(10.dp),
+    color = Color.Transparent
+  ) {
+    Column(
+      Modifier
+        .defaultMinSize(minWidth = 50.dp)
+        .padding(4.dp),
+      horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+      IconButton(action) {
+        Icon(icon, text, tint = color, modifier = Modifier.scale(1.75f))
+      }
+      Spacer(Modifier.height(16.dp))
+      Text(text, style = MaterialTheme.typography.body2, color = HighOrLowlight)
+    }
+  }
+}
+
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true
+)
+@Composable
+fun PreviewIncomingCallLockScreenAlert() {
+  SimpleXTheme(true) {
+    Surface(
+      Modifier
+        .background(MaterialTheme.colors.background)
+        .fillMaxSize()) {
+      IncomingCallLockScreenAlertLayout(
+        invitation = CallInvitation(
+          contact = Contact.sampleData,
+          peerMedia = CallMediaType.Audio,
+          sharedKey = null,
+          callTs = Clock.System.now()
+        ),
+        callOnLockScreen = null,
+        rejectCall = {},
+        ignoreCall = {},
+        acceptCall = {},
+        openApp = {},
+      )
+    }
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallAlertView.kt

@@ -0,0 +1,108 @@
+package chat.simplex.app.views.call
+
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.model.Contact
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.usersettings.ProfilePreview
+import kotlinx.datetime.Clock
+
+@Composable
+fun IncomingCallAlertView(invitation: CallInvitation, chatModel: ChatModel) {
+  val cm = chatModel.callManager
+  val cxt = LocalContext.current
+  val scope = rememberCoroutineScope()
+  LaunchedEffect(true) { SoundPlayer.shared.start(cxt, scope, sound = !chatModel.showCallView.value) }
+  DisposableEffect(true) { onDispose { SoundPlayer.shared.stop() } }
+  IncomingCallAlertLayout(
+    invitation,
+    rejectCall = { cm.endCall(invitation = invitation) },
+    ignoreCall = { chatModel.activeCallInvitation.value = null },
+    acceptCall = { cm.acceptIncomingCall(invitation = invitation) }
+  )
+}
+
+@Composable
+fun IncomingCallAlertLayout(
+  invitation: CallInvitation,
+  rejectCall: () -> Unit,
+  ignoreCall: () -> Unit,
+  acceptCall: () -> Unit
+) {
+  val color = if (isSystemInDarkTheme()) IncomingCallDark else IncomingCallLight
+  Column(Modifier.background(color).padding(top = 16.dp, bottom = 16.dp, start = 16.dp, end = 8.dp)) {
+    IncomingCallInfo(invitation)
+    Spacer(Modifier.height(8.dp))
+    Row(verticalAlignment = Alignment.CenterVertically) {
+      ProfilePreview(profileOf = invitation.contact, size = 64.dp, color = Color.White)
+      Spacer(Modifier.fillMaxWidth().weight(1f))
+      CallButton(stringResource(R.string.reject), Icons.Filled.CallEnd, Color.Red, rejectCall)
+      CallButton(stringResource(R.string.ignore), Icons.Filled.Close, MaterialTheme.colors.primary, ignoreCall)
+      CallButton(stringResource(R.string.accept), Icons.Filled.Check, SimplexGreen, acceptCall)
+    }
+  }
+}
+
+@Composable
+fun IncomingCallInfo(invitation: CallInvitation) {
+  @Composable fun CallIcon(icon: ImageVector, descr: String) = Icon(icon, descr, tint = SimplexGreen)
+  Row {
+    if (invitation.peerMedia == CallMediaType.Video) CallIcon(Icons.Filled.Videocam, stringResource(R.string.icon_descr_video_call))
+    else CallIcon(Icons.Filled.Phone, stringResource(R.string.icon_descr_audio_call))
+    Spacer(Modifier.width(4.dp))
+    Text(invitation.callTypeText)
+  }
+}
+
+@Composable
+private fun CallButton(text: String, icon: ImageVector, color: Color, action: () -> Unit) {
+  Surface(
+    shape = RoundedCornerShape(10.dp),
+    color = Color.Transparent
+  ) {
+    Column(
+      Modifier
+        .clickable(onClick = action)
+        .defaultMinSize(minWidth = 50.dp)
+        .padding(4.dp),
+      horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+      Icon(icon, text, tint = color, modifier = Modifier.scale(1.2f))
+      Text(text, style = MaterialTheme.typography.body2, color = HighOrLowlight)
+    }
+  }
+}
+
+@Preview
+@Composable
+fun PreviewIncomingCallAlertLayout() {
+  SimpleXTheme {
+    IncomingCallAlertLayout(
+      invitation = CallInvitation(
+        contact = Contact.sampleData,
+        peerMedia = CallMediaType.Audio,
+        sharedKey = null,
+        callTs = Clock.System.now()
+      ),
+      rejectCall = {},
+      ignoreCall = {},
+      acceptCall = {}
+    )
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/call/SoundPlayer.kt

@@ -0,0 +1,39 @@
+package chat.simplex.app.views.call
+
+import android.content.Context
+import android.media.MediaPlayer
+import android.os.VibrationEffect
+import android.os.Vibrator
+import androidx.core.content.ContextCompat
+import chat.simplex.app.R
+import chat.simplex.app.views.helpers.withScope
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
+
+class SoundPlayer {
+  var player: MediaPlayer? = null
+  var playing = false
+
+  fun start(cxt: Context, scope: CoroutineScope, sound: Boolean) {
+    if (sound) player = MediaPlayer.create(cxt, R.raw.ring_once)
+    val vibrator = ContextCompat.getSystemService(cxt, Vibrator::class.java)
+    val effect = VibrationEffect.createOneShot(250, VibrationEffect.DEFAULT_AMPLITUDE)
+    playing = true
+    withScope(scope) {
+      while (playing) {
+        if (sound) player?.start()
+        vibrator?.vibrate(effect)
+        delay(3500)
+      }
+    }
+  }
+
+  fun stop() {
+    playing = false
+    player?.stop()
+  }
+
+  companion object {
+    val shared = SoundPlayer()
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/call/WebRTC.kt

@@ -1,12 +1,15 @@
 package chat.simplex.app.views.call
 
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
 import chat.simplex.app.R
 import chat.simplex.app.model.Contact
 import chat.simplex.app.views.helpers.generalGetString
+import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-class Call(
+data class Call(
   val contact: Contact,
   val callState: CallState,
   val localMedia: CallMediaType,
@@ -14,77 +17,133 @@ class Call(
   val peerMedia: CallMediaType? = null,
   val sharedKey: String? = null,
   val audioEnabled: Boolean = true,
-  val videoEnabled: Boolean = localMedia == CallMediaType.Video
+  val videoEnabled: Boolean = localMedia == CallMediaType.Video,
+  var localCamera: VideoCamera = VideoCamera.User,
+  val connectionInfo: ConnectionInfo? = null
 ) {
-  val encrypted: Boolean get() = (localCapabilities?.encryption ?: false) && sharedKey != null
+  val encrypted: Boolean get() = localEncrypted && sharedKey != null
+  val localEncrypted: Boolean get() = localCapabilities?.encryption ?: false
+
+  val encryptionStatus: String @Composable get() = when(callState) {
+    CallState.WaitCapabilities -> ""
+    CallState.InvitationSent -> stringResource(if (localEncrypted) R.string.status_e2e_encrypted else R.string.status_no_e2e_encryption)
+    CallState.InvitationAccepted -> stringResource(if (sharedKey == null) R.string.status_contact_has_no_e2e_encryption else R.string.status_contact_has_e2e_encryption)
+    else -> stringResource(if (!localEncrypted) R.string.status_no_e2e_encryption else if (sharedKey == null) R.string.status_contact_has_no_e2e_encryption else R.string.status_e2e_encrypted)
+  }
+
+  val hasMedia: Boolean get() = callState == CallState.OfferSent || callState == CallState.Negotiated || callState == CallState.Connected
 }
 
 enum class CallState {
   WaitCapabilities,
   InvitationSent,
-  InvitationReceived,
+  InvitationAccepted,
   OfferSent,
   OfferReceived,
+  AnswerReceived,
   Negotiated,
-  Connected;
+  Connected,
+  Ended;
 
-  val text: String get() = when(this) {
-    WaitCapabilities -> generalGetString(R.string.callstate_starting)
-    InvitationSent -> generalGetString(R.string.callstate_waiting_for_answer)
-    InvitationReceived -> generalGetString(R.string.callstate_starting)
-    OfferSent -> generalGetString(R.string.callstate_waiting_for_confirmation)
-    OfferReceived -> generalGetString(R.string.callstate_received_answer)
-    Negotiated -> generalGetString(R.string.callstate_connecting)
-    Connected -> generalGetString(R.string.callstate_connected)
+  val text: String @Composable get() = when(this) {
+    WaitCapabilities -> stringResource(R.string.callstate_starting)
+    InvitationSent -> stringResource(R.string.callstate_waiting_for_answer)
+    InvitationAccepted -> stringResource(R.string.callstate_starting)
+    OfferSent -> stringResource(R.string.callstate_waiting_for_confirmation)
+    OfferReceived -> stringResource(R.string.callstate_received_answer)
+    AnswerReceived -> stringResource(R.string.callstate_received_confirmation)
+    Negotiated -> stringResource(R.string.callstate_connecting)
+    Connected -> stringResource(R.string.callstate_connected)
+    Ended -> stringResource(R.string.callstate_ended)
   }
 }
 
 @Serializable class WVAPICall(val corrId: Int? = null, val command: WCallCommand)
-@Serializable class WVAPIMessage(val corrId: Int? = null, val resp: WCallResponse, val command: WCallCommand?)
+@Serializable class WVAPIMessage(val corrId: Int? = null, val resp: WCallResponse, val command: WCallCommand? = null)
 
 @Serializable
 sealed class WCallCommand {
-  @Serializable @SerialName("capabilities") class Capabilities(): WCallCommand()
-  @Serializable @SerialName("start") class Start(val media: CallMediaType, val aesKey: String? = null): WCallCommand()
-  @Serializable @SerialName("accept") class Accept(val offer: String, val iceCandidates: List<String>, val media: CallMediaType, val aesKey: String? = null): WCallCommand()
-  @Serializable @SerialName("answer") class Answer (val answer: String, val iceCandidates: List<String>): WCallCommand()
-  @Serializable @SerialName("ice") class Ice(val iceCandidates: List<String>): WCallCommand()
+  @Serializable @SerialName("capabilities") object Capabilities: WCallCommand()
+  @Serializable @SerialName("start") class Start(val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
+  @Serializable @SerialName("offer") class Offer(val offer: String, val iceCandidates: String, val media: CallMediaType, val aesKey: String? = null, val iceServers: List<RTCIceServer>? = null, val relay: Boolean? = null): WCallCommand()
+  @Serializable @SerialName("answer") class Answer (val answer: String, val iceCandidates: String): WCallCommand()
+  @Serializable @SerialName("ice") class Ice(val iceCandidates: String): WCallCommand()
   @Serializable @SerialName("media") class Media(val media: CallMediaType, val enable: Boolean): WCallCommand()
-  @Serializable @SerialName("end") class End(): WCallCommand()
+  @Serializable @SerialName("camera") class Camera(val camera: VideoCamera): WCallCommand()
+  @Serializable @SerialName("end") object End: WCallCommand()
 }
 
 @Serializable
 sealed class WCallResponse {
   @Serializable @SerialName("capabilities") class Capabilities(val capabilities: CallCapabilities): WCallResponse()
-  @Serializable @SerialName("offer") class Offer(val offer: String, val iceCandidates: List<String>): WCallResponse()
-  // TODO remove accept, it is needed for debugging
-  @Serializable @SerialName("accept") class Accept(val offer: String, val iceCandidates: List<String>, val media: CallMediaType, val aesKey: String? = null): WCallResponse()
-  @Serializable @SerialName("answer") class Answer(val answer: String, val iceCandidates: List<String>): WCallResponse()
-  @Serializable @SerialName("ice") class Ice(val iceCandidates: List<String>): WCallResponse()
+  @Serializable @SerialName("offer") class Offer(val offer: String, val iceCandidates: String, val capabilities: CallCapabilities): WCallResponse()
+  @Serializable @SerialName("answer") class Answer(val answer: String, val iceCandidates: String): WCallResponse()
+  @Serializable @SerialName("ice") class Ice(val iceCandidates: String): WCallResponse()
   @Serializable @SerialName("connection") class Connection(val state: ConnectionState): WCallResponse()
-  @Serializable @SerialName("ended") class Ended(): WCallResponse()
-  @Serializable @SerialName("ok") class Ok(): WCallResponse()
+  @Serializable @SerialName("connected") class Connected(val connectionInfo: ConnectionInfo): WCallResponse()
+  @Serializable @SerialName("ended") object Ended: WCallResponse()
+  @Serializable @SerialName("ok") object Ok: WCallResponse()
   @Serializable @SerialName("error") class Error(val message: String): WCallResponse()
-  @Serializable class Invalid(val str: String): WCallResponse()
 }
 
 @Serializable class WebRTCCallOffer(val callType: CallType, val rtcSession: WebRTCSession)
-@Serializable class WebRTCSession(val rtcSession: String, val rtcIceCandidates: List<String>)
-@Serializable class WebRTCExtraInfo(val rtcIceCandidates: List<String>)
+@Serializable class WebRTCSession(val rtcSession: String, val rtcIceCandidates: String)
+@Serializable class WebRTCExtraInfo(val rtcIceCandidates: String)
 @Serializable class CallType(val media: CallMediaType, val capabilities: CallCapabilities)
-@Serializable class CallInvitation(val peerMedia: CallMediaType?, val sharedKey: String?)
+@Serializable class CallInvitation(val contact: Contact, val peerMedia: CallMediaType, val sharedKey: String?, val callTs: Instant) {
+  val callTypeText: String get() = generalGetString(when(peerMedia) {
+    CallMediaType.Video -> if (sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
+    CallMediaType.Audio -> if (sharedKey == null) R.string.audio_call_no_encryption else R.string.encrypted_audio_call
+  })
+  val callTitle: String get() = generalGetString(when(peerMedia) {
+    CallMediaType.Video -> R.string.incoming_video_call
+    CallMediaType.Audio -> R.string.incoming_audio_call
+  })
+}
 @Serializable class CallCapabilities(val encryption: Boolean)
+@Serializable class ConnectionInfo(private val localCandidate: RTCIceCandidate?, private val remoteCandidate: RTCIceCandidate?) {
+  val text: String @Composable get() = when {
+    localCandidate?.candidateType == RTCIceCandidateType.Host && remoteCandidate?.candidateType == RTCIceCandidateType.Host ->
+      stringResource(R.string.call_connection_peer_to_peer)
+    localCandidate?.candidateType == RTCIceCandidateType.Relay && remoteCandidate?.candidateType == RTCIceCandidateType.Relay ->
+      stringResource(R.string.call_connection_via_relay)
+    else ->
+      "${localCandidate?.candidateType?.value ?: "unknown"} / ${remoteCandidate?.candidateType?.value ?: "unknown"}"
+  }
+}
+// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
+@Serializable class RTCIceCandidate(val candidateType: RTCIceCandidateType?)
+// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceServer
+@Serializable class RTCIceServer(val urls: List<String>, val username: String? = null, val credential: String? = null)
 
-enum class WebRTCCallStatus(val status: String) {
-  Connected("connected"),
-  Disconnected("disconnected"),
-  Failed("failed")
+// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate/type
+@Serializable
+enum class RTCIceCandidateType(val value: String) {
+  @SerialName("host") Host("host"),
+  @SerialName("srflx") ServerReflexive("srflx"),
+  @SerialName("prflx") PeerReflexive("prflx"),
+  @SerialName("relay") Relay("relay")
 }
 
 @Serializable
-enum class CallMediaType(val media: String) {
-  Video("video"),
-  Audio("audio")
+enum class WebRTCCallStatus(val value: String) {
+  @SerialName("connected") Connected("connected"),
+  @SerialName("connecting") Connecting("connecting"),
+  @SerialName("disconnected") Disconnected("disconnected"),
+  @SerialName("failed") Failed("failed")
+}
+
+@Serializable
+enum class CallMediaType {
+  @SerialName("video") Video,
+  @SerialName("audio") Audio
+}
+
+@Serializable
+enum class VideoCamera {
+  @SerialName("user") User,
+  @SerialName("environment") Environment;
+  val flipped: VideoCamera get() = if (this == User) Environment else User
 }
 
 @Serializable

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt

@@ -6,8 +6,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.*
-import androidx.compose.material.icons.outlined.Circle
-import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -27,36 +26,64 @@ fun ChatInfoView(chatModel: ChatModel, close: () -> Unit) {
   BackHandler(onBack = close)
   val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
   if (chat != null) {
-    ChatInfoLayout(chat,
+    ChatInfoLayout(
+      chat,
       close = close,
-      deleteContact = {
-        AlertManager.shared.showAlertMsg(
-          title = generalGetString(R.string.delete_contact__question),
-          text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
-          confirmText = generalGetString(R.string.delete_verb),
-          onConfirm = {
-            val cInfo = chat.chatInfo
-            withApi {
-              val r = chatModel.controller.apiDeleteChat(cInfo.chatType, cInfo.apiId)
-              if (r) {
-                chatModel.removeChat(cInfo.id)
-                chatModel.chatId.value = null
-                close()
-              }
-            }
-          }
-        )
-      }
+      deleteContact = { deleteContactDialog(chat.chatInfo, chatModel, close) },
+      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) }
     )
   }
 }
 
+fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(R.string.delete_contact__question),
+    text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
+    confirmText = generalGetString(R.string.delete_verb),
+    onConfirm = {
+      withApi {
+        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
+        if (r) {
+          chatModel.removeChat(chatInfo.id)
+          chatModel.chatId.value = null
+          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
+          close?.invoke()
+        }
+      }
+    }
+  )
+}
+
+fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(R.string.clear_chat_question),
+    text = generalGetString(R.string.clear_chat_warning),
+    confirmText = generalGetString(R.string.clear_verb),
+    onConfirm = {
+      withApi {
+        val updatedChatInfo = chatModel.controller.apiClearChat(chatInfo.chatType, chatInfo.apiId)
+        if (updatedChatInfo != null) {
+          chatModel.clearChat(updatedChatInfo)
+          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
+          close?.invoke()
+        }
+      }
+    }
+  )
+}
+
 @Composable
-fun ChatInfoLayout(chat: Chat, close: () -> Unit, deleteContact: () -> Unit) {
-  Column(Modifier
-    .fillMaxSize()
-    .background(MaterialTheme.colors.background)
-    .padding(horizontal = 8.dp),
+fun ChatInfoLayout(
+  chat: Chat,
+  close: () -> Unit,
+  deleteContact: () -> Unit,
+  clearChat: () -> Unit
+) {
+  Column(
+    Modifier
+      .fillMaxSize()
+      .background(MaterialTheme.colors.background)
+      .padding(horizontal = 8.dp),
     horizontalAlignment = Alignment.CenterHorizontally
   ) {
     CloseSheetBar(close)
@@ -66,7 +93,9 @@ fun ChatInfoLayout(chat: Chat, close: () -> Unit, deleteContact: () -> Unit) {
     Text(
       cInfo.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
       color = MaterialTheme.colors.onBackground,
-      modifier = Modifier.padding(top = 32.dp).padding(bottom = 8.dp)
+      modifier = Modifier
+        .padding(top = 32.dp)
+        .padding(bottom = 8.dp)
     )
     Text(
       cInfo.fullName, style = MaterialTheme.typography.h2,
@@ -90,13 +119,27 @@ fun ChatInfoLayout(chat: Chat, close: () -> Unit, deleteContact: () -> Unit) {
           style = MaterialTheme.typography.body2,
           color = MaterialTheme.colors.onBackground,
           textAlign = TextAlign.Center,
-          modifier = Modifier.padding(top = 16.dp).padding(horizontal = 16.dp)
+          modifier = Modifier
+            .padding(top = 16.dp)
+            .padding(horizontal = 16.dp)
         )
       }
 
       Spacer(Modifier.weight(1F))
 
-      Box(Modifier.padding(48.dp)) {
+      Box(Modifier.padding(4.dp)) {
+        SimpleButton(
+          stringResource(R.string.clear_chat_button),
+          icon = Icons.Outlined.Restore,
+          color = WarningOrange,
+          click = clearChat
+        )
+      }
+      Box(
+        Modifier
+          .padding(4.dp)
+          .padding(bottom = 32.dp)
+      ) {
         SimpleButton(
           stringResource(R.string.button_delete_contact),
           icon = Icons.Outlined.Delete,
@@ -104,22 +147,35 @@ fun ChatInfoLayout(chat: Chat, close: () -> Unit, deleteContact: () -> Unit) {
           click = deleteContact
         )
       }
+    } else if (cInfo is ChatInfo.Group) {
+      Spacer(Modifier.weight(1F))
+
+      Box(
+        Modifier
+          .padding(4.dp)
+          .padding(bottom = 32.dp)
+      ) {
+        SimpleButton(
+          stringResource(R.string.clear_chat_button),
+          icon = Icons.Outlined.Restore,
+          color = WarningOrange,
+          click = clearChat
+        )
+      }
     }
   }
 }
 
 @Composable
 fun ServerImage(chat: Chat) {
-  val status = chat.serverInfo.networkStatus
-  when {
-    status is Chat.NetworkStatus.Connected ->
+  when (chat.serverInfo.networkStatus) {
+    is Chat.NetworkStatus.Connected ->
       Icon(Icons.Filled.Circle, stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
-    status is Chat.NetworkStatus.Disconnected ->
+    is Chat.NetworkStatus.Disconnected ->
       Icon(Icons.Filled.Pending, stringResource(R.string.icon_descr_server_status_disconnected), tint = HighOrLowlight)
-    status is Chat.NetworkStatus.Error ->
+    is Chat.NetworkStatus.Error ->
       Icon(Icons.Filled.Error, stringResource(R.string.icon_descr_server_status_error), tint = HighOrLowlight)
-    else ->
-      Icon(Icons.Outlined.Circle, stringResource(R.string.icon_descr_server_status_pending), tint = HighOrLowlight)
+    else -> Icon(Icons.Outlined.Circle, stringResource(R.string.icon_descr_server_status_pending), tint = HighOrLowlight)
   }
 }
 
@@ -133,7 +189,7 @@ fun PreviewChatInfoLayout() {
         chatItems = arrayListOf(),
         serverInfo = Chat.ServerInfo(Chat.NetworkStatus.Error("agent BROKER TIMEOUT"))
       ),
-      close = {}, deleteContact = {}
+      close = {}, deleteContact = {}, clearChat = {}
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt

@@ -1,10 +1,9 @@
 package chat.simplex.app.views.chat
 
 import android.content.res.Configuration
-import android.graphics.Bitmap
-import android.net.Uri
 import android.util.Log
 import androidx.activity.compose.BackHandler
+import androidx.annotation.StringRes
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
@@ -12,7 +11,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ArrowBackIos
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.mapSaver
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -20,6 +19,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
@@ -28,10 +28,10 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
-import chat.simplex.app.SimplexApp.Companion.context
 import chat.simplex.app.TAG
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.call.*
 import chat.simplex.app.views.chat.item.ChatItemView
 import chat.simplex.app.views.chatlist.openChat
 import chat.simplex.app.views.helpers.*
@@ -44,11 +44,12 @@ import kotlinx.datetime.Clock
 fun ChatView(chatModel: ChatModel) {
   val chat: Chat? = chatModel.chats.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }
   val user = chatModel.currentUser.value
-  val composeState = remember { mutableStateOf(ComposeState()) }
+  val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
+  val enableCalls = chatModel.controller.appPrefs.experimentalCalls.get()
+  val composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = useLinkPreviews)) }
+  val attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) }
   val attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
   val scope = rememberCoroutineScope()
-  val chosenImage = remember { mutableStateOf<Bitmap?>(null) }
-  val chosenFile = remember { mutableStateOf<Uri?>(null) }
 
   if (chat == null || user == null) {
     chatModel.chatId.value = null
@@ -57,10 +58,10 @@ fun ChatView(chatModel: ChatModel) {
     // TODO a more advanced version would mark as read only if in view
     LaunchedEffect(chat.chatItems) {
       Log.d(TAG, "ChatView ${chatModel.chatId.value}: LaunchedEffect")
-      delay(1000L)
-      if (chat.chatItems.count() > 0) {
+      delay(750L)
+      if (chat.chatItems.isNotEmpty()) {
         chatModel.markChatItemsRead(chat.chatInfo)
-        chatModel.controller.cancelNotificationsForChat(chat.id)
+        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
         withApi {
           chatModel.controller.apiChatRead(
             chat.chatInfo.chatType,
@@ -76,25 +77,23 @@ fun ChatView(chatModel: ChatModel) {
       composeState,
       composeView = {
         ComposeView(
-          chatModel,
-          chat,
-          composeState,
-          chosenImage,
-          chosenFile,
-          showAttachmentBottomSheet = { scope.launch { attachmentBottomSheetState.show() } })
+          chatModel, chat, composeState, attachmentOption,
+          showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } }
+        )
       },
-      chosenImage,
-      chosenFile,
+      attachmentOption,
       scope,
       attachmentBottomSheetState,
       chatModel.chatItems,
+      useLinkPreviews = useLinkPreviews,
+      enableCalls = enableCalls,
       back = { chatModel.chatId.value = null },
       info = { ModalManager.shared.showCustomModal { close -> ChatInfoView(chatModel, close) } },
       openDirectChat = { contactId ->
         val c = chatModel.chats.firstOrNull {
           it.chatInfo is ChatInfo.Direct && it.chatInfo.contact.contactId == contactId
         }
-        if (c != null) withApi { openChat(chatModel, c.chatInfo) }
+        if (c != null) withApi { openChat(c.chatInfo, chatModel) }
       },
       deleteMessage = { itemId, mode ->
         withApi {
@@ -109,13 +108,22 @@ fun ChatView(chatModel: ChatModel) {
         }
       },
       receiveFile = { fileId ->
-        withApi {
-          val chatItem = chatModel.controller.apiReceiveFile(fileId)
-          if (chatItem != null) {
-            val cInfo = chatItem.chatInfo
-            val cItem = chatItem.chatItem
-            chatModel.upsertChatItem(cInfo, cItem)
-          }
+        withApi { chatModel.controller.receiveFile(fileId) }
+      },
+      startCall = { media ->
+        val cInfo = chat.chatInfo
+        if (cInfo is ChatInfo.Direct) {
+          chatModel.activeCall.value = Call(contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media)
+          chatModel.showCallView.value = true
+          chatModel.callCommand.value = WCallCommand.Capabilities
+        }
+      },
+      acceptCall = { contact ->
+        val invitation = chatModel.callInvitations.remove(contact.id)
+        if (invitation == null) {
+          AlertManager.shared.showAlertMsg("Call already ended!")
+        } else {
+          chatModel.callManager.acceptIncomingCall(invitation = invitation)
         }
       }
     )
@@ -128,28 +136,20 @@ fun ChatLayout(
   chat: Chat,
   composeState: MutableState<ComposeState>,
   composeView: (@Composable () -> Unit),
-  chosenImage: MutableState<Bitmap?>,
-  chosenFile: MutableState<Uri?>,
+  attachmentOption: MutableState<AttachmentOption?>,
   scope: CoroutineScope,
   attachmentBottomSheetState: ModalBottomSheetState,
   chatItems: List<ChatItem>,
+  useLinkPreviews: Boolean,
+  enableCalls: Boolean = false,
   back: () -> Unit,
   info: () -> Unit,
   openDirectChat: (Long) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
-  receiveFile: (Long) -> Unit
+  receiveFile: (Long) -> Unit,
+  startCall: (CallMediaType) -> Unit,
+  acceptCall: (Contact) -> Unit
 ) {
-  fun onImageChange(bitmap: Bitmap) {
-    val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
-    composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(imagePreview))
-  }
-  fun onFileChange(uri: Uri) {
-    val fileName = getFileName(context, uri)
-    if (fileName != null) {
-      composeState.value = composeState.value.copy(preview = ComposePreview.FilePreview(fileName))
-    }
-  }
-
   Surface(
     Modifier
       .fillMaxWidth()
@@ -160,25 +160,21 @@ fun ChatLayout(
         scrimColor = Color.Black.copy(alpha = 0.12F),
         modifier = Modifier.navigationBarsWithImePadding(),
         sheetContent = {
-          GetImageBottomSheet(
-            chosenImage,
-            ::onImageChange,
-            chosenFile,
-            ::onFileChange,
-            hideBottomSheet = {
-              scope.launch { attachmentBottomSheetState.hide() }
-            })
+          ChooseAttachmentView(
+            attachmentOption,
+            hide = { scope.launch { attachmentBottomSheetState.hide() } }
+          )
         },
         sheetState = attachmentBottomSheetState,
         sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
       ) {
         Scaffold(
-          topBar = { ChatInfoToolbar(chat, back, info) },
+          topBar = { ChatInfoToolbar(chat, enableCalls, back, info, startCall) },
           bottomBar = composeView,
           modifier = Modifier.navigationBarsWithImePadding()
         ) { contentPadding ->
           Box(Modifier.padding(contentPadding)) {
-            ChatItemsList(user, chat, composeState, chatItems, openDirectChat, deleteMessage, receiveFile)
+            ChatItemsList(user, chat, composeState, chatItems, useLinkPreviews, openDirectChat, deleteMessage, receiveFile, acceptCall)
           }
         }
       }
@@ -187,33 +183,43 @@ fun ChatLayout(
 }
 
 @Composable
-fun ChatInfoToolbar(chat: Chat, back: () -> Unit, info: () -> Unit) {
+fun ChatInfoToolbar(chat: Chat, enableCalls: Boolean, back: () -> Unit, info: () -> Unit, startCall: (CallMediaType) -> Unit) {
+  @Composable fun toolbarButton(icon: ImageVector, @StringRes textId: Int, modifier: Modifier = Modifier.padding(0.dp), onClick: () -> Unit) {
+    IconButton(onClick, modifier = modifier) {
+      Icon(icon, stringResource(textId), tint = MaterialTheme.colors.primary)
+    }
+  }
   Column {
     Box(
       Modifier
         .fillMaxWidth()
         .height(52.dp)
         .background(if (isSystemInDarkTheme()) ToolbarDark else ToolbarLight)
-        .padding(horizontal = 8.dp),
+        .padding(horizontal = 4.dp),
       contentAlignment = Alignment.CenterStart,
     ) {
-      IconButton(onClick = back) {
-        Icon(
-          Icons.Outlined.ArrowBackIos,
-          stringResource(R.string.back),
-          tint = MaterialTheme.colors.primary,
-          modifier = Modifier.padding(10.dp)
-        )
+      val cInfo = chat.chatInfo
+      toolbarButton(Icons.Outlined.ArrowBackIos, R.string.back, onClick = back)
+      if (cInfo is ChatInfo.Direct && enableCalls) {
+        Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
+          Box(Modifier.width(85.dp), contentAlignment = Alignment.CenterStart) {
+            toolbarButton(Icons.Outlined.Phone, R.string.icon_descr_audio_call) {
+              startCall(CallMediaType.Audio)
+            }
+          }
+          toolbarButton(Icons.Outlined.Videocam, R.string.icon_descr_video_call) {
+            startCall(CallMediaType.Video)
+          }
+        }
       }
       Row(
         Modifier
-          .padding(horizontal = 68.dp)
+          .padding(horizontal = 80.dp)
           .fillMaxWidth()
           .clickable(onClick = info),
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically
       ) {
-        val cInfo = chat.chatInfo
         ChatInfoImage(cInfo, size = 40.dp)
         Column(
           Modifier.padding(start = 8.dp),
@@ -254,9 +260,11 @@ fun ChatItemsList(
   chat: Chat,
   composeState: MutableState<ComposeState>,
   chatItems: List<ChatItem>,
+  useLinkPreviews: Boolean,
   openDirectChat: (Long) -> Unit,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
-  receiveFile: (Long) -> Unit
+  receiveFile: (Long) -> Unit,
+  acceptCall: (Contact) -> Unit
 ) {
   val listState = rememberLazyListState(initialFirstVisibleItemIndex = chatItems.size - chatItems.count { it.isRcvNew })
   val keyboardState by getKeyboardState()
@@ -294,11 +302,11 @@ fun ChatItemsList(
             } else {
               Spacer(Modifier.size(42.dp))
             }
-            ChatItemView(user, cItem, composeState, cxt, uriHandler, showMember = showMember, deleteMessage = deleteMessage, receiveFile = receiveFile)
+            ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, showMember = showMember, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, acceptCall = acceptCall)
           }
         } else {
           Box(Modifier.padding(start = 86.dp, end = 12.dp)) {
-            ChatItemView(user, cItem, composeState, cxt, uriHandler, deleteMessage = deleteMessage, receiveFile = receiveFile)
+            ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, acceptCall = acceptCall)
           }
         }
       } else { // direct message
@@ -309,7 +317,7 @@ fun ChatItemsList(
             end = if (sent) 12.dp else 76.dp,
           )
         ) {
-          ChatItemView(user, cItem, composeState, cxt, uriHandler, deleteMessage = deleteMessage, receiveFile = receiveFile)
+          ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, acceptCall = acceptCall)
         }
       }
     }
@@ -367,18 +375,20 @@ fun PreviewChatLayout() {
         chatItems = chatItems,
         chatStats = Chat.ChatStats()
       ),
-      composeState = remember { mutableStateOf(ComposeState()) },
+      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       composeView = {},
-      chosenFile = remember { mutableStateOf(null) },
-      chosenImage = remember { mutableStateOf(null) },
+      attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) },
       scope = rememberCoroutineScope(),
       attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
       chatItems = chatItems,
+      useLinkPreviews = true,
       back = {},
       info = {},
       openDirectChat = {},
       deleteMessage = { _, _ -> },
-      receiveFile = {}
+      receiveFile = {},
+      startCall = {},
+      acceptCall = { _ ->  }
     )
   }
 }
@@ -412,18 +422,20 @@ fun PreviewGroupChatLayout() {
         chatItems = chatItems,
         chatStats = Chat.ChatStats()
       ),
-      composeState = remember { mutableStateOf(ComposeState()) },
+      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       composeView = {},
-      chosenImage = remember { mutableStateOf(null) },
-      chosenFile = remember { mutableStateOf(null) },
+      attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) },
       scope = rememberCoroutineScope(),
       attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
       chatItems = chatItems,
+      useLinkPreviews = true,
       back = {},
       info = {},
       openDirectChat = {},
       deleteMessage = { _, _ -> },
-      receiveFile = {}
+      receiveFile = {},
+      startCall = {},
+      acceptCall = { _ ->  }
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt

@@ -2,8 +2,20 @@ package chat.simplex.app.views.chat
 
 import ComposeFileView
 import ComposeImageView
+import android.Manifest
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Bitmap
+import android.graphics.ImageDecoder
 import android.net.Uri
+import android.provider.MediaStore
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.annotation.CallSuper
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
@@ -21,16 +33,20 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.views.chat.item.*
 import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
+import java.io.File
 
 sealed class ComposePreview {
   object NoPreview: ComposePreview()
-  class CLinkPreview(val linkPreview: LinkPreview): ComposePreview()
+  class CLinkPreview(val linkPreview: LinkPreview?): ComposePreview()
   class ImagePreview(val image: String): ComposePreview()
   class FilePreview(val fileName: String): ComposePreview()
 }
@@ -45,12 +61,14 @@ data class ComposeState(
   val message: String = "",
   val preview: ComposePreview = ComposePreview.NoPreview,
   val contextItem: ComposeContextItem = ComposeContextItem.NoContextItem,
-  val inProgress: Boolean = false
+  val inProgress: Boolean = false,
+  val useLinkPreviews: Boolean
 ) {
-  constructor(editingItem: ChatItem): this(
+  constructor(editingItem: ChatItem, useLinkPreviews: Boolean): this (
     editingItem.content.text,
     chatItemPreview(editingItem),
-    ComposeContextItem.EditingItem(editingItem)
+    ComposeContextItem.EditingItem(editingItem),
+    useLinkPreviews = useLinkPreviews
   )
 
   val editing: Boolean
@@ -73,7 +91,7 @@ data class ComposeState(
       when (preview) {
         is ComposePreview.ImagePreview -> false
         is ComposePreview.FilePreview -> false
-        else -> true
+        else -> useLinkPreviews
       }
   val linkPreview: LinkPreview?
     get() =
@@ -101,17 +119,118 @@ fun ComposeView(
   chatModel: ChatModel,
   chat: Chat,
   composeState: MutableState<ComposeState>,
-  chosenImage: MutableState<Bitmap?>,
-  chosenFile: MutableState<Uri?>,
-  showAttachmentBottomSheet: () -> Unit
+  attachmentOption: MutableState<AttachmentOption?>,
+  showChooseAttachment: () -> Unit
 ) {
   val context = LocalContext.current
   val linkUrl = remember { mutableStateOf<String?>(null) }
   val prevLinkUrl = remember { mutableStateOf<String?>(null) }
   val pendingLinkUrl = remember { mutableStateOf<String?>(null) }
   val cancelledLinks = remember { mutableSetOf<String>() }
+  val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
   val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
   val textStyle = remember { mutableStateOf(smallFont) }
+  // attachments
+  val chosenImage = remember { mutableStateOf<Bitmap?>(null) }
+  val chosenFile = remember { mutableStateOf<Uri?>(null) }
+  val photoUri = remember { mutableStateOf<Uri?>(null) }
+  val photoTmpFile = remember { mutableStateOf<File?>(null) }
+
+  class ComposeTakePicturePreview: ActivityResultContract<Void?, Bitmap?>() {
+    @CallSuper
+    override fun createIntent(context: Context, input: Void?): Intent {
+      photoTmpFile.value = File.createTempFile("image", ".bmp", SimplexApp.context.filesDir)
+      photoUri.value = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", photoTmpFile.value!!)
+      return Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+        .putExtra(MediaStore.EXTRA_OUTPUT, photoUri.value)
+    }
+
+    override fun getSynchronousResult(
+      context: Context,
+      input: Void?
+    ): SynchronousResult<Bitmap?>? = null
+
+    override fun parseResult(resultCode: Int, intent: Intent?): Bitmap? {
+      val photoUriVal = photoUri.value
+      val photoTmpFileVal = photoTmpFile.value
+      return if (resultCode == Activity.RESULT_OK && photoUriVal != null && photoTmpFileVal != null) {
+        val source = ImageDecoder.createSource(SimplexApp.context.contentResolver, photoUriVal)
+        val bitmap = ImageDecoder.decodeBitmap(source)
+        photoTmpFileVal.delete()
+        bitmap
+      } else {
+        Log.e(TAG, "Getting image from camera cancelled or failed.")
+        photoTmpFile.value?.delete()
+        null
+      }
+    }
+  }
+
+  val cameraLauncher = rememberLauncherForActivityResult(contract = ComposeTakePicturePreview()) { bitmap: Bitmap? ->
+    if (bitmap != null) {
+      chosenImage.value = bitmap
+      val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
+      composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(imagePreview))
+    }
+  }
+  val cameraPermissionLauncher = rememberPermissionLauncher { isGranted: Boolean ->
+    if (isGranted) {
+      cameraLauncher.launch(null)
+    } else {
+      Toast.makeText(context, generalGetString(R.string.toast_permission_denied), Toast.LENGTH_SHORT).show()
+    }
+  }
+  val galleryLauncher = rememberGetContentLauncher { uri: Uri? ->
+    if (uri != null) {
+      val source = ImageDecoder.createSource(context.contentResolver, uri)
+      val bitmap = ImageDecoder.decodeBitmap(source)
+      chosenImage.value = bitmap
+      val imagePreview = resizeImageToStrSize(bitmap, maxDataSize = 14000)
+      composeState.value = composeState.value.copy(preview = ComposePreview.ImagePreview(imagePreview))
+    }
+  }
+  val filesLauncher = rememberGetContentLauncher { uri: Uri? ->
+    if (uri != null) {
+      val fileSize = getFileSize(context, uri)
+      if (fileSize != null && fileSize <= MAX_FILE_SIZE) {
+        val fileName = getFileName(SimplexApp.context, uri)
+        if (fileName != null) {
+          chosenFile.value = uri
+          composeState.value = composeState.value.copy(preview = ComposePreview.FilePreview(fileName))
+        }
+      } else {
+        AlertManager.shared.showAlertMsg(
+          generalGetString(R.string.large_file),
+          String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(MAX_FILE_SIZE))
+        )
+      }
+    }
+  }
+
+  LaunchedEffect(attachmentOption.value) {
+    when (attachmentOption.value) {
+      AttachmentOption.TakePhoto -> {
+        when (PackageManager.PERMISSION_GRANTED) {
+          ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) -> {
+            cameraLauncher.launch(null)
+          }
+          else -> {
+            cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+          }
+        }
+        attachmentOption.value = null
+      }
+      AttachmentOption.PickImage -> {
+        galleryLauncher.launch("image/*")
+        attachmentOption.value = null
+      }
+      AttachmentOption.PickFile -> {
+        filesLauncher.launch("*/*")
+        attachmentOption.value = null
+      }
+      else -> {}
+    }
+  }
 
   fun isSimplexLink(link: String): Boolean =
     link.startsWith("https://simplex.chat", true) || link.startsWith("http://simplex.chat", true)
@@ -124,6 +243,7 @@ fun ComposeView(
 
   fun loadLinkPreview(url: String, wait: Long? = null) {
     if (pendingLinkUrl.value == url) {
+      composeState.value = composeState.value.copy(preview = ComposePreview.CLinkPreview(null))
       withApi {
         if (wait != null) delay(wait)
         val lp = getLinkPreview(url)
@@ -162,7 +282,7 @@ fun ComposeView(
       is ComposePreview.CLinkPreview -> {
         val url = parseMessage(cs.message)
         val lp = composePreview.linkPreview
-        if (url == lp.uri) {
+        if (lp != null && url == lp.uri) {
           MsgContent.MCLink(cs.message, preview = lp)
         } else {
           MsgContent.MCText(cs.message)
@@ -184,7 +304,8 @@ fun ComposeView(
   }
 
   fun clearState() {
-    composeState.value = ComposeState()
+    composeState.value = ComposeState(useLinkPreviews = useLinkPreviews)
+    textStyle.value = smallFont
     chosenImage.value = null
     chosenFile.value = null
     linkUrl.value = null
@@ -194,15 +315,15 @@ fun ComposeView(
   }
 
   fun sendMessage() {
-    withApi {
-      composeState.value = composeState.value.copy(inProgress = true)
-      val cInfo = chat.chatInfo
-      val cs = composeState.value
-      when (val contextItem = cs.contextItem) {
-        is ComposeContextItem.EditingItem -> {
-          val ei = contextItem.chatItem
-          val oldMsgContent = ei.content.msgContent
-          if (oldMsgContent != null) {
+    composeState.value = composeState.value.copy(inProgress = true)
+    val cInfo = chat.chatInfo
+    val cs = composeState.value
+    when (val contextItem = cs.contextItem) {
+      is ComposeContextItem.EditingItem -> {
+        val ei = contextItem.chatItem
+        val oldMsgContent = ei.content.msgContent
+        if (oldMsgContent != null) {
+          withApi {
             val updatedItem = chatModel.controller.apiUpdateChatItem(
               type = cInfo.chatType,
               id = cInfo.apiId,
@@ -210,39 +331,42 @@ fun ComposeView(
               mc = updateMsgContent(oldMsgContent)
             )
             if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
+            clearState()
           }
         }
-        else -> {
-          var mc: MsgContent? = null
-          var file: String? = null
-          when (val preview = cs.preview) {
-            ComposePreview.NoPreview -> mc = MsgContent.MCText(cs.message)
-            is ComposePreview.CLinkPreview -> mc = checkLinkPreview()
-            is ComposePreview.ImagePreview -> {
-              val chosenImageVal = chosenImage.value
-              if (chosenImageVal != null) {
-                file = saveImage(context, chosenImageVal)
-                if (file != null) {
-                  mc = MsgContent.MCImage(cs.message, preview.image)
-                }
-              }
-            }
-            is ComposePreview.FilePreview -> {
-              val chosenFileVal = chosenFile.value
-              if (chosenFileVal != null) {
-                file = saveFileFromUri(context, chosenFileVal)
-                if (file != null) {
-                  mc = MsgContent.MCFile(cs.message)
-                }
+      }
+      else -> {
+        var mc: MsgContent? = null
+        var file: String? = null
+        when (val preview = cs.preview) {
+          ComposePreview.NoPreview -> mc = MsgContent.MCText(cs.message)
+          is ComposePreview.CLinkPreview -> mc = checkLinkPreview()
+          is ComposePreview.ImagePreview -> {
+            val chosenImageVal = chosenImage.value
+            if (chosenImageVal != null) {
+              file = saveImage(context, chosenImageVal)
+              if (file != null) {
+                mc = MsgContent.MCImage(cs.message, preview.image)
               }
             }
           }
-          val quotedItemId: Long? = when (contextItem) {
-            is ComposeContextItem.QuotedItem -> contextItem.chatItem.id
-            else -> null
+          is ComposePreview.FilePreview -> {
+            val chosenFileVal = chosenFile.value
+            if (chosenFileVal != null) {
+              file = saveFileFromUri(context, chosenFileVal)
+              if (file != null) {
+                mc = MsgContent.MCFile(cs.message)
+              }
+            }
           }
+        }
+        val quotedItemId: Long? = when (contextItem) {
+          is ComposeContextItem.QuotedItem -> contextItem.chatItem.id
+          else -> null
+        }
 
-          if (mc != null) {
+        if (mc != null) {
+          withApi {
             val aChatItem = chatModel.controller.apiSendMessage(
               type = cInfo.chatType,
               id = cInfo.apiId,
@@ -251,10 +375,12 @@ fun ComposeView(
               mc = mc
             )
             if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
+            clearState()
           }
+        } else {
+          clearState()
         }
       }
-      clearState()
     }
   }
 
@@ -276,6 +402,7 @@ fun ComposeView(
     if (uri != null) {
       cancelledLinks.add(uri)
     }
+    pendingLinkUrl.value = null
     composeState.value = composeState.value.copy(preview = ComposePreview.NoPreview)
   }
 
@@ -342,7 +469,7 @@ fun ComposeView(
             .clip(CircleShape)
             .clickable {
               if (attachEnabled) {
-                showAttachmentBottomSheet()
+                showChooseAttachment()
               }
             }
         )

apps/android/app/src/main/java/chat/simplex/app/views/chat/ContextItemView.kt

@@ -11,8 +11,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
@@ -52,7 +50,10 @@ fun ContextItemView(
         contentDescription = stringResource(R.string.icon_descr_context),
         tint = HighOrLowlight,
       )
-      ContextItemText(contextItem)
+      MarkdownText(
+        contextItem.text, contextItem.formattedText,
+        sender = contextItem.memberDisplayName, senderBold = true, maxLines = 3
+      )
     }
     IconButton(onClick = cancelContextItem) {
       Icon(
@@ -65,20 +66,6 @@ fun ContextItemView(
   }
 }
 
-@Composable
-private fun ContextItemText(cxtItem: ChatItem) {
-  val member = cxtItem.memberDisplayName
-  if (member == null) {
-    Text(cxtItem.text, maxLines = 3)
-  } else {
-    val annotatedText = buildAnnotatedString {
-      withStyle(boldFont) { append(member) }
-      append(": ${cxtItem.text}")
-    }
-    Text(annotatedText, maxLines = 3)
-  }
-}
-
 @Preview
 @Composable
 fun PreviewContextItemView() {

apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt

@@ -111,7 +111,7 @@ fun PreviewSendMsgView() {
   val textStyle = remember { mutableStateOf(smallFont) }
   SimpleXTheme {
     SendMsgView(
-      composeState = remember { mutableStateOf(ComposeState()) },
+      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       sendMessage = {},
       onMessageChange = { _ -> },
       textStyle = textStyle
@@ -129,7 +129,7 @@ fun PreviewSendMsgView() {
 fun PreviewSendMsgViewEditing() {
   val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
   val textStyle = remember { mutableStateOf(smallFont) }
-  val composeStateEditing = ComposeState(editingItem = ChatItem.getSampleData())
+  val composeStateEditing = ComposeState(editingItem = ChatItem.getSampleData(), useLinkPreviews = true)
   SimpleXTheme {
     SendMsgView(
       composeState = remember { mutableStateOf(composeStateEditing) },
@@ -150,7 +150,7 @@ fun PreviewSendMsgViewEditing() {
 fun PreviewSendMsgViewInProgress() {
   val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
   val textStyle = remember { mutableStateOf(smallFont) }
-  val composeStateInProgress = ComposeState(preview = ComposePreview.FilePreview("test.txt"), inProgress = true)
+  val composeStateInProgress = ComposeState(preview = ComposePreview.FilePreview("test.txt"), inProgress = true, useLinkPreviews = true)
   SimpleXTheme {
     SendMsgView(
       composeState = remember { mutableStateOf(composeStateInProgress) },

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt

@@ -0,0 +1,156 @@
+package chat.simplex.app.views.chat.item
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.PhoneInTalk
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+
+@Composable
+fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, duration: Int, acceptCall: (Contact) -> Unit) {
+  val sent = cItem.chatDir.sent
+  Column(
+    Modifier
+      .padding(horizontal = 4.dp)
+      .padding(bottom = 8.dp), horizontalAlignment = Alignment.CenterHorizontally) {
+    @Composable fun ConnectingCallIcon() = Icon(Icons.Outlined.SettingsPhone, stringResource(R.string.icon_descr_call_connecting), tint = Color.Green)
+    when (status) {
+      CICallStatus.Pending -> if (sent) {
+        Icon(Icons.Outlined.Call, stringResource(R.string.icon_descr_call_pending_sent))
+      } else {
+        AcceptCallButton(cInfo, acceptCall)
+      }
+      CICallStatus.Missed -> Icon(Icons.Outlined.Call, stringResource(R.string.icon_descr_call_missed), tint = Color.Red)
+      CICallStatus.Rejected -> Icon(Icons.Outlined.CallEnd, stringResource(R.string.icon_descr_call_rejected), tint = Color.Red)
+      CICallStatus.Accepted -> ConnectingCallIcon()
+      CICallStatus.Negotiated -> ConnectingCallIcon()
+      CICallStatus.Progress -> Icon(Icons.Filled.PhoneInTalk, stringResource(R.string.icon_descr_call_progress), tint = SimplexGreen)
+      CICallStatus.Ended -> Row {
+        Icon(Icons.Outlined.CallEnd, stringResource(R.string.icon_descr_call_ended), tint = HighOrLowlight, modifier = Modifier.padding(end = 4.dp))
+        Text(status.duration(duration), color = HighOrLowlight)
+      }
+    }
+
+    Text(
+      cItem.timestampText,
+      color = HighOrLowlight,
+      fontSize = 14.sp,
+      modifier = Modifier.padding(start = 3.dp)
+    )
+  }
+}
+
+@Composable
+fun AcceptCallButton(cInfo: ChatInfo, acceptCall: (Contact) -> Unit) {
+  if (cInfo is ChatInfo.Direct) {
+    SimpleButton(stringResource(R.string.answer_call), Icons.Outlined.RingVolume) { acceptCall(cInfo.contact) }
+  } else {
+    Icon(Icons.Outlined.RingVolume, stringResource(R.string.answer_call), tint = HighOrLowlight)
+  }
+//    if case let .direct(contact) = chatInfo {
+//      Button {
+//        if let invitation = m.callInvitations.removeValue(forKey: contact.id) {
+//        m.activeCallInvitation = nil
+//        m.activeCall = Call(
+//          contact: contact,
+//          callState: .invitationReceived,
+//        localMedia: invitation.peerMedia,
+//        sharedKey: invitation.sharedKey
+//        )
+//        m.showCallView = true
+//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true)
+//      } else {
+//        AlertManager.shared.showAlertMsg(title: "Call already ended!")
+//      }
+//      } label: {
+//        Label("Answer call", systemImage: "phone.arrow.down.left")
+//      }
+//    } else {
+//      Image(systemName: "phone.arrow.down.left").foregroundColor(.secondary)
+//    }
+
+}
+
+//struct CICallItemView: View {
+//  @EnvironmentObject var m: ChatModel
+//  var chatInfo: ChatInfo
+//  var chatItem: ChatItem
+//  var status: CICallStatus
+//  var duration: Int
+//
+//  var body: some View {
+//    switch status {
+//      case .pending:
+//      if sent {
+//        Image(systemName: "phone.arrow.up.right").foregroundColor(.secondary)
+//      } else {
+//        acceptCallButton()
+//      }
+//      case .missed: missedCallIcon(sent).foregroundColor(.red)
+//      case .rejected: Image(systemName: "phone.down").foregroundColor(.secondary)
+//      case .accepted: connectingCallIcon()
+//      case .negotiated: connectingCallIcon()
+//      case .progress: Image(systemName: "phone.and.waveform.fill").foregroundColor(.green)
+//      case .ended: endedCallIcon(sent)
+//      case .error: missedCallIcon(sent).foregroundColor(.orange)
+//    }
+//
+//    chatItem.timestampText
+//      .font(.caption)
+//    .foregroundColor(.secondary)
+//    .padding(.bottom, 8)
+//    .padding(.horizontal, 12)
+//  }
+//  }
+//
+//  private func missedCallIcon(_ sent: Bool) -> some View {
+//    Image(systemName: sent ? "phone.arrow.up.right" : "phone.arrow.down.left")
+//  }
+//
+//  private func connectingCallIcon() -> some View {
+//    Image(systemName: "phone.connection").foregroundColor(.green)
+//  }
+//
+//  @ViewBuilder private func endedCallIcon(_ sent: Bool) -> some View {
+//    HStack {
+//      Image(systemName: "phone.down")
+//      Text(CICallStatus.durationText(duration)).foregroundColor(.secondary)
+//    }
+//  }
+//
+//
+//  @ViewBuilder private func acceptCallButton() -> some View {
+//    if case let .direct(contact) = chatInfo {
+//      Button {
+//        if let invitation = m.callInvitations.removeValue(forKey: contact.id) {
+//        m.activeCallInvitation = nil
+//        m.activeCall = Call(
+//          contact: contact,
+//          callState: .invitationReceived,
+//        localMedia: invitation.peerMedia,
+//        sharedKey: invitation.sharedKey
+//        )
+//        m.showCallView = true
+//        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true)
+//      } else {
+//        AlertManager.shared.showAlertMsg(title: "Call already ended!")
+//      }
+//      } label: {
+//        Label("Answer call", systemImage: "phone.arrow.down.left")
+//      }
+//    } else {
+//      Image(systemName: "phone.arrow.down.left").foregroundColor(.secondary)
+//    }
+//  }
+//}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt

@@ -203,7 +203,7 @@ class ChatItemProvider: PreviewParameterProvider<ChatItem> {
 
 @Preview
 @Composable
-fun PreviewTextItemViewSnd(@PreviewParameter(ChatItemProvider::class) chatItem: ChatItem) {
+fun PreviewCIFileFramedItemView(@PreviewParameter(ChatItemProvider::class) chatItem: ChatItem) {
   val showMenu = remember { mutableStateOf(false) }
   SimpleXTheme {
     FramedItemView(User.sampleData, chatItem, showMenu = showMenu, receiveFile = {})

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt

@@ -26,7 +26,8 @@ import chat.simplex.app.views.helpers.*
 fun CIImageView(
   image: String,
   file: CIFile?,
-  showMenu: MutableState<Boolean>
+  showMenu: MutableState<Boolean>,
+  receiveFile: (Long) -> Unit
 ) {
   @Composable
   fun loadingIndicator() {
@@ -98,11 +99,21 @@ fun CIImageView(
       })
     } else {
       imageView(base64ToBitmap(image), onClick = {
-        if (file != null && file.fileStatus == CIFileStatus.RcvAccepted)
-          AlertManager.shared.showAlertMsg(
-            generalGetString(R.string.waiting_for_image),
-            generalGetString(R.string.image_will_be_received_when_contact_is_online)
-          )
+        if (file != null) {
+          when (file.fileStatus) {
+            CIFileStatus.RcvInvitation ->
+              receiveFile(file.fileId)
+            CIFileStatus.RcvAccepted ->
+              AlertManager.shared.showAlertMsg(
+                generalGetString(R.string.waiting_for_image),
+                generalGetString(R.string.image_will_be_received_when_contact_is_online)
+              )
+            CIFileStatus.RcvTransfer -> {} // ?
+            CIFileStatus.RcvComplete -> {} // ?
+            CIFileStatus.RcvCancelled -> {} // TODO
+            else -> {}
+          }
+        }
       })
     }
     loadingIndicator()

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt

@@ -30,13 +30,16 @@ import kotlinx.datetime.Clock
 @Composable
 fun ChatItemView(
   user: User,
+  cInfo: ChatInfo,
   cItem: ChatItem,
   composeState: MutableState<ComposeState>,
   cxt: Context,
   uriHandler: UriHandler? = null,
   showMember: Boolean = false,
+  useLinkPreviews: Boolean,
   deleteMessage: (Long, CIDeleteMode) -> Unit,
-  receiveFile: (Long) -> Unit
+  receiveFile: (Long) -> Unit,
+  acceptCall: (Contact) -> Unit
 ) {
   val context = LocalContext.current
   val sent = cItem.chatDir.sent
@@ -54,18 +57,12 @@ fun ChatItemView(
         .clip(RoundedCornerShape(18.dp))
         .combinedClickable(onLongClick = { showMenu.value = true }, onClick = {})
     ) {
-      if (cItem.isMsgContent) {
+      @Composable fun ContentItem() {
         if (cItem.file == null && cItem.quotedItem == null && isShortEmoji(cItem.content.text)) {
           EmojiItemView(cItem)
         } else {
           FramedItemView(user, cItem, uriHandler, showMember = showMember, showMenu, receiveFile)
         }
-      } else if (cItem.isDeletedContent) {
-        DeletedItemView(cItem, showMember = showMember)
-      } else if (cItem.isCall) {
-        FramedItemView(user, cItem, uriHandler, showMember = showMember, showMenu, receiveFile)
-      }
-      if (cItem.isMsgContent) {
         DropdownMenu(
           expanded = showMenu.value,
           onDismissRequest = { showMenu.value = false },
@@ -73,7 +70,7 @@ fun ChatItemView(
         ) {
           ItemAction(stringResource(R.string.reply_verb), Icons.Outlined.Reply, onClick = {
             if (composeState.value.editing) {
-              composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem))
+              composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
             } else {
               composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
             }
@@ -100,9 +97,9 @@ fun ChatItemView(
               })
             }
           }
-          if (cItem.chatDir.sent && cItem.meta.editable) {
+          if (cItem.meta.editable) {
             ItemAction(stringResource(R.string.edit_verb), Icons.Filled.Edit, onClick = {
-              composeState.value = ComposeState(editingItem = cItem)
+              composeState.value = ComposeState(editingItem = cItem, useLinkPreviews = useLinkPreviews)
               showMenu.value = false
             })
           }
@@ -117,6 +114,39 @@ fun ChatItemView(
           )
         }
       }
+
+      @Composable fun DeletedItem() {
+        DeletedItemView(cItem, showMember = showMember)
+        DropdownMenu(
+          expanded = showMenu.value,
+          onDismissRequest = { showMenu.value = false },
+          Modifier.width(220.dp)
+        ) {
+          ItemAction(
+            stringResource(R.string.delete_verb),
+            Icons.Outlined.Delete,
+            onClick = {
+              showMenu.value = false
+              deleteMessageAlertDialog(cItem, deleteMessage = deleteMessage)
+            },
+            color = Color.Red
+          )
+        }
+      }
+
+      @Composable fun CallItem(status: CICallStatus, duration: Int) {
+        CICallItemView(cInfo, cItem, status, duration, acceptCall)
+      }
+
+      when (val c = cItem.content) {
+        is CIContent.SndMsgContent -> ContentItem()
+        is CIContent.RcvMsgContent -> ContentItem()
+        is CIContent.SndDeleted -> DeletedItem()
+        is CIContent.RcvDeleted -> DeletedItem()
+        is CIContent.SndCall -> CallItem(c.status, c.duration)
+        is CIContent.RcvCall -> CallItem(c.status, c.duration)
+        is CIContent.RcvIntegrityError -> IntegrityErrorItemView(cItem, showMember = showMember)
+      }
     }
   }
 }
@@ -170,13 +200,16 @@ fun PreviewChatItemView() {
   SimpleXTheme {
     ChatItemView(
       User.sampleData,
+      ChatInfo.Direct.sampleData,
       ChatItem.getSampleData(
         1, CIDirection.DirectSnd(), Clock.System.now(), "hello"
       ),
-      composeState = remember { mutableStateOf(ComposeState()) },
+      useLinkPreviews = true,
+      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       cxt = LocalContext.current,
       deleteMessage = { _, _ -> },
-      receiveFile = {}
+      receiveFile = {},
+      acceptCall = { _ -> }
     )
   }
 }
@@ -187,11 +220,14 @@ fun PreviewChatItemViewDeletedContent() {
   SimpleXTheme {
     ChatItemView(
       User.sampleData,
+      ChatInfo.Direct.sampleData,
       ChatItem.getDeletedContentSampleData(),
-      composeState = remember { mutableStateOf(ComposeState()) },
+      useLinkPreviews = true,
+      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       cxt = LocalContext.current,
       deleteMessage = { _, _ -> },
-      receiveFile = {}
+      receiveFile = {},
+      acceptCall = { _ -> }
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt

@@ -50,7 +50,7 @@ fun FramedItemView(
       contentAlignment = Alignment.TopStart
     ) {
       MarkdownText(
-        qi.text, sender = qi.sender(user), senderBold = true, maxLines = 3,
+        qi.text, qi.formattedText, sender = qi.sender(user), senderBold = true, maxLines = 3,
         style = TextStyle(fontSize = 15.sp, color = MaterialTheme.colors.onSurface)
       )
     }
@@ -121,7 +121,7 @@ fun FramedItemView(
           Column(Modifier.fillMaxWidth()) {
             when (val mc = ci.content.msgContent) {
               is MsgContent.MCImage -> {
-                CIImageView(image = mc.image, file = ci.file, showMenu)
+                CIImageView(image = mc.image, file = ci.file, showMenu, receiveFile)
                 if (mc.text == "") {
                   metaColor = Color.White
                 } else {

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ImageFullScreenView.kt

@@ -1,12 +1,13 @@
 import android.graphics.Bitmap
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.*
+import androidx.compose.foundation.gestures.detectTransformGestures
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.*
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
 import chat.simplex.app.R
@@ -20,11 +21,35 @@ fun ImageFullScreenView(imageBitmap: Bitmap, close: () -> Unit) {
       .background(Color.Black)
       .clickable(onClick = close)
   ) {
+    var scale by remember { mutableStateOf(1f) }
+    var translationX by remember { mutableStateOf(0f) }
+    var translationY by remember { mutableStateOf(0f) }
     Image(
       imageBitmap.asImageBitmap(),
       contentDescription = stringResource(R.string.image_descr),
-      modifier = Modifier.fillMaxSize(),
       contentScale = ContentScale.Fit,
+      modifier = Modifier
+        .graphicsLayer(
+          scaleX = scale,
+          scaleY = scale,
+          translationX = translationX,
+          translationY = translationY,
+        )
+        .pointerInput(Unit) {
+          detectTransformGestures(
+            onGesture = { _, pan, gestureZoom, _ ->
+              scale = (scale * gestureZoom).coerceIn(1f, 20f)
+              if (scale > 1) {
+                translationX += pan.x * scale
+                translationY += pan.y * scale
+              } else {
+                translationX = 0f
+                translationY = 0f
+              }
+            }
+          )
+        }
+        .fillMaxSize(),
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt

@@ -0,0 +1,65 @@
+package chat.simplex.app.views.chat.item
+
+import android.content.res.Configuration
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.*
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatItem
+import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.helpers.AlertManager
+import chat.simplex.app.views.helpers.generalGetString
+
+@Composable
+fun IntegrityErrorItemView(ci: ChatItem, showMember: Boolean = false) {
+  Surface(
+    Modifier.clickable(onClick = {
+      AlertManager.shared.showAlertMsg(
+        title = generalGetString(R.string.alert_title_skipped_messages),
+        text = generalGetString(R.string.alert_text_skipped_messages_it_can_happen_when)
+      )
+    }),
+    shape = RoundedCornerShape(18.dp),
+    color = ReceivedColorLight,
+  ) {
+    Row(
+      Modifier.padding(horizontal = 12.dp, vertical = 6.dp),
+      verticalAlignment = Alignment.Bottom
+    ) {
+      Text(
+        buildAnnotatedString {
+          appendSender(this, if (showMember) ci.memberDisplayName else null, true)
+          withStyle(SpanStyle(fontStyle = FontStyle.Italic, color = Color.Red)) { append(ci.content.text) }
+        },
+        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp),
+        modifier = Modifier.padding(end = 8.dp)
+      )
+      CIMetaView(ci)
+    }
+  }
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  name = "Dark Mode"
+)
+@Composable
+fun IntegrityErrorItemViewView() {
+  SimpleXTheme {
+    IntegrityErrorItemView(
+      ChatItem.getDeletedContentSampleData()
+    )
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt

@@ -5,7 +5,7 @@ import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -16,52 +16,171 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.ui.theme.WarningOrange
+import chat.simplex.app.views.chat.clearChatDialog
+import chat.simplex.app.views.chat.deleteContactDialog
 import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.helpers.*
+import kotlinx.coroutines.delay
 import kotlinx.datetime.Clock
 
 @Composable
 fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
-  ChatListNavLinkLayout(
-    chat = chat,
-    click = {
-      when (chat.chatInfo) {
-        is ChatInfo.ContactRequest -> contactRequestAlertDialog(chat.chatInfo, chatModel)
-        is ChatInfo.ContactConnection -> contactConnectionAlertDialog(chat.chatInfo.contactConnection, chatModel)
-        else ->
-          if (chat.chatInfo.ready) {
-            withApi { openChat(chatModel, chat.chatInfo) }
-          } else {
-            pendingContactAlertDialog(chat.chatInfo, chatModel)
-          }
-      }
-    },
-    deleteContact = {
-      AlertManager.shared.showAlertMsg(
-        title = generalGetString(R.string.delete_contact__question),
-        text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
-        confirmText = generalGetString(R.string.delete_verb),
-        onConfirm = {
-          val cInfo = chat.chatInfo
-          withApi {
-            val r = chatModel.controller.apiDeleteChat(cInfo.chatType, cInfo.apiId)
-            if (r) {
-              chatModel.removeChat(cInfo.id)
-              chatModel.chatId.value = null
-            }
-          }
-        }
+  val showMenu = remember { mutableStateOf(false) }
+  var showMarkRead by remember { mutableStateOf(false) }
+  LaunchedEffect(chat.id, chat.chatStats.unreadCount > 0) {
+    showMenu.value = false
+    delay(500L)
+    showMarkRead = chat.chatStats.unreadCount > 0
+  }
+  when (chat.chatInfo) {
+    is ChatInfo.Direct ->
+      ChatListNavLinkLayout(
+        chatLinkPreview = { ChatPreviewView(chat) },
+        click = { openOrPendingChat(chat.chatInfo, chatModel) },
+        dropdownMenuItems = { ContactMenuItems(chat, chatModel, showMenu, showMarkRead) },
+        showMenu
       )
-    },
-  )
+    is ChatInfo.Group ->
+      ChatListNavLinkLayout(
+        chatLinkPreview = { ChatPreviewView(chat) },
+        click = { openOrPendingChat(chat.chatInfo, chatModel) },
+        dropdownMenuItems = { GroupMenuItems(chat, chatModel, showMenu, showMarkRead) },
+        showMenu
+      )
+    is ChatInfo.ContactRequest ->
+      ChatListNavLinkLayout(
+        chatLinkPreview = { ContactRequestView(chat.chatInfo) },
+        click = { contactRequestAlertDialog(chat.chatInfo, chatModel) },
+        dropdownMenuItems = { ContactRequestMenuItems(chat.chatInfo, chatModel, showMenu) },
+        showMenu
+      )
+    is ChatInfo.ContactConnection ->
+      ChatListNavLinkLayout(
+        chatLinkPreview = { ContactConnectionView(chat.chatInfo.contactConnection) },
+        click = { contactConnectionAlertDialog(chat.chatInfo.contactConnection, chatModel) },
+        dropdownMenuItems = { ContactConnectionMenuItems(chat.chatInfo, chatModel, showMenu) },
+        showMenu
+      )
+  }
 }
 
-suspend fun openChat(chatModel: ChatModel, cInfo: ChatInfo) {
-  val chat = chatModel.controller.apiGetChat(cInfo.chatType, cInfo.apiId)
+fun openOrPendingChat(chatInfo: ChatInfo, chatModel: ChatModel) {
+  if (chatInfo.ready) {
+    withApi { openChat(chatInfo, chatModel) }
+  } else {
+    pendingContactAlertDialog(chatInfo, chatModel)
+  }
+}
+
+suspend fun openChat(chatInfo: ChatInfo, chatModel: ChatModel) {
+  val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId)
   if (chat != null) {
     chatModel.chatItems.clear()
     chatModel.chatItems.addAll(chat.chatItems)
-    chatModel.chatId.value = cInfo.id
+    chatModel.chatId.value = chatInfo.id
+  }
+}
+
+@Composable
+fun ContactMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>, showMarkRead: Boolean) {
+  if (showMarkRead) {
+    ItemAction(
+      stringResource(R.string.mark_read),
+      Icons.Outlined.Check,
+      onClick = {
+        markChatRead(chat, chatModel)
+        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
+        showMenu.value = false
+      }
+    )
+  }
+  ItemAction(
+    stringResource(R.string.clear_verb),
+    Icons.Outlined.Restore,
+    onClick = {
+      clearChatDialog(chat.chatInfo, chatModel)
+      showMenu.value = false
+    },
+    color = WarningOrange
+  )
+  ItemAction(
+    stringResource(R.string.delete_verb),
+    Icons.Outlined.Delete,
+    onClick = {
+      deleteContactDialog(chat.chatInfo as ChatInfo.Direct, chatModel)
+      showMenu.value = false
+    },
+    color = Color.Red
+  )
+}
+
+@Composable
+fun GroupMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>, showMarkRead: Boolean) {
+  if (showMarkRead) {
+    ItemAction(
+      stringResource(R.string.mark_read),
+      Icons.Outlined.Check,
+      onClick = {
+        markChatRead(chat, chatModel)
+        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
+        showMenu.value = false
+      }
+    )
+  }
+  ItemAction(
+    stringResource(R.string.clear_verb),
+    Icons.Outlined.Restore,
+    onClick = {
+      clearChatDialog(chat.chatInfo, chatModel)
+      showMenu.value = false
+    },
+    color = WarningOrange
+  )
+}
+
+@Composable
+fun ContactRequestMenuItems(chatInfo: ChatInfo.ContactRequest, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.accept_contact_button),
+    Icons.Outlined.Check,
+    onClick = {
+      acceptContactRequest(chatInfo, chatModel)
+      showMenu.value = false
+    }
+  )
+  ItemAction(
+    stringResource(R.string.reject_contact_button),
+    Icons.Outlined.Close,
+    onClick = {
+      rejectContactRequest(chatInfo, chatModel)
+      showMenu.value = false
+    },
+    color = Color.Red
+  )
+}
+
+@Composable
+fun ContactConnectionMenuItems(chatInfo: ChatInfo.ContactConnection, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.delete_verb),
+    Icons.Outlined.Delete,
+    onClick = {
+      deleteContactConnectionAlert(chatInfo.contactConnection, chatModel)
+      showMenu.value = false
+    },
+    color = Color.Red
+  )
+}
+
+fun markChatRead(chat: Chat, chatModel: ChatModel) {
+  chatModel.markChatItemsRead(chat.chatInfo)
+  withApi {
+    chatModel.controller.apiChatRead(
+      chat.chatInfo.chatType,
+      chat.chatInfo.apiId,
+      CC.ItemRange(chat.chatStats.minUnreadItemId, chat.chatItems.last().id)
+    )
   }
 }
 
@@ -70,25 +189,29 @@ fun contactRequestAlertDialog(contactRequest: ChatInfo.ContactRequest, chatModel
     title = generalGetString(R.string.accept_connection_request__question),
     text = generalGetString(R.string.if_you_choose_to_reject_the_sender_will_not_be_notified),
     confirmText = generalGetString(R.string.accept_contact_button),
-    onConfirm = {
-      withApi {
-        val contact = chatModel.controller.apiAcceptContactRequest(contactRequest.apiId)
-        if (contact != null) {
-          val chat = Chat(ChatInfo.Direct(contact), listOf())
-          chatModel.replaceChat(contactRequest.id, chat)
-        }
-      }
-    },
+    onConfirm = { acceptContactRequest(contactRequest, chatModel) },
     dismissText = generalGetString(R.string.reject_contact_button),
-    onDismiss = {
-      withApi {
-        chatModel.controller.apiRejectContactRequest(contactRequest.apiId)
-        chatModel.removeChat(contactRequest.id)
-      }
-    }
+    onDismiss = { rejectContactRequest(contactRequest, chatModel) }
   )
 }
 
+fun acceptContactRequest(contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
+  withApi {
+    val contact = chatModel.controller.apiAcceptContactRequest(contactRequest.apiId)
+    if (contact != null) {
+      val chat = Chat(ChatInfo.Direct(contact), listOf())
+      chatModel.replaceChat(contactRequest.id, chat)
+    }
+  }
+}
+
+fun rejectContactRequest(contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
+  withApi {
+    chatModel.controller.apiRejectContactRequest(contactRequest.apiId)
+    chatModel.removeChat(contactRequest.id)
+  }
+}
+
 fun contactConnectionAlertDialog(connection: PendingContactConnection, chatModel: ChatModel) {
   AlertManager.shared.showAlertDialogButtons(
     title = generalGetString(
@@ -159,14 +282,18 @@ fun pendingContactAlertDialog(chatInfo: ChatInfo, chatModel: ChatModel) {
 }
 
 @Composable
-fun ChatListNavLinkLayout(chat: Chat, click: () -> Unit, deleteContact: () -> Unit) {
-  val showMenu = remember { mutableStateOf(false) }
+fun ChatListNavLinkLayout(
+  chatLinkPreview: @Composable () -> Unit,
+  click: () -> Unit,
+  dropdownMenuItems: (@Composable () -> Unit)?,
+  showMenu: MutableState<Boolean>
+) {
   Surface(
     modifier = Modifier
       .fillMaxWidth()
       .combinedClickable(
         onClick = click,
-        onLongClick = { if (chat.chatInfo is ChatInfo.Direct) showMenu.value = true }
+        onLongClick = { showMenu.value = true }
       )
       .height(88.dp)
   ) {
@@ -178,28 +305,17 @@ fun ChatListNavLinkLayout(chat: Chat, click: () -> Unit, deleteContact: () -> Un
         .padding(end = 12.dp),
       verticalAlignment = Alignment.Top
     ) {
-      when (chat.chatInfo) {
-        is ChatInfo.Direct -> ChatPreviewView(chat)
-        is ChatInfo.Group -> ChatPreviewView(chat)
-        is ChatInfo.ContactRequest -> ContactRequestView(chat.chatInfo)
-        is ChatInfo.ContactConnection -> ContactConnectionView(chat.chatInfo.contactConnection)
-      }
+      chatLinkPreview()
     }
-    if (chat.chatInfo is ChatInfo.Direct) {
-      DropdownMenu(
-        expanded = showMenu.value,
-        onDismissRequest = { showMenu.value = false },
-        Modifier.width(220.dp)
-      ) {
-        ItemAction(
-          stringResource(R.string.delete_verb),
-          Icons.Outlined.Delete,
-          onClick = {
-            deleteContact()
-            showMenu.value = false
-          },
-          color = Color.Red
-        )
+    if (dropdownMenuItems != null) {
+      Box(Modifier.padding(horizontal = 16.dp)) {
+        DropdownMenu(
+          expanded = showMenu.value,
+          onDismissRequest = { showMenu.value = false },
+          Modifier.width(220.dp)
+        ) {
+          dropdownMenuItems()
+        }
       }
     }
   }
@@ -216,20 +332,25 @@ fun ChatListNavLinkLayout(chat: Chat, click: () -> Unit, deleteContact: () -> Un
 fun PreviewChatListNavLinkDirect() {
   SimpleXTheme {
     ChatListNavLinkLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Direct.sampleData,
-        chatItems = listOf(
-          ChatItem.getSampleData(
-            1,
-            CIDirection.DirectSnd(),
-            Clock.System.now(),
-            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+      chatLinkPreview = {
+        ChatPreviewView(
+          chat = Chat(
+            chatInfo = ChatInfo.Direct.sampleData,
+            chatItems = listOf(
+              ChatItem.getSampleData(
+                1,
+                CIDirection.DirectSnd(),
+                Clock.System.now(),
+                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+              )
+            ),
+            chatStats = Chat.ChatStats()
           )
-        ),
-        chatStats = Chat.ChatStats()
-      ),
+        )
+      },
       click = {},
-      deleteContact = {}
+      dropdownMenuItems = null,
+      showMenu = remember { mutableStateOf(false) }
     )
   }
 }
@@ -244,20 +365,25 @@ fun PreviewChatListNavLinkDirect() {
 fun PreviewChatListNavLinkGroup() {
   SimpleXTheme {
     ChatListNavLinkLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.Group.sampleData,
-        chatItems = listOf(
-          ChatItem.getSampleData(
-            1,
-            CIDirection.DirectSnd(),
-            Clock.System.now(),
-            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+      chatLinkPreview = {
+        ChatPreviewView(
+          Chat(
+            chatInfo = ChatInfo.Group.sampleData,
+            chatItems = listOf(
+              ChatItem.getSampleData(
+                1,
+                CIDirection.DirectSnd(),
+                Clock.System.now(),
+                "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."
+              )
+            ),
+            chatStats = Chat.ChatStats()
           )
-        ),
-        chatStats = Chat.ChatStats()
-      ),
+        )
+      },
       click = {},
-      deleteContact = {}
+      dropdownMenuItems = null,
+      showMenu = remember { mutableStateOf(false) }
     )
   }
 }
@@ -272,13 +398,12 @@ fun PreviewChatListNavLinkGroup() {
 fun PreviewChatListNavLinkContactRequest() {
   SimpleXTheme {
     ChatListNavLinkLayout(
-      chat = Chat(
-        chatInfo = ChatInfo.ContactRequest.sampleData,
-        chatItems = listOf(),
-        chatStats = Chat.ChatStats()
-      ),
+      chatLinkPreview = {
+        ContactRequestView(ChatInfo.ContactRequest.sampleData)
+      },
       click = {},
-      deleteContact = {}
+      dropdownMenuItems = null,
+      showMenu = remember { mutableStateOf(false) }
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt

@@ -7,7 +7,8 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
+import androidx.compose.material.icons.outlined.Menu
+import androidx.compose.material.icons.outlined.PersonAdd
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -19,7 +20,6 @@ import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.ui.theme.ToolbarDark
 import chat.simplex.app.ui.theme.ToolbarLight
-import chat.simplex.app.views.helpers.ModalManager
 import chat.simplex.app.views.newchat.NewChatSheet
 import chat.simplex.app.views.onboarding.MakeConnection
 import chat.simplex.app.views.usersettings.SettingsView
@@ -64,16 +64,14 @@ fun scaffoldController(): ScaffoldController {
 }
 
 @Composable
-fun ChatListView(chatModel: ChatModel) {
+fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
   val scaffoldCtrl = scaffoldController()
-  if (chatModel.clearOverlays.value) {
-    scaffoldCtrl.collapse()
-    ModalManager.shared.closeModal()
-    chatModel.clearOverlays.value = false
+  LaunchedEffect(chatModel.clearOverlays.value) {
+    if (chatModel.clearOverlays.value && scaffoldCtrl.expanded.value) scaffoldCtrl.collapse()
   }
   BottomSheetScaffold(
     scaffoldState = scaffoldCtrl.state,
-    drawerContent = { SettingsView(chatModel) },
+    drawerContent = { SettingsView(chatModel, setPerformLA) },
     sheetPeekHeight = 0.dp,
     sheetContent = { NewChatSheet(chatModel, scaffoldCtrl) },
     sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp),
@@ -104,43 +102,6 @@ fun ChatListView(chatModel: ChatModel) {
   }
 }
 
-@Composable
-fun Help(scaffoldCtrl: ScaffoldController, displayName: String?) {
-  Column(
-    Modifier
-      .verticalScroll(rememberScrollState())
-      .fillMaxWidth()
-      .padding(16.dp)
-  ) {
-    val welcomeMsg = if (displayName != null) {
-      String.format(stringResource(R.string.personal_welcome), displayName)
-    } else stringResource(R.string.welcome)
-    Text(
-      text = welcomeMsg,
-      Modifier.padding(bottom = 24.dp),
-      style = MaterialTheme.typography.h1,
-      color = MaterialTheme.colors.onBackground
-    )
-    ChatHelpView { scaffoldCtrl.toggleSheet() }
-    Row(
-      Modifier.padding(top = 30.dp),
-      verticalAlignment = Alignment.CenterVertically,
-      horizontalArrangement = Arrangement.spacedBy(8.dp)
-    ) {
-      Text(
-        stringResource(R.string.this_text_is_available_in_settings),
-        color = MaterialTheme.colors.onBackground
-      )
-      Icon(
-        Icons.Outlined.Settings,
-        stringResource(R.string.icon_descr_settings),
-        tint = MaterialTheme.colors.onBackground,
-        modifier = Modifier.clickable(onClick = { scaffoldCtrl.toggleDrawer() })
-      )
-    }
-  }
-}
-
 @Composable
 fun ChatListToolbar(scaffoldCtrl: ScaffoldController) {
   Row(

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt

@@ -2,12 +2,12 @@ package chat.simplex.app.views.chatlist
 
 import android.content.res.Configuration
 import androidx.compose.foundation.background
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Circle
-import androidx.compose.material.icons.filled.MoreHoriz
+import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -20,8 +20,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.*
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.item.MarkdownText
 import chat.simplex.app.views.helpers.ChatInfoImage
 import chat.simplex.app.views.helpers.badgeLayout
@@ -30,12 +29,7 @@ import chat.simplex.app.views.helpers.badgeLayout
 fun ChatPreviewView(chat: Chat) {
   Row {
     val cInfo = chat.chatInfo
-    Box(contentAlignment = Alignment.BottomStart) {
-      ChatInfoImage(cInfo, size = 72.dp)
-      if (cInfo is ChatInfo.Direct) {
-        ChatStatusImage(chat)
-      }
-    }
+    ChatInfoImage(cInfo, size = 72.dp)
     Column(
       modifier = Modifier
         .padding(horizontal = 8.dp)
@@ -56,17 +50,18 @@ fun ChatPreviewView(chat: Chat) {
             ci.text, ci.formattedText, ci.memberDisplayName,
             metaText = ci.timestampText,
             maxLines = 2,
-            overflow = TextOverflow.Ellipsis
+            overflow = TextOverflow.Ellipsis,
+            style = MaterialTheme.typography.body1.copy(color = if (isSystemInDarkTheme()) MessagePreviewDark else MessagePreviewLight, lineHeight = 22.sp),
           )
         }
       } else {
         Text(stringResource(R.string.contact_connection_pending), color = HighOrLowlight)
       }
     }
-    val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.createdAt)
-    Column(
-      Modifier.fillMaxHeight(),
-      verticalArrangement = Arrangement.Top
+    val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.updatedAt)
+
+    Box(
+      contentAlignment = Alignment.TopEnd
     ) {
       Text(
         ts,
@@ -76,17 +71,29 @@ fun ChatPreviewView(chat: Chat) {
       )
       val n = chat.chatStats.unreadCount
       if (n > 0) {
-        Text(
-          if (n < 1000) "$n" else "${n / 1000}" + stringResource(R.string.thousand_abbreviation),
-          color = MaterialTheme.colors.onPrimary,
-          fontSize = 14.sp,
-          modifier = Modifier
-            .background(MaterialTheme.colors.primary, shape = CircleShape)
-            .align(Alignment.End)
-            .badgeLayout()
-            .padding(horizontal = 3.dp)
-            .padding(vertical = 1.dp)
-        )
+        Box(
+          Modifier.padding(top = 24.dp),
+          contentAlignment = Alignment.Center
+        ) {
+          Text(
+            if (n < 1000) "$n" else "${n / 1000}" + stringResource(R.string.thousand_abbreviation),
+            color = MaterialTheme.colors.onPrimary,
+            fontSize = 11.sp,
+            modifier = Modifier
+              .background(MaterialTheme.colors.primary, shape = CircleShape)
+              .badgeLayout()
+              .padding(horizontal = 3.dp)
+              .padding(vertical = 1.dp)
+          )
+        }
+      }
+      if (cInfo is ChatInfo.Direct) {
+        Box(
+          Modifier.padding(top = 52.dp),
+          contentAlignment = Alignment.Center
+        ) {
+          ChatStatusImage(chat)
+        }
       }
     }
   }
@@ -98,17 +105,19 @@ fun ChatStatusImage(chat: Chat) {
   val descr = s.statusString
   if (s is Chat.NetworkStatus.Error) {
     Icon(
-      Icons.Filled.Circle,
+      Icons.Outlined.ErrorOutline,
       contentDescription = descr,
       tint = HighOrLowlight,
-      modifier = Modifier.padding(start = 6.dp).padding(bottom = 4.dp).size(6.dp)
+      modifier = Modifier
+        .size(19.dp)
     )
-  } else if (!(s is Chat.NetworkStatus.Connected)) {
-    Icon(
-      Icons.Filled.MoreHoriz,
-      contentDescription = descr,
-      tint = HighOrLowlight,
-      modifier = Modifier.width(19.dp).padding(start = 6.dp)
+  } else if (s !is Chat.NetworkStatus.Connected) {
+    CircularProgressIndicator(
+      Modifier
+        .padding(horizontal = 2.dp)
+        .size(15.dp),
+      color = HighOrLowlight,
+      strokeWidth = 1.5.dp
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactConnectionView.kt

@@ -1,5 +1,6 @@
 package chat.simplex.app.views.chatlist
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
@@ -14,7 +15,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.model.PendingContactConnection
 import chat.simplex.app.model.getTimestampText
-import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.ProfileImage
 
 @Composable
@@ -36,7 +37,7 @@ fun ContactConnectionView(contactConnection: PendingContactConnection) {
         fontWeight = FontWeight.Bold,
         color = HighOrLowlight
       )
-      Text(contactConnection.description, maxLines = 2, color = HighOrLowlight)
+      Text(contactConnection.description, maxLines = 2, color = if (isSystemInDarkTheme()) MessagePreviewDark else MessagePreviewLight)
     }
     val ts = getTimestampText(contactConnection.updatedAt)
     Column(

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactRequestView.kt

@@ -1,5 +1,6 @@
 package chat.simplex.app.views.chatlist
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
@@ -12,7 +13,7 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatInfo
 import chat.simplex.app.model.getTimestampText
-import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.ChatInfoImage
 
 @Composable
@@ -32,7 +33,7 @@ fun ContactRequestView(contactRequest: ChatInfo.ContactRequest) {
         fontWeight = FontWeight.Bold,
         color = MaterialTheme.colors.primary
       )
-      Text(stringResource(R.string.contact_wants_to_connect_with_you), maxLines = 2)
+      Text(stringResource(R.string.contact_wants_to_connect_with_you), maxLines = 2, color = if (isSystemInDarkTheme()) MessagePreviewDark else MessagePreviewLight)
     }
     val ts = getTimestampText(contactRequest.contactRequest.updatedAt)
     Column(

apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChatInfoImage.kt

@@ -11,6 +11,7 @@ import androidx.compose.material.icons.filled.SupervisedUserCircle
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
@@ -34,14 +35,15 @@ fun ChatInfoImage(chatInfo: ChatInfo, size: Dp) {
 fun ProfileImage(
   size: Dp,
   image: String? = null,
-  icon: ImageVector = Icons.Filled.AccountCircle
+  icon: ImageVector = Icons.Filled.AccountCircle,
+  color: Color = MaterialTheme.colors.secondary
 ) {
   Box(Modifier.size(size)) {
     if (image == null) {
       Icon(
         icon,
         contentDescription = stringResource(R.string.icon_descr_profile_image_placeholder),
-        tint = MaterialTheme.colors.secondary,
+        tint = color,
         modifier = Modifier.fillMaxSize()
       )
     } else {

apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt

@@ -0,0 +1,54 @@
+package chat.simplex.app.views.helpers
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.onFocusChanged
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.views.newchat.ActionButton
+
+sealed class AttachmentOption {
+  object TakePhoto: AttachmentOption()
+  object PickImage: AttachmentOption()
+  object PickFile: AttachmentOption()
+}
+
+@Composable
+fun ChooseAttachmentView(
+  attachmentOption: MutableState<AttachmentOption?>,
+  hide: () -> Unit
+) {
+  Box(
+    modifier = Modifier
+      .fillMaxWidth()
+      .wrapContentHeight()
+      .onFocusChanged { focusState ->
+        if (!focusState.hasFocus) hide()
+      }
+  ) {
+    Row(
+      Modifier
+        .fillMaxWidth()
+        .padding(horizontal = 8.dp, vertical = 30.dp),
+      horizontalArrangement = Arrangement.SpaceEvenly
+    ) {
+      ActionButton(null, stringResource(R.string.use_camera_button), icon = Icons.Outlined.PhotoCamera) {
+        attachmentOption.value = AttachmentOption.TakePhoto
+        hide()
+      }
+      ActionButton(null, stringResource(R.string.from_gallery_button), icon = Icons.Outlined.Collections) {
+        attachmentOption.value = AttachmentOption.PickImage
+        hide()
+      }
+      ActionButton(null, stringResource(R.string.choose_file), icon = Icons.Outlined.InsertDriveFile) {
+        attachmentOption.value = AttachmentOption.PickFile
+        hide()
+      }
+    }
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/GetImageView.kt

@@ -18,7 +18,8 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.CallSuper
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.*
+import androidx.compose.material.icons.outlined.Collections
+import androidx.compose.material.icons.outlined.PhotoCamera
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Modifier
@@ -127,18 +128,15 @@ class CustomTakePicturePreview: ActivityResultContract<Void?, Bitmap?>() {
     }
   }
 }
-
 //class GetGalleryContent: ActivityResultContracts.GetContent() {
 //  override fun createIntent(context: Context, input: String): Intent {
 //    super.createIntent(context, input)
 //    return Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI)
 //  }
 //}
-
 //@Composable
 //fun rememberGalleryLauncher(cb: (Uri?) -> Unit): ManagedActivityResultLauncher<String, Uri?> =
 //  rememberLauncherForActivityResult(contract = GetGalleryContent(), cb)
-
 @Composable
 fun rememberCameraLauncher(cb: (Bitmap?) -> Unit): ManagedActivityResultLauncher<Void?, Bitmap?> =
   rememberLauncherForActivityResult(contract = CustomTakePicturePreview(), cb)
@@ -155,8 +153,6 @@ fun rememberGetContentLauncher(cb: (Uri?) -> Unit): ManagedActivityResultLaunche
 fun GetImageBottomSheet(
   imageBitmap: MutableState<Bitmap?>,
   onImageChange: (Bitmap) -> Unit,
-  fileUri: MutableState<Uri?>? = null,
-  onFileChange: ((Uri) -> Unit)? = null,
   hideBottomSheet: () -> Unit
 ) {
   val context = LocalContext.current
@@ -182,20 +178,6 @@ fun GetImageBottomSheet(
       Toast.makeText(context, generalGetString(R.string.toast_permission_denied), Toast.LENGTH_SHORT).show()
     }
   }
-  val filesLauncher = rememberGetContentLauncher { uri: Uri? ->
-    if (uri != null && fileUri != null && onFileChange != null) {
-      val fileSize = getFileSize(context, uri)
-      if (fileSize != null && fileSize <= MAX_FILE_SIZE) {
-        fileUri.value = uri
-        onFileChange(uri)
-      } else {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(R.string.large_file),
-          String.format(generalGetString(R.string.maximum_supported_file_size), formatBytes(MAX_FILE_SIZE))
-        )
-      }
-    }
-  }
 
   Box(
     modifier = Modifier
@@ -226,12 +208,6 @@ fun GetImageBottomSheet(
         galleryLauncher.launch("image/*")
         hideBottomSheet()
       }
-      if (fileUri != null && onFileChange != null) {
-        ActionButton(null, stringResource(R.string.choose_file), icon = Icons.Outlined.InsertDriveFile) {
-          filesLauncher.launch("*/*")
-          hideBottomSheet()
-        }
-      }
     }
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/helpers/LinkPreviews.kt

@@ -66,23 +66,36 @@ suspend fun getLinkPreview(url: String): LinkPreview? {
 
 
 @Composable
-fun ComposeLinkView(linkPreview: LinkPreview, cancelPreview: () -> Unit) {
+fun ComposeLinkView(linkPreview: LinkPreview?, cancelPreview: () -> Unit) {
   Row(
     Modifier.fillMaxWidth().padding(top = 8.dp).background(SentColorLight),
     verticalAlignment = Alignment.CenterVertically
   ) {
-    val imageBitmap = base64ToBitmap(linkPreview.image).asImageBitmap()
-    Image(
-      imageBitmap,
-      stringResource(R.string.image_descr_link_preview),
-      modifier = Modifier.width(80.dp).height(60.dp).padding(end = 8.dp)
-    )
-    Column(Modifier.fillMaxWidth().weight(1F)) {
-      Text(linkPreview.title, maxLines = 1, overflow = TextOverflow.Ellipsis)
-      Text(
-        linkPreview.uri, maxLines = 1, overflow = TextOverflow.Ellipsis,
-        style = MaterialTheme.typography.body2
+    if (linkPreview == null) {
+      Box(
+        Modifier.fillMaxWidth().weight(1f).height(60.dp).padding(start = 16.dp),
+        contentAlignment = Alignment.CenterStart
+      ) {
+        CircularProgressIndicator(
+          Modifier.size(16.dp),
+          color = HighOrLowlight,
+          strokeWidth = 2.dp
+        )
+      }
+    } else {
+      val imageBitmap = base64ToBitmap(linkPreview.image).asImageBitmap()
+      Image(
+        imageBitmap,
+        stringResource(R.string.image_descr_link_preview),
+        modifier = Modifier.width(80.dp).height(60.dp).padding(end = 8.dp)
       )
+      Column(Modifier.fillMaxWidth().weight(1F)) {
+        Text(linkPreview.title, maxLines = 1, overflow = TextOverflow.Ellipsis)
+        Text(
+          linkPreview.uri, maxLines = 1, overflow = TextOverflow.Ellipsis,
+          style = MaterialTheme.typography.body2
+        )
+      }
     }
     IconButton(onClick = cancelPreview, modifier = Modifier.padding(0.dp)) {
       Icon(
@@ -139,4 +152,12 @@ fun PreviewComposeLinkView() {
   SimpleXTheme {
     ComposeLinkView(LinkPreview.sampleData) { -> }
   }
-}
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewComposeLinkViewLoading() {
+  SimpleXTheme {
+    ComposeLinkView(null) { -> }
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt

@@ -0,0 +1,112 @@
+package chat.simplex.app.views.helpers
+
+import android.content.Context
+import android.os.Build.VERSION.SDK_INT
+import android.widget.Toast
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricManager.Authenticators.*
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.FragmentActivity
+import chat.simplex.app.R
+
+sealed class LAResult {
+  object Success: LAResult()
+  class Error(val errString: CharSequence): LAResult()
+  object Failed: LAResult()
+  object Unavailable: LAResult()
+}
+
+fun authenticate(
+  promptTitle: String,
+  promptSubtitle: String,
+  activity: FragmentActivity,
+  completed: (LAResult) -> Unit
+) {
+  when {
+    SDK_INT in 28..29 ->
+      // KeyguardManager.isDeviceSecure()? https://developer.android.com/training/sign-in/biometric-auth#declare-supported-authentication-types
+      authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
+    SDK_INT > 29 ->
+      authenticateWithBiometricManager(promptTitle, promptSubtitle, activity, completed, BIOMETRIC_STRONG or DEVICE_CREDENTIAL)
+    else ->
+      completed(LAResult.Unavailable)
+  }
+}
+
+private fun authenticateWithBiometricManager(
+  promptTitle: String,
+  promptSubtitle: String,
+  activity: FragmentActivity,
+  completed: (LAResult) -> Unit,
+  authenticators: Int
+) {
+  val biometricManager = BiometricManager.from(activity)
+  when (biometricManager.canAuthenticate(authenticators)) {
+    BiometricManager.BIOMETRIC_SUCCESS -> {
+      val executor = ContextCompat.getMainExecutor(activity)
+      val biometricPrompt = BiometricPrompt(
+        activity,
+        executor,
+        object: BiometricPrompt.AuthenticationCallback() {
+          override fun onAuthenticationError(
+            errorCode: Int,
+            errString: CharSequence
+          ) {
+            super.onAuthenticationError(errorCode, errString)
+            completed(LAResult.Error(errString))
+          }
+
+          override fun onAuthenticationSucceeded(
+            result: BiometricPrompt.AuthenticationResult
+          ) {
+            super.onAuthenticationSucceeded(result)
+            completed(LAResult.Success)
+          }
+
+          override fun onAuthenticationFailed() {
+            super.onAuthenticationFailed()
+            completed(LAResult.Failed)
+          }
+        }
+      )
+      val promptInfo = BiometricPrompt.PromptInfo.Builder()
+        .setTitle(promptTitle)
+        .setSubtitle(promptSubtitle)
+        .setAllowedAuthenticators(authenticators)
+        .setConfirmationRequired(false)
+        .build()
+      biometricPrompt.authenticate(promptInfo)
+    }
+    else -> {
+      completed(LAResult.Unavailable)
+    }
+  }
+}
+
+fun laTurnedOnAlert() = AlertManager.shared.showAlertMsg(
+  generalGetString(R.string.auth_simplex_lock_turned_on),
+  generalGetString(R.string.auth_you_will_be_required_to_authenticate_when_you_start_or_resume)
+)
+
+fun laErrorToast(context: Context, errString: CharSequence) = Toast.makeText(
+  context,
+  if (errString.isNotEmpty()) String.format(generalGetString(R.string.auth_error_w_desc), errString) else generalGetString(R.string.auth_error),
+  Toast.LENGTH_SHORT
+).show()
+
+fun laFailedToast(context: Context) = Toast.makeText(
+  context,
+  generalGetString(R.string.auth_failed),
+  Toast.LENGTH_SHORT
+).show()
+
+fun laUnavailableInstructionAlert() = AlertManager.shared.showAlertMsg(
+  generalGetString(R.string.auth_unavailable),
+  generalGetString(R.string.auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled)
+)
+
+fun laUnavailableTurningOffAlert() = AlertManager.shared.showAlertMsg(
+  generalGetString(R.string.auth_unavailable),
+  generalGetString(R.string.auth_device_authentication_is_disabled_turning_off)
+)

apps/android/app/src/main/java/chat/simplex/app/views/helpers/ModalView.kt

@@ -9,20 +9,22 @@ import androidx.compose.material.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.TAG
 
 @Composable
-fun ModalView(close: () -> Unit, content: @Composable () -> Unit) {
+fun ModalView(
+  close: () -> Unit,
+  background: Color = MaterialTheme.colors.background,
+  modifier: Modifier = Modifier.padding(horizontal = 16.dp),
+  content: @Composable () -> Unit,
+) {
   BackHandler(onBack = close)
-  Surface(
-    Modifier
-      .background(MaterialTheme.colors.background)
-      .fillMaxSize()
-  ) {
-    Column {
+  Surface(Modifier.fillMaxSize()) {
+    Column(Modifier.background(background)) {
       CloseSheetBar(close)
-      Box(Modifier.padding(horizontal = 16.dp)) { content() }
+      Box(modifier) { content() }
     }
   }
 }
@@ -32,7 +34,7 @@ class ModalManager {
   private val modalCount = mutableStateOf(0)
 
   fun showModal(content: @Composable () -> Unit) {
-    showCustomModal { close -> ModalView(close, content) }
+    showCustomModal { close -> ModalView(close, content = content) }
   }
 
   fun showCustomModal(modal: @Composable (close: () -> Unit) -> Unit) {
@@ -48,6 +50,10 @@ class ModalManager {
     modalCount.value = modalViews.count()
   }
 
+  fun closeModals() {
+    while (modalViews.isNotEmpty()) closeModal()
+  }
+
   @Composable
   fun showInView() {
     if (modalCount.value > 0) modalViews.lastOrNull()?.invoke(::closeModal)

apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt

@@ -34,8 +34,10 @@ import java.util.*
 import kotlin.math.log2
 import kotlin.math.pow
 
-fun withApi(action: suspend CoroutineScope.() -> Unit): Job =
-  GlobalScope.launch { withContext(Dispatchers.Main, action) }
+fun withApi(action: suspend CoroutineScope.() -> Unit): Job = withScope(GlobalScope, action)
+
+fun withScope(scope: CoroutineScope, action: suspend CoroutineScope.() -> Unit): Job =
+  scope.launch { withContext(Dispatchers.Main, action) }
 
 enum class KeyboardState {
   Opened, Closed

apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt

@@ -40,13 +40,7 @@ fun SimpleXInfoLayout(
   showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
 ) {
   Column(Modifier.fillMaxHeight(), horizontalAlignment = Alignment.Start) {
-    Image(
-      painter = painterResource(R.drawable.logo),
-      contentDescription = stringResource(R.string.image_descr_simplex_logo),
-      modifier = Modifier
-        .padding(vertical = 20.dp)
-        .fillMaxWidth(0.80f)
-    )
+    SimpleXLogo()
 
     Text(stringResource(R.string.next_generation_of_private_messaging), style = MaterialTheme.typography.h2, modifier = Modifier.padding(bottom = 16.dp))
 
@@ -79,6 +73,17 @@ fun SimpleXInfoLayout(
   }
 }
 
+@Composable
+fun SimpleXLogo() {
+  Image(
+    painter = painterResource(R.drawable.logo),
+    contentDescription = stringResource(R.string.image_descr_simplex_logo),
+    modifier = Modifier
+      .padding(vertical = 20.dp)
+      .fillMaxWidth(0.80f)
+  )
+}
+
 @Composable
 private fun InfoRow(emoji: String, @StringRes titleId: Int, @StringRes textId: Int) {
   Row(Modifier.padding(bottom = 20.dp), verticalAlignment = Alignment.Top) {

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt

@@ -0,0 +1,94 @@
+package chat.simplex.app.views.usersettings
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+
+@Composable
+fun CallSettingsView(m: ChatModel) {
+  CallSettingsLayout(
+    webrtcPolicyRelay = m.controller.appPrefs.webrtcPolicyRelay,
+    callOnLockScreen = m.controller.appPrefs.callOnLockScreen
+  )
+}
+
+@Composable
+fun CallSettingsLayout(
+  webrtcPolicyRelay: Preference<Boolean>,
+  callOnLockScreen: Preference<CallOnLockScreen>,
+) {
+  Column(
+    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start,
+    verticalArrangement = Arrangement.spacedBy(8.dp)
+  ) {
+    @Composable fun divider() = Divider(Modifier.padding(horizontal = 8.dp))
+    val lockCallState = remember { mutableStateOf(callOnLockScreen.get()) }
+    Text(
+      stringResource(R.string.your_calls),
+      Modifier.padding(start = 16.dp, bottom = 24.dp),
+      style = MaterialTheme.typography.h1
+    )
+    SettingsSectionView(stringResource(R.string.settings_section_title_settings)) {
+      Box(Modifier.padding(start = 10.dp)) {
+        SharedPreferenceToggle(stringResource(R.string.connect_calls_via_relay), webrtcPolicyRelay)
+      }
+      divider()
+
+      Column(Modifier.padding(start = 10.dp, top = 12.dp)) {
+        Text(stringResource(R.string.call_on_lock_screen))
+        Row {
+          SharedPreferenceRadioButton(stringResource(R.string.no_call_on_lock_screen), lockCallState, callOnLockScreen, CallOnLockScreen.DISABLE)
+          Spacer(Modifier.fillMaxWidth().weight(1f))
+          SharedPreferenceRadioButton(stringResource(R.string.show_call_on_lock_screen), lockCallState, callOnLockScreen, CallOnLockScreen.SHOW)
+          Spacer(Modifier.fillMaxWidth().weight(1f))
+          SharedPreferenceRadioButton(stringResource(R.string.accept_call_on_lock_screen), lockCallState, callOnLockScreen, CallOnLockScreen.ACCEPT)
+        }
+      }
+    }
+  }
+}
+
+@Composable
+fun SharedPreferenceToggle(
+  text: String,
+  preference: Preference<Boolean>,
+  preferenceState: MutableState<Boolean>? = null
+) {
+  val prefState = preferenceState ?: remember { mutableStateOf(preference.get()) }
+  Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
+    Text(text, Modifier.padding(end = 24.dp))
+    Spacer(Modifier.fillMaxWidth().weight(1f))
+    Switch(
+      checked = prefState.value,
+      onCheckedChange = {
+        preference.set(it)
+        prefState.value = it
+      },
+      colors = SwitchDefaults.colors(
+        checkedThumbColor = MaterialTheme.colors.primary,
+        uncheckedThumbColor = HighOrLowlight
+      ),
+      modifier = Modifier.padding(end = 6.dp)
+    )
+  }
+}
+
+@Composable
+fun <T>SharedPreferenceRadioButton(text: String, prefState: MutableState<T>, preference: Preference<T>, value: T) {
+  Row(verticalAlignment = Alignment.CenterVertically) {
+    Text(text)
+    val colors = RadioButtonDefaults.colors(selectedColor = MaterialTheme.colors.primary)
+    RadioButton(selected = prefState.value == value, colors = colors, onClick = {
+      preference.set(value)
+      prefState.value = value
+    })
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ExperimentalFeaturesView.kt

@@ -0,0 +1,32 @@
+package chat.simplex.app.views.usersettings
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Videocam
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
+
+@Composable
+fun ExperimentalFeaturesView(chatModel: ChatModel, enableCalls: MutableState<Boolean>) {
+  Column(
+    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start
+  ) {
+    Text(
+      stringResource(R.string.settings_experimental_features),
+      style = MaterialTheme.typography.h1,
+      modifier = Modifier.padding(start = 16.dp, bottom = 24.dp)
+    )
+    SettingsSectionView("") {
+      SettingsPreferenceItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), chatModel.controller.appPrefs.experimentalCalls, enableCalls)
+    }
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/PrivacySettings.kt

@@ -0,0 +1,39 @@
+package chat.simplex.app.views.usersettings
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Image
+import androidx.compose.material.icons.outlined.TravelExplore
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
+
+@Composable
+fun PrivacySettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
+  @Composable fun divider() = Divider(Modifier.padding(horizontal = 8.dp))
+  Column(
+    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start
+  ) {
+    Text(
+      stringResource(R.string.your_privacy),
+      style = MaterialTheme.typography.h1,
+      modifier = Modifier.padding(start = 16.dp, bottom = 24.dp)
+    )
+    SettingsSectionView(stringResource(R.string.settings_section_title_device)) {
+      ChatLockItem(chatModel.performLA, setPerformLA)
+    }
+    Spacer(Modifier.height(30.dp))
+
+    SettingsSectionView(stringResource(R.string.settings_section_title_chats)) {
+      SettingsPreferenceItem(Icons.Outlined.Image, stringResource(R.string.auto_accept_images), chatModel.controller.appPrefs.privacyAcceptImages)
+      divider()
+      SettingsPreferenceItem(Icons.Outlined.TravelExplore, stringResource(R.string.send_link_previews), chatModel.controller.appPrefs.privacyLinkPreviews)
+    }
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SMPServers.kt

@@ -29,7 +29,7 @@ fun SMPServersView(chatModel: ChatModel) {
   if (userSMPServers != null) {
     var isUserSMPServers by remember { mutableStateOf(userSMPServers.isNotEmpty()) }
     var editSMPServers by remember { mutableStateOf(!isUserSMPServers) }
-    var userSMPServersStr = remember { mutableStateOf(if (isUserSMPServers) userSMPServers.joinToString(separator = "\n") else "") }
+    val userSMPServersStr = remember { mutableStateOf(if (isUserSMPServers) userSMPServers.joinToString(separator = "\n") else "") }
     fun saveSMPServers(smpServers: List<String>) {
       withApi {
         val r = chatModel.controller.setUserSMPServers(smpServers = smpServers)

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt

@@ -1,8 +1,7 @@
 package chat.simplex.app.views.usersettings
 
 import android.content.res.Configuration
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
@@ -10,39 +9,53 @@ import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.*
 import chat.simplex.app.BuildConfig
 import chat.simplex.app.R
-import chat.simplex.app.model.ChatModel
-import chat.simplex.app.model.Profile
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.TerminalView
-import chat.simplex.app.views.call.VideoCallView
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.onboarding.SimpleXInfo
 
 @Composable
-fun SettingsView(chatModel: ChatModel) {
+fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
   val user = chatModel.currentUser.value
+
+  fun setRunServiceInBackground(on: Boolean) {
+    chatModel.controller.appPrefs.runServiceInBackground.set(on)
+    if (on && !chatModel.controller.isIgnoringBatteryOptimizations(chatModel.controller.appContext)) {
+      chatModel.controller.appPrefs.backgroundServiceNoticeShown.set(false)
+    }
+    chatModel.controller.showBackgroundServiceNoticeIfNeeded()
+    chatModel.runServiceInBackground.value = on
+  }
+
   if (user != null) {
     SettingsLayout(
       profile = user.profile,
       runServiceInBackground = chatModel.runServiceInBackground,
-      setRunServiceInBackground = { on ->
-        chatModel.controller.setRunServiceInBackground(on)
-        chatModel.runServiceInBackground.value = on
-      },
+      setRunServiceInBackground = ::setRunServiceInBackground,
+      setPerformLA = setPerformLA,
+      enableCalls = remember { mutableStateOf(chatModel.controller.appPrefs.experimentalCalls.get()) },
       showModal = { modalView -> { ModalManager.shared.showModal { modalView(chatModel) } } },
+      showSettingsModal = { modalView -> { ModalManager.shared.showCustomModal { close ->
+        ModalView(close = close, modifier = Modifier,
+          background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight) {
+          modalView(chatModel)
+        }
+      } } },
       showCustomModal = { modalView -> { ModalManager.shared.showCustomModal { close -> modalView(chatModel, close) } } },
-      showTerminal = { ModalManager.shared.showCustomModal { close -> TerminalView(chatModel, close) } },
-      showVideoChatPrototype = { ModalManager.shared.showCustomModal { close -> VideoCallView(close) } },
+      showTerminal = { ModalManager.shared.showCustomModal { close -> TerminalView(chatModel, close) } }
+//      showVideoChatPrototype = { ModalManager.shared.showCustomModal { close -> CallViewDebug(close) } },
     )
   }
 }
@@ -55,165 +68,194 @@ fun SettingsLayout(
   profile: Profile,
   runServiceInBackground: MutableState<Boolean>,
   setRunServiceInBackground: (Boolean) -> Unit,
+  setPerformLA: (Boolean) -> Unit,
+  enableCalls: MutableState<Boolean>,
   showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
   showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
   showTerminal: () -> Unit,
-  showVideoChatPrototype: () -> Unit
+//  showVideoChatPrototype: () -> Unit
 ) {
   val uriHandler = LocalUriHandler.current
-  Surface(
-    Modifier
-      .background(MaterialTheme.colors.background)
-      .fillMaxSize()
-  ) {
+  Surface(Modifier.fillMaxSize().verticalScroll(rememberScrollState())) {
     Column(
       Modifier
         .fillMaxSize()
-        .background(MaterialTheme.colors.background)
-        .padding(8.dp)
+        .background(if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight)
         .padding(top = 16.dp)
     ) {
+      @Composable fun divider() = Divider(Modifier.padding(horizontal = 8.dp))
+      @Composable fun spacer() = Spacer(Modifier.height(30.dp))
       Text(
         stringResource(R.string.your_settings),
         style = MaterialTheme.typography.h1,
-        modifier = Modifier.padding(start = 8.dp)
+        modifier = Modifier.padding(start = 16.dp)
       )
       Spacer(Modifier.height(30.dp))
 
-      SettingsSectionView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp) {
-        ProfileImage(size = 60.dp, profile.image)
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Column {
-          Text(
-            profile.displayName,
-            style = MaterialTheme.typography.caption,
-            fontWeight = FontWeight.Bold,
-          )
-          Text(profile.fullName)
+      SettingsSectionView(stringResource(R.string.settings_section_title_you)) {
+        SettingsItemView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp) {
+          ProfilePreview(profile)
         }
+        divider()
+        SettingsActionItem(Icons.Outlined.QrCode, stringResource(R.string.your_simplex_contact_address), showModal { UserAddressView(it) })
       }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView(showModal { UserAddressView(it) }) {
-        Icon(
-          Icons.Outlined.QrCode,
-          contentDescription = stringResource(R.string.icon_descr_address),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.your_simplex_contact_address))
-      }
-      Spacer(Modifier.height(24.dp))
+      spacer()
 
-      SettingsSectionView(showModal { HelpView(it) }) {
-        Icon(
-          Icons.Outlined.HelpOutline,
-          contentDescription = stringResource(R.string.icon_descr_help),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.how_to_use_simplex_chat))
+      SettingsSectionView(stringResource(R.string.settings_section_title_settings)) {
+        if (enableCalls.value) {
+          SettingsActionItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), showSettingsModal { CallSettingsView(it) })
+          divider()
+        }
+        SettingsActionItem(Icons.Outlined.Lock, stringResource(R.string.privacy_and_security), showSettingsModal { PrivacySettingsView(it, setPerformLA) })
+        divider()
+        PrivateNotificationsItem(runServiceInBackground, setRunServiceInBackground)
+        divider()
+        SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showModal { SMPServersView(it) })
       }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView(showModal { SimpleXInfo(it, onboarding = false) }) {
-        Icon(
-          Icons.Outlined.Info,
-          contentDescription = stringResource(R.string.icon_descr_help),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.about_simplex_chat))
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView(showModal { MarkdownHelpView() }) {
-        Icon(
-          Icons.Outlined.TextFormat,
-          contentDescription = stringResource(R.string.markdown_help),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.markdown_in_messages))
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView({ uriHandler.openUri(simplexTeamUri) }) {
-        Icon(
-          Icons.Outlined.Tag,
-          contentDescription = stringResource(R.string.icon_descr_simplex_team),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(
-          stringResource(R.string.chat_with_the_founder),
-          color = MaterialTheme.colors.primary
-        )
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView({ uriHandler.openUri("mailto:chat@simplex.chat") }) {
-        Icon(
-          Icons.Outlined.Email,
-          contentDescription = stringResource(R.string.icon_descr_email),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(
-          stringResource(R.string.send_us_an_email),
-          color = MaterialTheme.colors.primary
-        )
-      }
-      Spacer(Modifier.height(24.dp))
+      spacer()
 
-      SettingsSectionView(showModal { SMPServersView(it) }) {
-        Icon(
-          Icons.Outlined.Dns,
-          contentDescription = stringResource(R.string.smp_servers),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.smp_servers))
+      SettingsSectionView(stringResource(R.string.settings_section_title_help)) {
+        SettingsActionItem(Icons.Outlined.HelpOutline, stringResource(R.string.how_to_use_simplex_chat), showModal { HelpView(it) })
+        divider()
+        SettingsActionItem(Icons.Outlined.Info, stringResource(R.string.about_simplex_chat), showModal { SimpleXInfo(it, onboarding = false) })
+        divider()
+        SettingsActionItem(Icons.Outlined.TextFormat, stringResource(R.string.markdown_in_messages), showModal { MarkdownHelpView() })
+        divider()
+        SettingsActionItem(Icons.Outlined.Tag, stringResource(R.string.chat_with_the_founder), { uriHandler.openUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary)
+        divider()
+        SettingsActionItem(Icons.Outlined.Email, stringResource(R.string.send_us_an_email), { uriHandler.openUri("mailto:chat@simplex.chat") }, textColor = MaterialTheme.colors.primary)
       }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView() {
-        Icon(
-          Icons.Outlined.Bolt,
-          contentDescription = stringResource(R.string.private_notifications),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(
-          stringResource(R.string.private_notifications), Modifier
-            .padding(end = 24.dp)
-            .fillMaxWidth()
-            .weight(1F))
-        Switch(
-          checked = runServiceInBackground.value,
-          onCheckedChange = { setRunServiceInBackground(it) },
-          colors = SwitchDefaults.colors(
-            checkedThumbColor = MaterialTheme.colors.primary,
-            uncheckedThumbColor = HighOrLowlight
-          ),
-          modifier = Modifier.padding(end = 8.dp)
-        )
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView(showTerminal) {
-        Icon(
-          painter = painterResource(id = R.drawable.ic_outline_terminal),
-          contentDescription = stringResource(R.string.chat_console),
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(stringResource(R.string.chat_console))
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-      SettingsSectionView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat") }) {
-        Icon(
-          painter = painterResource(id = R.drawable.ic_github),
-          contentDescription = "GitHub",
-        )
-        Spacer(Modifier.padding(horizontal = 4.dp))
-        Text(annotatedStringResource(R.string.install_simplex_chat_for_terminal))
-      }
-      Divider(Modifier.padding(horizontal = 8.dp))
-//      SettingsSectionView(showVideoChatPrototype) {
-      SettingsSectionView() {
-        Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
+      spacer()
+
+      SettingsSectionView(stringResource(R.string.settings_section_title_develop)) {
+        ChatConsoleItem(showTerminal)
+        divider()
+        InstallTerminalAppItem(uriHandler)
+        divider()
+        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it, enableCalls) })
+        divider()
+        AppVersionItem()
       }
     }
   }
 }
 
+@Composable fun SettingsSectionView(title: String, content: (@Composable () -> Unit)) {
+  Column {
+    Text(title, color = HighOrLowlight, style = MaterialTheme.typography.body2,
+      modifier = Modifier.padding(start = 16.dp, bottom = 5.dp), fontSize = 12.sp)
+    Surface(color = if (isSystemInDarkTheme()) GroupDark else MaterialTheme.colors.background) {
+      Column(Modifier.padding(horizontal = 6.dp)) { content() }
+    }
+  }
+}
+
+@Composable private fun PrivateNotificationsItem(
+  runServiceInBackground: MutableState<Boolean>,
+  setRunServiceInBackground: (Boolean) -> Unit
+) {
+  SettingsItemView() {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+      Icon(
+        Icons.Outlined.Bolt,
+        contentDescription = stringResource(R.string.private_notifications),
+        tint = HighOrLowlight,
+      )
+      Spacer(Modifier.padding(horizontal = 4.dp))
+      Text(
+        stringResource(R.string.private_notifications),
+        Modifier
+          .padding(end = 24.dp)
+          .fillMaxWidth()
+          .weight(1f)
+      )
+      Switch(
+        checked = runServiceInBackground.value,
+        onCheckedChange = { setRunServiceInBackground(it) },
+        colors = SwitchDefaults.colors(
+          checkedThumbColor = MaterialTheme.colors.primary,
+          uncheckedThumbColor = HighOrLowlight
+        ),
+        modifier = Modifier.padding(end = 6.dp)
+      )
+    }
+  }
+}
+
+@Composable fun ChatLockItem(performLA: MutableState<Boolean>, setPerformLA: (Boolean) -> Unit) {
+  SettingsItemView() {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+      Icon(
+        Icons.Outlined.Lock,
+        contentDescription = stringResource(R.string.chat_lock),
+        tint = HighOrLowlight,
+      )
+      Spacer(Modifier.padding(horizontal = 4.dp))
+      Text(
+        stringResource(R.string.chat_lock), Modifier
+          .padding(end = 24.dp)
+          .fillMaxWidth()
+          .weight(1F)
+      )
+      Switch(
+        checked = performLA.value,
+        onCheckedChange = { setPerformLA(it) },
+        colors = SwitchDefaults.colors(
+          checkedThumbColor = MaterialTheme.colors.primary,
+          uncheckedThumbColor = HighOrLowlight
+        ),
+        modifier = Modifier.padding(end = 6.dp)
+      )
+    }
+  }
+}
+
+@Composable private fun ChatConsoleItem(showTerminal: () -> Unit) {
+  SettingsItemView(showTerminal) {
+    Icon(
+      painter = painterResource(id = R.drawable.ic_outline_terminal),
+      contentDescription = stringResource(R.string.chat_console),
+      tint = HighOrLowlight,
+    )
+    Spacer(Modifier.padding(horizontal = 4.dp))
+    Text(stringResource(R.string.chat_console))
+  }
+}
+
+@Composable private fun InstallTerminalAppItem(uriHandler: UriHandler) {
+  SettingsItemView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat") }) {
+    Icon(
+      painter = painterResource(id = R.drawable.ic_github),
+      contentDescription = "GitHub",
+      tint = HighOrLowlight,
+    )
+    Spacer(Modifier.padding(horizontal = 4.dp))
+    Text(annotatedStringResource(R.string.install_simplex_chat_for_terminal))
+  }
+}
+
+@Composable private fun AppVersionItem() {
+  SettingsItemView() {
+    Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
+  }
+}
+
+@Composable fun ProfilePreview(profileOf: NamedChat, size: Dp = 60.dp, color: Color = MaterialTheme.colors.secondary) {
+  ProfileImage(size = size, image = profileOf.image, color = color)
+  Spacer(Modifier.padding(horizontal = 4.dp))
+  Column {
+    Text(
+      profileOf.displayName,
+      style = MaterialTheme.typography.caption,
+      fontWeight = FontWeight.Bold,
+    )
+    Text(profileOf.fullName)
+  }
+}
+
 @Composable
-fun SettingsSectionView(click: (() -> Unit)? = null, height: Dp = 46.dp, content: (@Composable () -> Unit)) {
+fun SettingsItemView(click: (() -> Unit)? = null, height: Dp = 46.dp, content: (@Composable () -> Unit)) {
   val modifier = Modifier
     .padding(start = 8.dp)
     .fillMaxWidth()
@@ -226,6 +268,26 @@ fun SettingsSectionView(click: (() -> Unit)? = null, height: Dp = 46.dp, content
   }
 }
 
+@Composable
+fun SettingsActionItem(icon: ImageVector, text: String, click: (() -> Unit)? = null, textColor: Color = Color.Unspecified) {
+  SettingsItemView(click) {
+    Icon(icon, text, tint = HighOrLowlight)
+    Spacer(Modifier.padding(horizontal = 4.dp))
+    Text(text, color = textColor)
+  }
+}
+
+@Composable
+fun SettingsPreferenceItem(icon: ImageVector, text: String, pref: Preference<Boolean>, prefState: MutableState<Boolean>? = null) {
+  SettingsItemView() {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+      Icon(icon, text, tint = HighOrLowlight)
+      Spacer(Modifier.padding(horizontal = 4.dp))
+      SharedPreferenceToggle(text, pref, prefState)
+    }
+  }
+}
+
 @Preview(showBackground = true)
 @Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -239,10 +301,13 @@ fun PreviewSettingsLayout() {
       profile = Profile.sampleData,
       runServiceInBackground = remember { mutableStateOf(true) },
       setRunServiceInBackground = {},
-      showModal = {{}},
-      showCustomModal = {{}},
+      setPerformLA = {},
+      enableCalls = remember { mutableStateOf(true) },
+      showModal = { {} },
+      showSettingsModal = { {} },
+      showCustomModal = { {} },
       showTerminal = {},
-      showVideoChatPrototype = {}
+//      showVideoChatPrototype = {}
     )
   }
 }

apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfileView.kt

@@ -10,8 +10,7 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Close
-import androidx.compose.material.icons.outlined.PhotoCamera
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -25,8 +24,10 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
 import chat.simplex.app.model.Profile
+import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.isValidDisplayName
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.insets.navigationBarsWithImePadding
 import kotlinx.coroutines.launch
@@ -128,7 +129,12 @@ fun UserProfileLayout(
                   }
                 }
               }
-              ProfileNameTextField(displayName)
+              Box {
+                if (!isValidDisplayName(displayName.value)) {
+                  Icon(Icons.Outlined.Info, tint = Color.Red, contentDescription = stringResource(R.string.display_name_cannot_contain_whitespace))
+                }
+                ProfileNameTextField(displayName)
+              }
               ProfileNameTextField(fullName)
               Row {
                 TextButton(stringResource(R.string.cancel_verb)) {
@@ -138,9 +144,22 @@ fun UserProfileLayout(
                   editProfile.value = false
                 }
                 Spacer(Modifier.padding(horizontal = 8.dp))
-                TextButton(stringResource(R.string.save_and_notify_contacts)) {
-                  saveProfile(displayName.value, fullName.value, profileImage.value)
+                val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
+                val saveModifier: Modifier
+                val saveColor: Color
+                if (enabled) {
+                  saveModifier = Modifier
+                    .clickable { saveProfile(displayName.value, fullName.value, profileImage.value) }
+                  saveColor = MaterialTheme.colors.primary
+                } else {
+                  saveModifier = Modifier
+                  saveColor = HighOrLowlight
                 }
+                Text(
+                  stringResource(R.string.save_and_notify_contacts),
+                  modifier = saveModifier,
+                  color = saveColor
+                )
               }
             }
           } else {
@@ -187,6 +206,7 @@ private fun ProfileNameTextField(name: MutableState<String>) {
     onValueChange = { name.value = it },
     modifier = Modifier
       .padding(bottom = 24.dp)
+      .padding(start = 28.dp)
       .fillMaxWidth(),
     textStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground),
     keyboardOptions = KeyboardOptions(

apps/android/app/src/main/res/values-ru/strings.xml

@@ -46,21 +46,45 @@
     <string name="connection_error_auth_desc">Возможно, ваш контакт удалил ссылку, или она уже была использована. Если это не так, то это может быть ошибкой - пожалуйста, сообщите нам об этом.\nЧтобы установить соединение, попросите ваш контакт создать еще одну ссылку и проверьте ваше соединение с сетью.</string>
     <string name="cannot_delete_contact">Невозможно удалить контакт!</string>
     <string name="contact_cannot_be_deleted_as_they_are_in_groups">Контакт <xliff:g id="contactName" example="Jane Doe">%1$s!</xliff:g> не может быть удален, так как является членом групп(ы) <xliff:g id="groups" example="[team, chess club]">%2$s</xliff:g>.</string>
-    <string name="icon_descr_instant_notifications">Мгновенные уведомления</string>
     <string name="error_deleting_contact">Ошибка удаления контакта</string>
     <string name="error_deleting_group">Ошибка удаления группы</string>
     <string name="error_deleting_contact_request">Ошибка удаления запроса</string>
     <string name="error_deleting_pending_contact_connection">Ошибка удаления ожидаемого соединения</string>
 
     <!-- background service notice - SimpleXAPI.kt -->
+    <string name="icon_descr_instant_notifications">Мгновенные уведомления</string>
     <string name="private_instant_notifications">Приватные мгновенные уведомления!</string>
+    <string name="private_instant_notifications_disabled">Приватные уведомления выключены!</string>
     <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">Чтобы защитить ваши личные данные, вместо уведомлений от сервера приложение запускает <b>фоновый сервис <xliff:g id="appName">SimpleX</xliff:g></b>, который потребляет несколько процентов батареи в день.</string>
     <string name="it_can_disabled_via_settings_notifications_still_shown"><b>Он может быть выключен через Настройки</b> – вы продолжите получать уведомления о сообщениях пока приложение запущено.</string>
+    <string name="turn_off_battery_optimization">Для использования приватных уведомлений, пожалуйста отключите оптимизацию батареи для <xliff:g id="appName">SimpleX</xliff:g> в слеующем диалоге. Иначе уведомления будут выключены.</string>
+    <string name="turning_off_background_service">Оптимизация батареи включена, поэтому приватные уведомления выключены. Вы можете снова включить их через Настройки.</string>
 
     <!-- SimpleX Chat foreground Service -->
     <string name="simplex_service_notification_title"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> сервис</string>
     <string name="simplex_service_notification_text">Приём сообщений…</string>
 
+    <!-- local authentication notice - SimpleXAPI.kt -->
+    <string name="la_notice_title_simplex_lock">Блокировка SimpleX</string>
+    <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">Чтобы защитить вашу информацию, включите блокировку <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.\nВам будет нужно пройти аутентификацию для включения блокировки.</string>
+    <string name="la_notice_turn_on">Включить</string>
+
+    <!-- LocalAuthentication.kt -->
+    <string name="auth_simplex_lock_turned_on">Блокировка SimpleX включена</string>
+    <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">Вы будете аутентифицированы при запуске и возобновлении приложения, которое было 30 секунд в фоновом режиме.</string>
+    <string name="auth_unlock">Разблокировать</string>
+    <string name="auth_log_in_using_credential">Пройдите аутентификацию</string>
+    <string name="auth_enable_simplex_lock">Включить блокировку SimpleX</string>
+    <string name="auth_disable_simplex_lock">Отключить блокировку SimpleX</string>
+    <string name="auth_confirm_credential">Пройдите аутентификацию</string>
+    <string name="auth_error">Ошибка аутентификации</string>
+    <string name="auth_error_w_desc">Ошибка аутентификации: <xliff:g id="desc">%1$s</xliff:g></string>
+    <string name="auth_failed">Ошибка аутентификации</string>
+    <string name="auth_unavailable">Аутентификация недоступна</string>
+    <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Аутентификация устройства не включена. Вы можете включить блокировку SimpleX в Настройках после включения аутентификации.</string>
+    <string name="auth_device_authentication_is_disabled_turning_off">Аутентификация устройства выключена. Отключение блокировки SimpleX Chat.</string>
+    <string name="auth_retry">Повторить</string>
+
     <!-- Chat Actions - ChatItemView.kt (and general) -->
     <string name="reply_verb">Ответить</string>
     <string name="share_verb">Поделиться</string>
@@ -144,7 +168,7 @@
     <string name="toast_permission_denied">Разрешение не получено!</string>
     <string name="use_camera_button">Камера</string>
     <string name="from_gallery_button">Галерея</string>
-    <string name="choose_file">Файлы\n(v2.0)</string>
+    <string name="choose_file">Файлы</string>
 
     <!-- help - ChatHelpView.kt -->
     <string name="thank_you_for_installing_simplex">Спасибо, что установили <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
@@ -165,6 +189,13 @@
     <string name="accept_contact_button">Принять</string>
     <string name="reject_contact_button">Отклонить</string>
 
+    <!-- Clear Chat - ChatListNavLinkView.kt -->
+    <string name="clear_chat_question">Очистить чат?</string>
+    <string name="clear_chat_warning">Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для вас.</string>
+    <string name="clear_verb">Очистить</string>
+    <string name="clear_chat_button">Очистить чат</string>
+    <string name="mark_read">Прочитано</string>
+
     <!-- Pending contact connection alert dialogues -->
     <string name="you_invited_your_contact">Вы пригласили ваш контакт</string>
     <string name="you_accepted_connection">Вы приняли приглашение соединиться</string>
@@ -209,8 +240,7 @@
     <string name="if_you_cannot_meet_in_person_scan_QR_in_video_call_or_ask_for_invitation_link">Если вы не можете встретиться лично, вы можете <b>сосканировать QR код во время видеозвонка</b>, или ваш контакт может отправить вам ссылку.</string>
     <string name="share_invitation_link">Поделиться ссылкой</string>
     <string name="paste_connection_link_below_to_connect">Чтобы соединиться, вставьте в это поле ссылку, полученную от вашего контакта.</string>
-
-
+    
     <!-- settings - SettingsView.kt -->
     <string name="your_settings">Настройки</string>
     <string name="your_simplex_contact_address">Ваш <xliff:g id="appName">SimpleX</xliff:g> адрес</string>
@@ -221,6 +251,7 @@
     <string name="chat_with_the_founder">Соединиться с разработчиками</string>
     <string name="send_us_an_email">Отправить email</string>
     <string name="private_notifications">Приватные уведомления</string>
+    <string name="chat_lock">Блокировка SimpleX</string>
     <string name="chat_console">Консоль</string>
     <string name="smp_servers">SMP серверы</string>
     <string name="install_simplex_chat_for_terminal"><font color="#0088ff"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> для терминала</font></string>
@@ -284,18 +315,20 @@
     <string name="callstatus_missed">пропущенный звонок</string>
     <string name="callstatus_rejected">отклоненный звонок</string>
     <string name="callstatus_accepted">принятый звонок</string>
-    <string name="callstatus_connecting">соединяется…</string>
+    <string name="callstatus_connecting">звонок соединяется…</string>
     <string name="callstatus_in_progress">активный звонок</string>
-    <string name="callstatus_ended">звонок завершён <xliff:g id="duration" example="01:15">%1$s!</xliff:g></string>
-    <string name="callstatus_error">ошибка соединения</string>
+    <string name="callstatus_ended">звонок завершён <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
+    <string name="callstatus_error">ошибка звонка</string>
 
     <!-- CallState -->
     <string name="callstate_starting">инициализация…</string>
     <string name="callstate_waiting_for_answer">ожидается ответ…</string>
     <string name="callstate_waiting_for_confirmation">ожидается подтверждение…</string>
     <string name="callstate_received_answer">получен ответ…</string>
+    <string name="callstate_received_confirmation">получено подтверждение…</string>
     <string name="callstate_connecting">соединяется…</string>
     <string name="callstate_connected">соединено</string>
+    <string name="callstate_ended">завершен</string>
 
     <!-- SimpleXInfo -->
     <string name="next_generation_of_private_messaging">Новое поколение приватных сообщений</string>
@@ -329,4 +362,79 @@
     <string name="or">или</string>
     <string name="connect_with_the_developers">Соединиться с разработчиками</string>
     <string name="to_ask_any_questions_and_to_receive_simplex_chat_updates">Чтобы задать вопросы и получать уведомления о <xliff:g id="appNameFull">SimpleX Chat</xliff:g>.</string>
+
+    <!-- Call -->
+    <string name="incoming_video_call">Входящий видеозвонок</string>
+    <string name="incoming_audio_call">Входящий аудиозвонок</string>
+    <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> хочет связаться с вами через </string>
+    <string name="video_call_no_encryption">видеозвонок (не e2e зашифрованный)</string>
+    <string name="encrypted_video_call">e2e зашифрованный видеозвонок</string>
+    <string name="audio_call_no_encryption">аудиозвонок (не e2e зашифрованный)</string>
+    <string name="encrypted_audio_call">e2e зашифрованный аудиозвонок</string>
+    <string name="accept">Принять</string>
+    <string name="reject">Отклонить</string>
+    <string name="ignore">Закрыть</string>
+    <string name="call_already_ended">Звонок уже завершен!</string>
+    <string name="icon_descr_video_call">видеозвонок</string>
+    <string name="icon_descr_audio_call">аудиозвонок</string>
+
+    <!-- Call settings -->
+    <string name="settings_audio_video_calls">Аудио- и видеозвонки</string>
+    <string name="your_calls">Ваши звонки</string>
+    <string name="connect_calls_via_relay">Соединяться через сервер (relay)</string>
+    <string name="call_on_lock_screen">Звонки на экране блокировки:</string>
+    <string name="accept_call_on_lock_screen">Принимать</string>
+    <string name="show_call_on_lock_screen">Показывать</string>
+    <string name="no_call_on_lock_screen">Выключить</string>
+
+    <!-- Call Lock Screen -->
+    <string name="open_simplex_chat_to_accept_call">Откройте <xliff:g id="appNameFull">SimpleX Chat</xliff:g>\nчтобы принять звонок</string>
+    <string name="allow_accepting_calls_from_lock_screen">Вы можете разрешить принимать звонки на экране блокировки через Настройки.</string>
+    <string name="open_verb">Открыть</string>
+
+    <!-- Call overlay -->
+    <string name="status_e2e_encrypted">e2e зашифровано</string>
+    <string name="status_no_e2e_encryption">нет e2e шифрования</string>
+    <string name="status_contact_has_e2e_encryption">у контакта есть e2e шифрование</string>
+    <string name="status_contact_has_no_e2e_encryption">у контакта нет e2e шифрования</string>
+    <string name="call_connection_peer_to_peer">peer-to-peer</string>
+    <string name="call_connection_via_relay">через relay сервер</string>
+    <string name="icon_descr_hang_up">Закончить звонок</string>
+    <string name="icon_descr_video_off">Выключить видео</string>
+    <string name="icon_descr_video_on">Включить видео</string>
+    <string name="icon_descr_audio_off">Выключить звук</string>
+    <string name="icon_descr_audio_on">Включить звук</string>
+    <string name="icon_descr_flip_camera">Перевернуть камеру</string>
+
+    <!-- Call items -->
+    <string name="icon_descr_call_pending_sent">Входящий звонок</string>
+    <string name="icon_descr_call_missed">Пропущенный звонок</string>
+    <string name="icon_descr_call_rejected">Отклоненный звонок</string>
+    <string name="icon_descr_call_connecting">Соединяющийся звонок</string>
+    <string name="icon_descr_call_progress">Текущий звонок</string>
+    <string name="icon_descr_call_ended">Звонок завершен</string>
+    <string name="answer_call">Принять звонок</string>
+
+    <!-- Message integrity -->
+    <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> пропущенных сообщений"</string>
+    <string name="integrity_msg_bad_hash">ошибка хэш сообщения</string>
+    <string name="integrity_msg_bad_id">ошибка ID сообщения</string>
+    <string name="integrity_msg_duplicate">повторное сообщение</string>
+    <string name="alert_title_skipped_messages">Пропущенные сообщения</string>
+    <string name="alert_text_skipped_messages_it_can_happen_when">Это может случится, когда:\n1. Сервер удалил сообщения, если они не были доставлены в течение 30 дней.\n2. Сервер, через который вы получаете сообщения от контакта, был обновлён и перезапущен.\n3. Соединение компроментировано.\nПожалуйста, соединитесь с девелоперами через Настройки, чтобы получать уведомления о серверах.\nМы планируем добавить избыточную доставку сообщений, чтобы не терять сообщения.</string>
+
+    <!-- Privacy settings -->
+    <string name="privacy_and_security">Конфиденциальность</string>
+    <string name="your_privacy">Конфиденциальность</string>
+    <string name="auto_accept_images">Автоприем изображений</string>
+    <string name="send_link_previews">Отправлять картинки ссылок</string>
+
+    <!-- Settings sections -->
+    <string name="settings_section_title_you">ВЫ</string>
+    <string name="settings_section_title_settings">НАСТРОЙКИ</string>
+    <string name="settings_section_title_help">ПОМОЩЬ</string>
+    <string name="settings_section_title_develop">ДЛЯ РАЗРАБОТЧИКОВ</string>
+    <string name="settings_section_title_device">УСТРОЙСТВО</string>
+    <string name="settings_section_title_chats">ЧАТЫ</string>
+    <string name="settings_experimental_features">Экспериментальные функции</string>
 </resources>

apps/android/app/src/main/res/values/strings.xml

@@ -46,21 +46,45 @@
   <string name="connection_error_auth_desc">Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection.</string>
   <string name="cannot_delete_contact">Can\'t delete contact!</string>
   <string name="contact_cannot_be_deleted_as_they_are_in_groups">Contact <xliff:g id="contactName" example="Jane Doe">%1$s!</xliff:g> cannot be deleted, they are a member of the group(s) <xliff:g id="groups" example="[team, chess club]">%2$s</xliff:g>.</string>
-  <string name="icon_descr_instant_notifications">Instant notifications</string>
   <string name="error_deleting_contact">Error deleting contact</string>
   <string name="error_deleting_group">Error deleting group</string>
   <string name="error_deleting_contact_request">Error deleting contact request</string>
   <string name="error_deleting_pending_contact_connection">Error deleting pending contact connection</string>
 
   <!-- background service notice - SimpleXAPI.kt -->
+  <string name="icon_descr_instant_notifications">Instant notifications</string>
   <string name="private_instant_notifications">Private instant notifications!</string>
+  <string name="private_instant_notifications_disabled">Private notifications disabled!</string>
   <string name="to_preserve_privacy_simplex_has_background_service_instead_of_push_notifications_it_uses_a_few_pc_battery">To preserve your privacy, instead of push notifications the app has a <b><xliff:g id="appName">SimpleX</xliff:g> background service</b> – it uses a few percent of the battery per day.</string>
   <string name="it_can_disabled_via_settings_notifications_still_shown"><b>It can be disabled via settings</b> – notifications will still be shown while the app is running.</string>
+  <string name="turn_off_battery_optimization">In order to use it, please <b>disable battery optimization</b> for <xliff:g id="appName">SimpleX</xliff:g> in the next dialog. Otherwise, the notifications will be disabled.</string>
+  <string name="turning_off_background_service">Battery optimization is active, turning off Private notifications. You can re-enable them via settings.</string>
 
   <!-- SimpleX Chat foreground Service -->
   <string name="simplex_service_notification_title"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> service</string>
   <string name="simplex_service_notification_text">Receiving messages…</string>
 
+  <!-- local authentication notice - SimpleXAPI.kt -->
+  <string name="la_notice_title_simplex_lock">SimpleX Lock</string>
+  <string name="la_notice_to_protect_your_information_turn_on_simplex_lock_you_will_be_prompted_to_complete_authentication_before_this_feature_is_enabled">To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled.</string>
+  <string name="la_notice_turn_on">Turn on</string>
+
+  <!-- LocalAuthentication.kt -->
+  <string name="auth_simplex_lock_turned_on">SimpleX Lock turned on</string>
+  <string name="auth_you_will_be_required_to_authenticate_when_you_start_or_resume">You will be required to authenticate when you start or resume the app after 30 seconds in background.</string>
+  <string name="auth_unlock">Unlock</string>
+  <string name="auth_log_in_using_credential">Log in using your credential</string>
+  <string name="auth_enable_simplex_lock">Enable SimpleX Lock</string>
+  <string name="auth_disable_simplex_lock">Disable SimpleX Lock</string>
+  <string name="auth_confirm_credential">Confirm your credential</string>
+  <string name="auth_error">Authentication error</string>
+  <string name="auth_error_w_desc">Authentication error: <xliff:g id="desc">%1$s</xliff:g></string>
+  <string name="auth_failed">Authentication failed</string>
+  <string name="auth_unavailable">Authentication unavailable</string>
+  <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</string>
+  <string name="auth_device_authentication_is_disabled_turning_off">Device authentication is disabled. Turning off SimpleX Lock.</string>
+  <string name="auth_retry">Retry</string>
+
   <!-- Chat Actions - ChatItemView.kt (and general) -->
   <string name="reply_verb">Reply</string>
   <string name="share_verb">Share</string>
@@ -145,7 +169,7 @@
   <string name="toast_permission_denied">Permission Denied!</string>
   <string name="use_camera_button">Use Camera</string>
   <string name="from_gallery_button">From Gallery</string>
-  <string name="choose_file">Choose file\n(new in v2.0)</string>
+  <string name="choose_file">Choose file</string>
 
   <!-- help - ChatHelpView.kt -->
   <string name="thank_you_for_installing_simplex">Thank you for installing <xliff:g id="appNameFull">SimpleX Chat</xliff:g>!</string>
@@ -166,6 +190,13 @@
   <string name="accept_contact_button">Accept</string>
   <string name="reject_contact_button">Reject</string>
 
+  <!-- Clear Chat - ChatListNavLinkView.kt -->
+  <string name="clear_chat_question">Clear chat?</string>
+  <string name="clear_chat_warning">All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you.</string>
+  <string name="clear_verb">Clear</string>
+  <string name="clear_chat_button">Clear chat</string>
+  <string name="mark_read">Mark read</string>
+
   <!-- Pending contact connection alert dialogues -->
   <string name="you_invited_your_contact">You invited your contact</string>
   <string name="you_accepted_connection">You accepted connection</string>
@@ -226,6 +257,7 @@
   <string name="chat_with_the_founder">Connect to the developers</string>
   <string name="send_us_an_email">Send us email</string>
   <string name="private_notifications">Private notifications</string>
+  <string name="chat_lock">SimpleX Lock</string>
   <string name="chat_console">Chat console</string>
   <string name="smp_servers">SMP servers</string>
   <string name="install_simplex_chat_for_terminal">Install <font color="#0088ff"><xliff:g id="appNameFull">SimpleX Chat</xliff:g> for terminal</font></string>
@@ -280,23 +312,25 @@
   <string name="colored">colored</string>
   <string name="secret">secret</string>
 
-  <!-- CICallStatus -->
+  <!-- CICallStatus - in chat items -->
   <string name="callstatus_calling">calling…</string>
-  <string name="callstatus_missed">missed</string>
-  <string name="callstatus_rejected">rejected</string>
-  <string name="callstatus_accepted">accepted</string>
-  <string name="callstatus_connecting">connecting…</string>
-  <string name="callstatus_in_progress">in progress</string>
-  <string name="callstatus_ended">ended <xliff:g id="duration" example="01:15">%1$s!</xliff:g></string>
-  <string name="callstatus_error">error</string>
+  <string name="callstatus_missed">missed call</string>
+  <string name="callstatus_rejected">rejected call</string>
+  <string name="callstatus_accepted">accepted call</string>
+  <string name="callstatus_connecting">connecting call…</string>
+  <string name="callstatus_in_progress">call in progress</string>
+  <string name="callstatus_ended">call ended <xliff:g id="duration" example="01:15">%1$s</xliff:g></string>
+  <string name="callstatus_error">call error</string>
 
   <!-- CallState -->
   <string name="callstate_starting">starting…</string>
   <string name="callstate_waiting_for_answer">waiting for answer…</string>
   <string name="callstate_waiting_for_confirmation">waiting for confirmation…</string>
   <string name="callstate_received_answer">received answer…</string>
+  <string name="callstate_received_confirmation">received confirmation…</string>
   <string name="callstate_connecting">connecting…</string>
   <string name="callstate_connected">connected</string>
+  <string name="callstate_ended">ended</string>
 
   <!-- SimpleXInfo -->
   <string name="next_generation_of_private_messaging">The next generation of private messaging</string>
@@ -330,4 +364,79 @@
   <string name="or">or</string>
   <string name="connect_with_the_developers">Connect with the developers</string>
   <string name="to_ask_any_questions_and_to_receive_simplex_chat_updates">To ask any questions and to receive <xliff:g id="appNameFull">SimpleX Chat</xliff:g> updates.</string>
+
+  <!-- Call -->
+  <string name="incoming_video_call">Incoming video call</string>
+  <string name="incoming_audio_call">Incoming audio call</string>
+  <string name="contact_wants_to_connect_via_call"><xliff:g id="contactName" example="Alice">%1$s</xliff:g> wants to connect with you via</string>
+  <string name="video_call_no_encryption">video call (not e2e encrypted)</string>
+  <string name="encrypted_video_call">e2e encrypted video call</string>
+  <string name="audio_call_no_encryption">audio call (not e2e encrypted)</string>
+  <string name="encrypted_audio_call">e2e encrypted audio call</string>
+  <string name="accept">Accept</string>
+  <string name="reject">Reject</string>
+  <string name="ignore">Ignore</string>
+  <string name="call_already_ended">Call already ended!</string>
+  <string name="icon_descr_video_call">video call</string>
+  <string name="icon_descr_audio_call">audio call</string>
+
+  <!-- Call settings -->
+  <string name="settings_audio_video_calls">Audio &amp; video calls</string>
+  <string name="your_calls">Your calls</string>
+  <string name="connect_calls_via_relay">Connect via relay</string>
+  <string name="call_on_lock_screen">Calls on lock screen:</string>
+  <string name="accept_call_on_lock_screen">Accept</string>
+  <string name="show_call_on_lock_screen">Show</string>
+  <string name="no_call_on_lock_screen">Disable</string>
+
+  <!-- Call Lock Screen -->
+  <string name="open_simplex_chat_to_accept_call">Open <xliff:g id="appNameFull">SimpleX Chat</xliff:g> to accept call</string>
+  <string name="allow_accepting_calls_from_lock_screen">Enable calls from lock screen via Settings.</string>
+  <string name="open_verb">Open</string>
+
+  <!-- Call overlay -->
+  <string name="status_e2e_encrypted">e2e encrypted</string>
+  <string name="status_no_e2e_encryption">no e2e encryption</string>
+  <string name="status_contact_has_e2e_encryption">contact has e2e encryption</string>
+  <string name="status_contact_has_no_e2e_encryption">contact has no e2e encryption</string>
+  <string name="call_connection_peer_to_peer">peer-to-peer</string>
+  <string name="call_connection_via_relay">via relay</string>
+  <string name="icon_descr_hang_up">Hang up</string>
+  <string name="icon_descr_video_off">Video off</string>
+  <string name="icon_descr_video_on">Video on</string>
+  <string name="icon_descr_audio_off">Audio off</string>
+  <string name="icon_descr_audio_on">Audio on</string>
+  <string name="icon_descr_flip_camera">Flip camera</string>
+
+  <!-- Call items -->
+  <string name="icon_descr_call_pending_sent">Pending call</string>
+  <string name="icon_descr_call_missed">Missed call</string>
+  <string name="icon_descr_call_rejected">Rejected call</string>
+  <string name="icon_descr_call_connecting">Connecting call</string>
+  <string name="icon_descr_call_progress">Call in progress</string>
+  <string name="icon_descr_call_ended">Call ended</string>
+  <string name="answer_call">Answer call</string>
+
+  <!-- Message integrity -->
+  <string name="integrity_msg_skipped"><xliff:g id="connection ID" example="1">%1$d</xliff:g> skipped message(s)"</string>
+  <string name="integrity_msg_bad_hash">bad message hash</string>
+  <string name="integrity_msg_bad_id">bad message ID</string>
+  <string name="integrity_msg_duplicate">duplicate message</string>
+  <string name="alert_title_skipped_messages">Skipped messages</string>
+  <string name="alert_text_skipped_messages_it_can_happen_when">It can happen when:\n1. The messages expire on the server if they were not received for 30 days,\n2. The server you use to receive the messages from this contact was updated and restarted.\n3. The connection is compromised.\nPlease connect to the developers via Settings to receive the updates about the servers.\nWe will be adding server redundancy to prevent lost messages.</string>
+
+  <!-- Privacy settings -->
+  <string name="privacy_and_security">Privacy &amp; security</string>
+  <string name="your_privacy">Your privacy</string>
+  <string name="auto_accept_images">Auto-accept images</string>
+  <string name="send_link_previews">Send link previews</string>
+
+  <!-- Settings sections -->
+  <string name="settings_section_title_you">YOU</string>
+  <string name="settings_section_title_settings">SETTINGS</string>
+  <string name="settings_section_title_help">HELP</string>
+  <string name="settings_section_title_develop">DEVELOP</string>
+  <string name="settings_section_title_device">DEVICE</string>
+  <string name="settings_section_title_chats">CHATS</string>
+  <string name="settings_experimental_features">Experimental features</string>
 </resources>

apps/android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
         classpath "org.jetbrains.kotlin:kotlin-serialization:1.3.2"
 
@@ -16,8 +16,8 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.1.3' apply false
-    id 'com.android.library' version '7.1.3' apply false
+    id 'com.android.application' version '7.2.0' apply false
+    id 'com.android.library' version '7.2.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
     id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.10'
 }

apps/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Feb 14 14:23:51 GMT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

apps/ios/Shared/AppDelegate.swift

@@ -70,7 +70,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                 // TODO check if app in background
                 logger.debug("AppDelegate: didReceiveRemoteNotification: checkMessages")
                 // TODO remove
-                NtfManager.shared.notifyCheckingMessages()
+                // NtfManager.shared.notifyCheckingMessages()
                 receiveMessages(completionHandler)
             } else if let smpQueue = ntfData["checkMessage"] as? String {
                 // TODO check if app in background

apps/ios/Shared/ContentView.swift

@@ -10,27 +10,117 @@ import SwiftUI
 struct ContentView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var alertManager = AlertManager.shared
-    @State private var showNotificationAlert = false
+    @ObservedObject var callController = CallController.shared
+    @Binding var doAuthenticate: Bool
+    @Binding var enteredBackground: Double?
+    @State private var userAuthorized: Bool?
+    @State private var laFailed: Bool = false
+    @AppStorage(DEFAULT_SHOW_LA_NOTICE) private var prefShowLANotice = false
+    @AppStorage(DEFAULT_LA_NOTICE_SHOWN) private var prefLANoticeShown = false
+    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
 
     var body: some View {
         ZStack {
-            if let step = chatModel.onboardingStage {
-                if case .onboardingComplete = step,
-                   let user = chatModel.currentUser {
-                    ChatListView(user: user)
-                    .onAppear {
-                        NtfManager.shared.requestAuthorization(onDeny: {
-                            alertManager.showAlert(notificationAlert())
-                        })
+            if userAuthorized == true {
+                if let step = chatModel.onboardingStage {
+                    if case .onboardingComplete = step,
+                       let user = chatModel.currentUser {
+                        ZStack(alignment: .top) {
+                            ChatListView(user: user)
+                            .onAppear {
+                                NtfManager.shared.requestAuthorization(onDeny: {
+                                    alertManager.showAlert(notificationAlert())
+                                })
+                                // Local Authentication notice is to be shown on next start after onboarding is complete
+                                if (!prefLANoticeShown && prefShowLANotice) {
+                                    prefLANoticeShown = true
+                                    alertManager.showAlert(laNoticeAlert())
+                                }
+                                prefShowLANotice = true
+                            }
+                            if chatModel.showCallView, let call = chatModel.activeCall {
+                                ActiveCallView(call: call)
+                            }
+                            IncomingCallView()
+                        }
+                    } else {
+                        OnboardingView(onboarding: step)
                     }
-                } else {
-                    OnboardingView(onboarding: step)
                 }
+            } else if prefPerformLA && laFailed {
+                retryAuthView()
+            }
+        }
+        .onChange(of: doAuthenticate) { doAuth in
+            if doAuth, authenticationExpired() {
+                runAuthenticate()
             }
         }
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
     }
 
+    private func retryAuthView() -> some View {
+        Button {
+            laFailed = false
+            runAuthenticate()
+        } label: { Label("Retry", systemImage: "arrow.counterclockwise") }
+    }
+
+    private func runAuthenticate() {
+        if !prefPerformLA {
+            userAuthorized = true
+        } else {
+            chatModel.showChatInfo = false
+            DispatchQueue.main.async() {
+                userAuthorized = false
+                authenticate(reason: NSLocalizedString("Unlock", comment: "authentication reason")) { laResult in
+                    switch (laResult) {
+                    case .success:
+                        userAuthorized = true
+                    case .failed:
+                        laFailed = true
+                        AlertManager.shared.showAlert(laFailedAlert())
+                    case .unavailable:
+                        userAuthorized = true
+                        prefPerformLA = false
+                        AlertManager.shared.showAlert(laUnavailableTurningOffAlert())
+                    }
+                }
+            }
+        }
+    }
+
+    private func authenticationExpired() -> Bool {
+        if let enteredBackground = enteredBackground {
+            return ProcessInfo.processInfo.systemUptime - enteredBackground >= 30
+        } else {
+            return true
+        }
+    }
+
+    func laNoticeAlert() -> Alert {
+        Alert(
+            title: Text("SimpleX Lock"),
+            message: Text("To protect your information, turn on SimpleX Lock.\nYou will be prompted to complete authentication before this feature is enabled."),
+            primaryButton: .default(Text("Turn on")) {
+                authenticate(reason: NSLocalizedString("Enable SimpleX Lock", comment: "authentication reason")) { laResult in
+                    switch laResult {
+                    case .success:
+                        prefPerformLA = true
+                        alertManager.showAlert(laTurnedOnAlert())
+                    case .failed:
+                        prefPerformLA = false
+                        alertManager.showAlert(laFailedAlert())
+                    case .unavailable:
+                        prefPerformLA = false
+                        alertManager.showAlert(laUnavailableInstructionAlert())
+                    }
+                }
+            },
+            secondaryButton: .cancel()
+         )
+    }
+
     func notificationAlert() -> Alert {
         Alert(
             title: Text("Notifications are disabled!"),
@@ -90,11 +180,15 @@ final class AlertManager: ObservableObject {
     }
 
     func showAlertMsg(title: LocalizedStringKey, message: LocalizedStringKey? = nil) {
-        if let message = message {
-            showAlert(Alert(title: Text(title), message: Text(message)))
-        } else {
-            showAlert(Alert(title: Text(title)))
-        }
+        showAlert(mkAlert(title: title, message: message))
+    }
+}
+
+func mkAlert(title: LocalizedStringKey, message: LocalizedStringKey? = nil) -> Alert {
+    if let message = message {
+        return Alert(title: Text(title), message: Text(message))
+    } else {
+        return Alert(title: Text(title))
     }
 }
 

apps/ios/Shared/Model/ChatModel.swift

@@ -9,10 +9,12 @@
 import Foundation
 import Combine
 import SwiftUI
+import WebKit
 
 final class ChatModel: ObservableObject {
     @Published var onboardingStage: OnboardingStage?
     @Published var currentUser: User?
+    @Published var showChatInfo: Bool = false // TODO comprehensively close modal views on authentication
     // list of chat "previews"
     @Published var chats: [Chat] = []
     // current chat
@@ -27,10 +29,11 @@ final class ChatModel: ObservableObject {
     @Published var deviceToken: String?
     @Published var tokenStatus = NtfTknStatus.new
     // current WebRTC call
-    @Published var callInvitations: Dictionary<String, CallInvitation> = [:]
-    @Published var activeCallInvitation: ContactRef?
+    @Published var callInvitations: Dictionary<ChatId, CallInvitation> = [:]
     @Published var activeCall: Call?
     @Published var callCommand: WCallCommand?
+    @Published var showCallView = false
+    var callWebView: WKWebView?
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
 
@@ -185,6 +188,19 @@ final class ChatModel: ObservableObject {
         }
     }
 
+    func clearChat(_ cInfo: ChatInfo) {
+        // clear preview
+        if let chat = getChat(cInfo.id) {
+            chat.chatItems = []
+            chat.chatStats = ChatStats()
+            chat.chatInfo = cInfo
+        }
+        // clear current chat
+        if chatId == cInfo.id {
+            chatItems = []
+        }
+    }
+
     func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         // update preview
         if let i = getChatIndex(cInfo.id) {

apps/ios/Shared/Model/NtfManager.swift

@@ -37,26 +37,13 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
             Task { await acceptContactRequest(contactRequest) }
         } else if content.categoryIdentifier == ntfCategoryCallInvitation && (action == ntfActionAcceptCall || action == ntfActionRejectCall),
                   let chatId = content.userInfo["chatId"] as? String,
-                  case let .direct(contact) = chatModel.getChat(chatId)?.chatInfo,
-                  let invitation = chatModel.callInvitations[chatId] {
+                  let invitation = chatModel.callInvitations.removeValue(forKey: chatId) {
+            let cc = CallController.shared
             if action == ntfActionAcceptCall {
-                chatModel.activeCall = Call(contact: contact, callState: .invitationReceived, localMedia: invitation.peerMedia)
-                chatModel.chatId = nil
-                chatModel.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey)
+                cc.answerCall(invitation: invitation)
             } else {
-                Task {
-                    do {
-                        try await apiRejectCall(contact)
-                        if chatModel.activeCall?.contact.id == chatId {
-                            DispatchQueue.main.async {
-                                chatModel.callCommand = .end
-                                chatModel.activeCall = nil
-                            }
-                        }
-                    }
-                }
+                cc.endCall(invitation: invitation)
             }
-            chatModel.callInvitations.removeValue(forKey: chatId)
         } else {
             chatModel.chatId = content.targetContentIdentifier
         }
@@ -89,6 +76,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
             // this notification is deliverd from the notifications server
             // when the app is in foreground it does not need to be shown
             case ntfCategoryCheckMessage: return []
+            case ntfCategoryCallInvitation: return []
             default: return [.sound, .banner, .list]
             }
         } else {
@@ -136,11 +124,12 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 actions: [
                     UNNotificationAction(
                         identifier: ntfActionAcceptCall,
-                        title: NSLocalizedString("Answer", comment: "accept incoming call via notification")
+                        title: NSLocalizedString("Accept", comment: "accept incoming call via notification"),
+                        options: .foreground
                     ),
                     UNNotificationAction(
                         identifier: ntfActionRejectCall,
-                        title: NSLocalizedString("Ignore", comment: "ignore incoming call via notification")
+                        title: NSLocalizedString("Reject", comment: "reject incoming call via notification")
                     )
                 ],
                 intentIdentifiers: [],
@@ -194,9 +183,9 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         addNotification(createMessageReceivedNtf(cInfo, cItem))
     }
 
-    func notifyCallInvitation(_ contact: Contact, _ invitation: CallInvitation) {
+    func notifyCallInvitation(_ invitation: CallInvitation) {
         logger.debug("NtfManager.notifyCallInvitation")
-        addNotification(createCallInvitationNtf(contact, invitation))
+        addNotification(createCallInvitationNtf(invitation))
     }
 
     // TODO remove

apps/ios/Shared/Model/Shared/APITypes.swift

@@ -30,6 +30,7 @@ enum ChatCommand {
     case addContact
     case connect(connReq: String)
     case apiDeleteChat(type: ChatType, id: Int64)
+    case apiClearChat(type: ChatType, id: Int64)
     case apiUpdateProfile(profile: Profile)
     case apiParseMarkdown(text: String)
     case createMyAddress
@@ -72,6 +73,7 @@ enum ChatCommand {
             case .addContact: return "/connect"
             case let .connect(connReq): return "/connect \(connReq)"
             case let .apiDeleteChat(type, id): return "/_delete \(ref(type, id))"
+            case let .apiClearChat(type, id): return "/_clear chat \(ref(type, id))"
             case let .apiUpdateProfile(profile): return "/_profile \(encodeJSON(profile))"
             case let .apiParseMarkdown(text): return "/_parse \(text)"
             case .createMyAddress: return "/address"
@@ -114,6 +116,7 @@ enum ChatCommand {
             case .addContact: return "addContact"
             case .connect: return "connect"
             case .apiDeleteChat: return "apiDeleteChat"
+            case .apiClearChat: return "apiClearChat"
             case .apiUpdateProfile: return "apiUpdateProfile"
             case .apiParseMarkdown: return "apiParseMarkdown"
             case .createMyAddress: return "createMyAddress"
@@ -161,6 +164,7 @@ enum ChatResponse: Decodable, Error {
     case sentInvitation
     case contactAlreadyExists(contact: Contact)
     case contactDeleted(contact: Contact)
+    case chatCleared(chatInfo: ChatInfo)
     case userProfileNoChange
     case userProfileUpdated(fromProfile: Profile, toProfile: Profile)
     case apiParsedMarkdown(formattedText: [FormattedText]?)
@@ -195,7 +199,7 @@ enum ChatResponse: Decodable, Error {
     case sndFileCancelled(chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
     case sndFileRcvCancelled(chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
     case sndGroupFileCancelled(chatItem: AChatItem, fileTransferMeta: FileTransferMeta, sndFileTransfers: [SndFileTransfer])
-    case callInvitation(contact: Contact, callType: CallType, sharedKey: String?)
+    case callInvitation(contact: Contact, callType: CallType, sharedKey: String?, callTs: Date)
     case callOffer(contact: Contact, callType: CallType, offer: WebRTCSession, sharedKey: String?, askConfirmation: Bool)
     case callAnswer(contact: Contact, answer: WebRTCSession)
     case callExtraInfo(contact: Contact, extraInfo: WebRTCExtraInfo)
@@ -222,6 +226,7 @@ enum ChatResponse: Decodable, Error {
             case .sentInvitation: return "sentInvitation"
             case .contactAlreadyExists: return "contactAlreadyExists"
             case .contactDeleted: return "contactDeleted"
+            case .chatCleared: return "chatCleared"
             case .userProfileNoChange: return "userProfileNoChange"
             case .userProfileUpdated: return "userProfileUpdated"
             case .apiParsedMarkdown: return "apiParsedMarkdown"
@@ -284,6 +289,7 @@ enum ChatResponse: Decodable, Error {
             case .sentInvitation: return noDetails
             case let .contactAlreadyExists(contact): return String(describing: contact)
             case let .contactDeleted(contact): return String(describing: contact)
+            case let .chatCleared(chatInfo): return String(describing: chatInfo)
             case .userProfileNoChange: return noDetails
             case let .userProfileUpdated(_, toProfile): return String(describing: toProfile)
             case let .apiParsedMarkdown(formattedText): return String(describing: formattedText)
@@ -316,7 +322,7 @@ enum ChatResponse: Decodable, Error {
             case let .sndFileCancelled(chatItem, _): return String(describing: chatItem)
             case let .sndFileRcvCancelled(chatItem, _): return String(describing: chatItem)
             case let .sndGroupFileCancelled(chatItem, _, _): return String(describing: chatItem)
-            case let .callInvitation(contact, callType, sharedKey): return "contact: \(contact.id)\ncallType: \(String(describing: callType))\nsharedKey: \(sharedKey ?? "")"
+            case let .callInvitation(contact, callType, sharedKey, _): return "contact: \(contact.id)\ncallType: \(String(describing: callType))\nsharedKey: \(sharedKey ?? "")"
             case let .callOffer(contact, callType, offer, sharedKey, askConfirmation): return "contact: \(contact.id)\ncallType: \(String(describing: callType))\nsharedKey: \(sharedKey ?? "")\naskConfirmation: \(askConfirmation)\noffer: \(String(describing: offer))"
             case let .callAnswer(contact, answer): return "contact: \(contact.id)\nanswer: \(String(describing: answer))"
             case let .callExtraInfo(contact, extraInfo): return "contact: \(contact.id)\nextraInfo: \(String(describing: extraInfo))"

apps/ios/Shared/Model/Shared/CallTypes.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import SwiftUI
 
 struct WebRTCCallOffer: Encodable {
     var callType: CallType
@@ -15,16 +16,33 @@ struct WebRTCCallOffer: Encodable {
 
 struct WebRTCSession: Codable {
     var rtcSession: String
-    var rtcIceCandidates: [String]
+    var rtcIceCandidates: String
 }
 
 struct WebRTCExtraInfo: Codable {
-    var rtcIceCandidates: [String]
+    var rtcIceCandidates: String
 }
 
 struct CallInvitation {
+    var contact: Contact
+    var callkitUUID: UUID?
     var peerMedia: CallMediaType
     var sharedKey: String?
+    var callTs: Date
+    var callTypeText: LocalizedStringKey {
+        get {
+            switch peerMedia {
+            case .video: return sharedKey == nil ? "video call (not e2e encrypted)" : "**e2e encrypted** video call"
+            case .audio: return sharedKey == nil ? "audio call (not e2e encrypted)" : "**e2e encrypted** audio call"
+            }
+        }
+    }
+
+    static let sampleData = CallInvitation(
+        contact: Contact.sampleData,
+        peerMedia: .audio,
+        callTs: .now
+    )
 }
 
 struct CallType: Codable {
@@ -37,12 +55,18 @@ enum CallMediaType: String, Codable, Equatable {
     case audio = "audio"
 }
 
+enum VideoCamera: String, Codable, Equatable {
+    case user = "user"
+    case environment = "environment"
+}
+
 struct CallCapabilities: Codable, Equatable {
     var encryption: Bool
 }
 
 enum WebRTCCallStatus: String, Encodable {
     case connected = "connected"
+    case connecting = "connecting"
     case disconnected = "disconnected"
     case failed = "failed"
 }

apps/ios/Shared/Model/Shared/ChatTypes.swift

@@ -168,6 +168,15 @@ enum ChatInfo: Identifiable, Decodable, NamedChat {
         }
     }
 
+    var updatedAt: Date {
+        switch self {
+        case let .direct(contact): return contact.updatedAt
+        case let .group(groupInfo): return groupInfo.updatedAt
+        case let .contactRequest(contactRequest): return contactRequest.updatedAt
+        case let .contactConnection(contactConnection): return contactConnection.updatedAt
+        }
+    }
+
     struct SampleData {
         var direct: ChatInfo
         var group: ChatInfo
@@ -201,6 +210,7 @@ struct Contact: Identifiable, Decodable, NamedChat {
     var activeConn: Connection
     var viaGroup: Int64?
     var createdAt: Date
+    var updatedAt: Date
 
     var id: ChatId { get { "@\(contactId)" } }
     var apiId: Int64 { get { contactId } }
@@ -214,7 +224,8 @@ struct Contact: Identifiable, Decodable, NamedChat {
         localDisplayName: "alice",
         profile: Profile.sampleData,
         activeConn: Connection.sampleData,
-        createdAt: .now
+        createdAt: .now,
+        updatedAt: .now
     )
 }
 
@@ -350,6 +361,7 @@ struct GroupInfo: Identifiable, Decodable, NamedChat {
     var localDisplayName: GroupName
     var groupProfile: GroupProfile
     var createdAt: Date
+    var updatedAt: Date
 
     var id: ChatId { get { "#\(groupId)" } }
     var apiId: Int64 { get { groupId } }
@@ -362,7 +374,8 @@ struct GroupInfo: Identifiable, Decodable, NamedChat {
         groupId: 1,
         localDisplayName: "team",
         groupProfile: GroupProfile.sampleData,
-        createdAt: .now
+        createdAt: .now,
+        updatedAt: .now
     )
 }
 
@@ -507,6 +520,16 @@ struct ChatItem: Identifiable, Decodable {
             file: nil
        )
     }
+
+    static func getIntegrityErrorSample (_ status: CIStatus = .rcvRead, fromMsgId: Int64 = 1, toMsgId: Int64 = 2) -> ChatItem {
+        ChatItem(
+            chatDir: .directRcv,
+            meta: CIMeta.getSample(1, .now, "1 skipped message", status, false, false, false),
+            content: .rcvIntegrityError(msgError: .msgSkipped(fromMsgId: fromMsgId, toMsgId: toMsgId)),
+            quotedItem: nil,
+            file: nil
+       )
+    }
 }
 
 enum CIDirection: Decodable {
@@ -588,6 +611,7 @@ enum CIContent: Decodable, ItemContent {
     case rcvDeleted(deleteMode: CIDeleteMode)
     case sndCall(status: CICallStatus, duration: Int)
     case rcvCall(status: CICallStatus, duration: Int)
+    case rcvIntegrityError(msgError: MsgErrorType)
 
     var text: String {
         get {
@@ -598,6 +622,7 @@ enum CIContent: Decodable, ItemContent {
             case .rcvDeleted: return NSLocalizedString("deleted", comment: "deleted chat item")
             case let .sndCall(status, duration): return status.text(duration)
             case let .rcvCall(status, duration): return status.text(duration)
+            case let .rcvIntegrityError(msgError): return msgError.text
             }
         }
     }
@@ -866,13 +891,34 @@ enum CICallStatus: String, Decodable {
     func text(_ sec: Int) -> String {
         switch self {
         case .pending: return NSLocalizedString("calling…", comment: "call status")
-        case .missed: return NSLocalizedString("missed", comment: "call status")
-        case .rejected: return NSLocalizedString("rejected", comment: "call status")
-        case .accepted: return NSLocalizedString("accepted", comment: "call status")
-        case .negotiated: return NSLocalizedString("connecting…", comment: "call status")
-        case .progress: return NSLocalizedString("in progress", comment: "call status")
-        case .ended: return String.localizedStringWithFormat(NSLocalizedString("ended %02d:%02d", comment: "call status"), sec / 60, sec % 60)
-        case .error: return NSLocalizedString("error", comment: "call status")
+        case .missed: return NSLocalizedString("missed call", comment: "call status")
+        case .rejected: return NSLocalizedString("rejected call", comment: "call status")
+        case .accepted: return NSLocalizedString("accepted call", comment: "call status")
+        case .negotiated: return NSLocalizedString("connecting call…", comment: "call status")
+        case .progress: return NSLocalizedString("call in progress", comment: "call status")
+        case .ended: return String.localizedStringWithFormat(NSLocalizedString("ended call %@", comment: "call status"), CICallStatus.durationText(sec))
+        case .error: return NSLocalizedString("call error", comment: "call status")
+        }
+    }
+
+    static func durationText(_ sec: Int) -> String {
+        String(format: "%02d:%02d", sec / 60, sec % 60)
+    }
+}
+
+enum MsgErrorType: Decodable {
+    case msgSkipped(fromMsgId: Int64, toMsgId: Int64)
+    case msgBadId(msgId: Int64)
+    case msgBadHash
+    case msgDuplicate
+
+    var text: String {
+        switch self {
+        case let .msgSkipped(fromMsgId, toMsgId):
+            return String.localizedStringWithFormat(NSLocalizedString("%d skipped message(s)", comment: "integrity error chat item"), toMsgId - fromMsgId + 1)
+        case .msgBadHash: return NSLocalizedString("bad message hash", comment: "integrity error chat item") // not used now
+        case .msgBadId: return NSLocalizedString("bad message ID", comment: "integrity error chat item") // not used now
+        case .msgDuplicate: return NSLocalizedString("duplicate message", comment: "integrity error chat item") // not used now
         }
     }
 }

apps/ios/Shared/Model/Shared/Notifications.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import UserNotifications
+import SwiftUI
 
 let ntfCategoryContactRequest = "NTF_CAT_CONTACT_REQUEST"
 let ntfCategoryContactConnected = "NTF_CAT_CONTACT_CONNECTED"
@@ -49,13 +50,16 @@ func createMessageReceivedNtf(_ cInfo: ChatInfo, _ cItem: ChatItem) -> UNMutable
     )
 }
 
-func createCallInvitationNtf(_ contact: Contact, _ invitation: CallInvitation) -> UNMutableNotificationContent {
-    createNotification(
+func createCallInvitationNtf(_ invitation: CallInvitation) -> UNMutableNotificationContent {
+    let text = invitation.peerMedia == .video
+                ? NSLocalizedString("Incoming video call", comment: "notification")
+                : NSLocalizedString("Incoming audio call", comment: "notification")
+    return createNotification(
         categoryIdentifier: ntfCategoryCallInvitation,
-        title: "\(contact.chatViewName):",
-        body: String.localizedStringWithFormat(NSLocalizedString("Incoming %@ call", comment: "notification body"), invitation.peerMedia.rawValue),
+        title: "\(invitation.contact.chatViewName):",
+        body: text,
         targetContentIdentifier: nil,
-        userInfo: ["chatId": contact.id]
+        userInfo: ["chatId": invitation.contact.id]
     )
 }
 

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -11,6 +11,7 @@ import UIKit
 import Dispatch
 import BackgroundTasks
 import SwiftUI
+import CallKit
 
 private var chatController: chat_ctrl?
 
@@ -286,6 +287,22 @@ func apiDeleteChat(type: ChatType, id: Int64) async throws {
     throw r
 }
 
+func apiClearChat(type: ChatType, id: Int64) async throws -> ChatInfo {
+    let r = await chatSendCmd(.apiClearChat(type: type, id: id), bgTask: false)
+    if case let .chatCleared(updatedChatInfo) = r { return updatedChatInfo }
+    throw r
+}
+
+func clearChat(_ chat: Chat) async {
+    do {
+        let cInfo = chat.chatInfo
+        let updatedChatInfo = try await apiClearChat(type: cInfo.chatType, id: cInfo.apiId)
+        DispatchQueue.main.async { ChatModel.shared.clearChat(updatedChatInfo) }
+    } catch {
+        logger.error("clearChat apiClearChat error: \(responseError(error))")
+    }
+}
+
 func apiUpdateProfile(profile: Profile) async throws -> Profile? {
     let r = await chatSendCmd(.apiUpdateProfile(profile: profile))
     switch r {
@@ -382,18 +399,18 @@ func apiRejectCall(_ contact: Contact) async throws {
     try await sendCommandOkResp(.apiRejectCall(contact: contact))
 }
 
-func apiSendCallOffer(_ contact: Contact, _ rtcSession: String, _ rtcIceCandidates: [String], media: CallMediaType, capabilities: CallCapabilities) async throws {
+func apiSendCallOffer(_ contact: Contact, _ rtcSession: String, _ rtcIceCandidates: String, media: CallMediaType, capabilities: CallCapabilities) async throws {
     let webRtcSession = WebRTCSession(rtcSession: rtcSession, rtcIceCandidates: rtcIceCandidates)
     let callOffer = WebRTCCallOffer(callType: CallType(media: media, capabilities: capabilities), rtcSession: webRtcSession)
     try await sendCommandOkResp(.apiSendCallOffer(contact: contact, callOffer: callOffer))
 }
 
-func apiSendCallAnswer(_ contact: Contact, _ rtcSession: String, _ rtcIceCandidates: [String]) async throws {
+func apiSendCallAnswer(_ contact: Contact, _ rtcSession: String, _ rtcIceCandidates: String) async throws {
     let answer = WebRTCSession(rtcSession: rtcSession, rtcIceCandidates: rtcIceCandidates)
     try await sendCommandOkResp(.apiSendCallAnswer(contact: contact, answer: answer))
 }
 
-func apiSendCallExtraInfo(_ contact: Contact, _ rtcIceCandidates: [String]) async throws {
+func apiSendCallExtraInfo(_ contact: Contact, _ rtcIceCandidates: String) async throws {
     let extraInfo = WebRTCExtraInfo(rtcIceCandidates: rtcIceCandidates)
     try await sendCommandOkResp(.apiSendCallExtraInfo(contact: contact, extraInfo: extraInfo))
 }
@@ -561,7 +578,8 @@ func processReceivedMsg(_ res: ChatResponse) {
             m.addChatItem(cInfo, cItem)
             if case .image = cItem.content.msgContent,
                let file = cItem.file,
-               file.fileSize <= maxImageSize {
+               file.fileSize <= maxImageSize,
+               UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES) {
                 Task {
                     await receiveFile(fileId: file.fileId)
                 }
@@ -612,23 +630,44 @@ func processReceivedMsg(_ res: ChatResponse) {
                let fileName = cItem.file?.filePath {
                 removeFile(fileName)
             }
-        case let .callInvitation(contact, callType, sharedKey):
-            let invitation = CallInvitation(peerMedia: callType.media, sharedKey: sharedKey)
+        case let .callInvitation(contact, callType, sharedKey, callTs):
+            let uuid = UUID()
+            var invitation = CallInvitation(contact: contact, callkitUUID: uuid, peerMedia: callType.media, sharedKey: sharedKey, callTs: callTs)
             m.callInvitations[contact.id] = invitation
-            if (m.activeCallInvitation == nil) {
-                m.activeCallInvitation = ContactRef(contactId: contact.apiId, localDisplayName: contact.localDisplayName)
+            CallController.shared.reportNewIncomingCall(invitation: invitation) { error in
+                if let error = error {
+                    invitation.callkitUUID = nil
+                    m.callInvitations[contact.id] = invitation
+                    logger.error("reportNewIncomingCall error: \(error.localizedDescription)")
+                } else {
+                    logger.debug("reportNewIncomingCall success")
+                }
             }
-            NtfManager.shared.notifyCallInvitation(contact, invitation)
+
+// This will be called from notification service extension
+//            CXProvider.reportNewIncomingVoIPPushPayload([
+//                "displayName": contact.displayName,
+//                "contactId": contact.id,
+//                "uuid": invitation.callkitUUID
+//            ]) { error in
+//                if let error = error {
+//                    logger.error("reportNewIncomingVoIPPushPayload error \(error.localizedDescription)")
+//                } else {
+//                    logger.debug("reportNewIncomingVoIPPushPayload success for \(contact.id)")
+//                }
+//            }
         case let .callOffer(contact, callType, offer, sharedKey, _):
-            // TODO askConfirmation?
-            // TODO check encryption is compatible
             withCall(contact) { call in
-                m.activeCall = call.copy(callState: .offerReceived, peerMedia: callType.media, sharedKey: sharedKey)
-                m.callCommand = .accept(offer: offer.rtcSession, iceCandidates: offer.rtcIceCandidates, media: callType.media, aesKey: sharedKey)
+                call.callState = .offerReceived
+                call.peerMedia = callType.media
+                call.sharedKey = sharedKey
+                let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
+                logger.debug(".callOffer useRelay \(useRelay)")
+                m.callCommand = .offer(offer: offer.rtcSession, iceCandidates: offer.rtcIceCandidates, media: callType.media, aesKey: sharedKey, useWorker: true, relay: useRelay)
             }
         case let .callAnswer(contact, answer):
             withCall(contact) { call in
-                m.activeCall = call.copy(callState: .negotiated)
+                call.callState = .answerReceived
                 m.callCommand = .answer(answer: answer.rtcSession, iceCandidates: answer.rtcIceCandidates)
             }
         case let .callExtraInfo(contact, extraInfo):
@@ -636,9 +675,12 @@ func processReceivedMsg(_ res: ChatResponse) {
                 m.callCommand = .ice(iceCandidates: extraInfo.rtcIceCandidates)
             }
         case let .callEnded(contact):
-            m.activeCallInvitation = nil
-            withCall(contact) { _ in
+            if let invitation = m.callInvitations.removeValue(forKey: contact.id) {
+                CallController.shared.reportCallRemoteEnded(invitation: invitation)
+            }
+            withCall(contact) { call in
                 m.callCommand = .end
+                CallController.shared.reportCallRemoteEnded(call: call)
             }
         default:
             logger.debug("unsupported event: \(res.responseType)")

apps/ios/Shared/SimpleXApp.swift

@@ -14,17 +14,23 @@ let logger = Logger()
 struct SimpleXApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     @StateObject private var chatModel = ChatModel.shared
+    @ObservedObject var alertManager = AlertManager.shared
     @Environment(\.scenePhase) var scenePhase
+    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
+    @State private var userAuthorized: Bool? = nil
+    @State private var doAuthenticate: Bool = false
+    @State private var enteredBackground: Double? = nil
 
     init() {
         hs_init(0, nil)
+        UserDefaults.standard.register(defaults: appDefaults)
         BGManager.shared.register()
         NtfManager.shared.registerCategories()
     }
 
     var body: some Scene {
         return WindowGroup {
-            ContentView()
+            ContentView(doAuthenticate: $doAuthenticate, enteredBackground: $enteredBackground)
                 .environmentObject(chatModel)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
@@ -36,8 +42,15 @@ struct SimpleXApp: App {
                 .onChange(of: scenePhase) { phase in
                     logger.debug("scenePhase \(String(describing: scenePhase))")
                     setAppState(phase)
-                    if phase == .background {
+                    switch (phase) {
+                    case .background:
                         BGManager.shared.schedule()
+                        doAuthenticate = false
+                        enteredBackground = ProcessInfo.processInfo.systemUptime
+                    case .active:
+                        doAuthenticate = true
+                    default:
+                        break
                     }
                 }
         }

apps/ios/Shared/Views/Call/ActiveCallView.swift

@@ -7,138 +7,208 @@
 //
 
 import SwiftUI
+import WebKit
 
 struct ActiveCallView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.dismiss) private var dismiss
-    @Binding var showCallView: Bool
-    @State private var coordinator: WebRTCCoordinator? = nil
-    @State private var webViewReady: Bool = false
+    @EnvironmentObject var m: ChatModel
+    @ObservedObject var call: Call
+    @State private var rtcWebView: WKWebView? = nil
     @State private var webViewMsg: WVAPIMessage? = nil
 
     var body: some View {
         ZStack(alignment: .bottom) {
-            WebRTCView(coordinator: $coordinator, webViewReady: $webViewReady, webViewMsg: $webViewMsg)
+            WebRTCView(rtcWebView: $rtcWebView, webViewMsg: $webViewMsg)
                 .onAppear() { sendCommandToWebView() }
-                .onChange(of: chatModel.callCommand) { _ in sendCommandToWebView() }
-                .onChange(of: webViewReady) { _ in sendCommandToWebView() }
+                .onChange(of: m.callCommand) { _ in sendCommandToWebView() }
+                .onChange(of: rtcWebView) { _ in sendCommandToWebView() }
                 .onChange(of: webViewMsg) { _ in processWebViewMessage() }
                 .background(.black)
-            ActiveCallOverlay(call: chatModel.activeCall, dismiss: { dismiss() })
+            if let call = m.activeCall, let webView = rtcWebView  {
+                ActiveCallOverlay(call: call, webView: webView)
+            }
         }
+        .preferredColorScheme(.dark)
     }
 
     private func sendCommandToWebView() {
-        if chatModel.activeCall != nil && webViewReady,
-           let cmd = chatModel.callCommand,
-           let c = coordinator {
-            chatModel.callCommand = nil
-            logger.debug("ActiveCallView: command \(cmd.cmdType)")
-            c.sendCommand(command: cmd)
+        if m.activeCall != nil,
+           let wv = rtcWebView,
+           let cmd = m.callCommand {
+            m.callCommand = nil
+            sendCallCommand(wv, cmd)
         }
     }
 
     private func processWebViewMessage() {
-        let m = chatModel
         if let msg = webViewMsg,
-           let call = chatModel.activeCall {
+           let call = m.activeCall,
+           let webView = rtcWebView {
             logger.debug("ActiveCallView: response \(msg.resp.respType)")
-            Task {
-                switch msg.resp {
-                case let .capabilities(capabilities):
-                    let callType = CallType(media: call.localMedia, capabilities: capabilities)
-                    try await apiSendCallInvitation(call.contact, callType)
-                    m.activeCall = call.copy(callState: .invitationSent, localCapabilities: capabilities)
-                case let .offer(offer, iceCandidates, capabilities):
-                    try await apiSendCallOffer(call.contact, offer, iceCandidates,
-                                               media: call.localMedia, capabilities: capabilities)
-                    m.activeCall = call.copy(callState: .offerSent, localCapabilities: capabilities)
-                case let .answer(answer, iceCandidates):
-                    try await apiSendCallAnswer(call.contact, answer, iceCandidates)
-                    m.activeCall = call.copy(callState: .negotiated)
-                case let .ice(iceCandidates):
-                    try await apiSendCallExtraInfo(call.contact, iceCandidates)
-                case let .connection(state):
-                    if let callStatus = WebRTCCallStatus.init(rawValue: state.connectionState),
-                       case .connected = callStatus {
-                        m.activeCall = call.copy(callState: .connected)
+            switch msg.resp {
+            case let .capabilities(capabilities):
+                let callType = CallType(media: call.localMedia, capabilities: capabilities)
+                Task {
+                    do {
+                        try await apiSendCallInvitation(call.contact, callType)
+                    } catch {
+                        logger.error("apiSendCallInvitation \(responseError(error))")
                     }
-                    try await apiCallStatus(call.contact, state.connectionState)
-                case .ended:
-                    m.activeCall = nil
-                    m.activeCallInvitation = nil
-                    m.callCommand = nil
-                    showCallView = false
-                case .ok:
-                    switch msg.command {
-                    case let .media(media, enable):
-                        switch media {
-                        case .video: m.activeCall = call.copy(videoEnabled: enable)
-                        case .audio: m.activeCall = call.copy(audioEnabled: enable)
-                        }
-                    case .end:
-                        m.activeCall = nil
-                        m.activeCallInvitation = nil
-                        m.callCommand = nil
-                        showCallView = false
-                    default: ()
+                    DispatchQueue.main.async {
+                        call.callState = .invitationSent
+                        call.localCapabilities = capabilities
                     }
-                case let .error(message):
-                    logger.debug("ActiveCallView: command error: \(message)")
-                case let .invalid(type):
-                    logger.debug("ActiveCallView: invalid response: \(type)")
                 }
+            case let .offer(offer, iceCandidates, capabilities):
+                Task {
+                    do {
+                        try await apiSendCallOffer(call.contact, offer, iceCandidates,
+                                               media: call.localMedia, capabilities: capabilities)
+                    } catch {
+                        logger.error("apiSendCallOffer \(responseError(error))")
+                    }
+                    DispatchQueue.main.async {
+                        call.callState = .offerSent
+                        call.localCapabilities = capabilities
+                    }
+                }
+            case let .answer(answer, iceCandidates):
+                Task {
+                    do {
+                        try await apiSendCallAnswer(call.contact, answer, iceCandidates)
+                    } catch {
+                        logger.error("apiSendCallAnswer \(responseError(error))")
+                    }
+                    DispatchQueue.main.async {
+                        call.callState = .negotiated
+                    }
+                }
+            case let .ice(iceCandidates):
+                Task {
+                    do {
+                        try await apiSendCallExtraInfo(call.contact, iceCandidates)
+                    } catch {
+                        logger.error("apiSendCallExtraInfo \(responseError(error))")
+                    }
+                }
+            case let .connection(state):
+                if let callStatus = WebRTCCallStatus.init(rawValue: state.connectionState),
+                   case .connected = callStatus {
+                    if case .outgoing = call.direction {
+                        CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
+                    }
+                    call.callState = .connected
+                    // CallKit doesn't work well with WKWebView
+                    // This is a hack to enable microphone in WKWebView after CallKit takes over it
+                    if CallController.useCallKit {
+                        DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
+                            m.callCommand = .camera(camera: call.localCamera)
+                        }
+                    }
+                }
+                Task {
+                    do {
+                        try await apiCallStatus(call.contact, state.connectionState)
+                    } catch {
+                        logger.error("apiCallStatus \(responseError(error))")
+                    }
+                }
+            case let .connected(connectionInfo):
+                call.callState = .connected
+                call.connectionInfo = connectionInfo
+            case .ended:
+                closeCallView(webView)
+                call.callState = .ended
+                if let uuid = call.callkitUUID {
+                    CallController.shared.endCall(callUUID: uuid)
+                }
+            case .ok:
+                switch msg.command {
+                case .answer:
+                    call.callState = .negotiated
+                case let .camera(camera):
+                    call.localCamera = camera
+                    Task {
+                        // This disables microphone if it was disabled before flipping the camera
+                        await webView.setMicrophoneCaptureState(call.audioEnabled ? .active : .muted)
+                        // This compensates for the bug on some devices when remote video does not appear
+                        // await webView.setCameraCaptureState(.muted)
+                        // await webView.setCameraCaptureState(call.videoEnabled ? .active : .muted)
+                    }
+                case .end:
+                    closeCallView(webView)
+                    m.activeCall = nil
+                default: ()
+                }
+            case let .error(message):
+                logger.debug("ActiveCallView: command error: \(message)")
+            case let .invalid(type):
+                logger.debug("ActiveCallView: invalid response: \(type)")
             }
         }
     }
+
+    private func closeCallView(_ webView: WKWebView) {
+        m.showCallView = false
+        Task {
+            await webView.setMicrophoneCaptureState(.muted)
+            await webView.setCameraCaptureState(.muted)
+        }
+    }
 }
 
 struct ActiveCallOverlay: View {
     @EnvironmentObject var chatModel: ChatModel
-    var call: Call?
-    var dismiss: () -> Void
+    @ObservedObject var call: Call
+    var webView: WKWebView
 
     var body: some View {
         VStack {
-            if let call = call {
-                switch call.localMedia {
-                case .video:
-                    callInfoView(call, .leading)
-                    .foregroundColor(.white)
-                    .opacity(0.8)
-                    .padding()
-                case .audio:
-                    VStack {
-                        ProfileImage(imageStr: call.contact.profile.image)
-                            .scaledToFit()
-                            .frame(width: 192, height: 192)
-                        callInfoView(call, .center)
-                    }
-                    .foregroundColor(.white)
-                    .opacity(0.8)
-                    .padding()
-                    .frame(maxHeight: .infinity)
-                }
+            switch call.localMedia {
+            case .video:
+                callInfoView(call, .leading)
+                .foregroundColor(.white)
+                .opacity(0.8)
+                .padding()
+
                 Spacer()
-                ZStack(alignment: .bottom) {
-                    VStack(alignment: .leading) {
-                        if call.localMedia == .video {
-                            callButton(call.videoEnabled ? "video.fill" : "video.slash", size: 48) {
-                                chatModel.callCommand = .media(media: .video, enable: !call.videoEnabled)
-                            }
-                            .foregroundColor(.white)
-                            .opacity(0.85)
-                        }
-                        callButton(call.audioEnabled ? "mic.fill" : "mic.slash", size: 48) {
-                            chatModel.callCommand = .media(media: .audio, enable: !call.audioEnabled)
-                        }
-                        .foregroundColor(.white)
-                        .opacity(0.85)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                        .padding(.top)
+
+                HStack {
+                    toggleAudioButton()
+                    Spacer()
+                    Color.clear.frame(width: 40, height: 40)
+                    Spacer()
+                    endCallButton()
+                    Spacer()
+                    if call.videoEnabled {
+                        flipCameraButton()
+                    } else {
+                        Color.clear.frame(width: 40, height: 40)
                     }
-                    callButton("phone.down.fill", size: 60) { dismiss() }
-                    .foregroundColor(.red)
+                    Spacer()
+                    toggleVideoButton()
+                }
+                .padding(.horizontal, 20)
+                .padding(.bottom, 16)
+                .frame(maxWidth: .infinity, alignment: .center)
+
+            case .audio:
+                VStack {
+                    ProfileImage(imageStr: call.contact.profile.image)
+                        .scaledToFit()
+                        .frame(width: 192, height: 192)
+                    callInfoView(call, .center)
+                }
+                .foregroundColor(.white)
+                .opacity(0.8)
+                .padding()
+                .frame(maxHeight: .infinity)
+
+                Spacer()
+
+                ZStack(alignment: .bottom) {
+                    toggleAudioButton()
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    endCallButton()
                 }
                 .padding(.bottom, 60)
                 .padding(.horizontal, 48)
@@ -153,18 +223,82 @@ struct ActiveCallOverlay: View {
                 .lineLimit(1)
                 .font(.title)
                 .frame(maxWidth: .infinity, alignment: alignment)
-            let status = call.callState == .connected
-                            ? call.encrypted
-                               ? "end-to-end encrypted"
-                               : "no end-to-end encryption"
-                            : call.callState.text
-            Text(status)
-                .font(.subheadline)
-                .frame(maxWidth: .infinity, alignment: alignment)
+            Group {
+                Text(call.callState.text)
+                HStack {
+                    Text(call.encryptionStatus)
+                    if let connInfo = call.connectionInfo?.text {
+                        Text("(") + Text(connInfo) + Text(")")
+                    }
+                }
+            }
+            .font(.subheadline)
+            .frame(maxWidth: .infinity, alignment: alignment)
         }
     }
 
-    private func callButton(_ imageName: String, size: CGFloat, perform: @escaping () -> Void) -> some View {
+    private func endCallButton() -> some View {
+        let cc = CallController.shared
+        return callButton("phone.down.fill", size: 60) {
+            if let uuid = call.callkitUUID {
+                cc.endCall(callUUID: uuid)
+            } else {
+                cc.endCall(call: call) {}
+            }
+        }
+        .foregroundColor(.red)
+    }
+
+    private func toggleAudioButton() -> some View {
+        controlButton(call, call.audioEnabled ? "mic.fill" : "mic.slash") {
+            Task {
+                await webView.setMicrophoneCaptureState(call.audioEnabled ? .muted : .active)
+                DispatchQueue.main.async {
+                    call.audioEnabled = !call.audioEnabled
+                }
+            }
+        }
+    }
+
+    private func toggleVideoButton() -> some View {
+        controlButton(call, call.videoEnabled ? "video.fill" : "video.slash") {
+            Task {
+                await webView.setCameraCaptureState(call.videoEnabled ? .muted : .active)
+                DispatchQueue.main.async {
+                    call.videoEnabled = !call.videoEnabled
+                }
+            }
+        }
+    }
+
+    @ViewBuilder private func flipCameraButton() -> some View {
+        let cmd = WCallCommand.camera(camera: call.localCamera == .user ? .environment : .user)
+        controlButton(call, "arrow.triangle.2.circlepath") {
+            if call.audioEnabled {
+                chatModel.callCommand = cmd
+            } else {
+                Task {
+                    // Microphone has to be enabled before flipping the camera to avoid prompt for user permission when getUserMedia is called in webview
+                    await webView.setMicrophoneCaptureState(.active)
+                    DispatchQueue.main.async {
+                        chatModel.callCommand = cmd
+                    }
+                }
+            }
+        }
+    }
+
+    @ViewBuilder private func controlButton(_ call: Call, _ imageName: String, _ perform: @escaping () -> Void) -> some View {
+        if call.hasMedia {
+            callButton(imageName, size: 40, perform)
+                .foregroundColor(.white)
+                .opacity(0.85)
+        } else {
+            Color.clear.frame(width: 40, height: 40)
+        }
+    }
+
+    private func callButton(_ imageName: String, size: CGFloat, _ perform: @escaping () -> Void) -> some View {
         Button {
             perform()
         } label: {
@@ -179,9 +313,9 @@ struct ActiveCallOverlay: View {
 struct ActiveCallOverlay_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ActiveCallOverlay(call: Call(contact: Contact.sampleData, callState: .offerSent, localMedia: .video), dismiss: {})
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .video), webView: WKWebView())
                 .background(.black)
-            ActiveCallOverlay(call: Call(contact: Contact.sampleData, callState: .offerSent, localMedia: .audio), dismiss: {})
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .audio), webView: WKWebView())
                 .background(.black)
         }
     }

apps/ios/Shared/Views/Call/CallController.swift

@@ -0,0 +1,218 @@
+//
+//  CallController.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 21/05/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import CallKit
+import AVFoundation
+
+class CallController: NSObject, CXProviderDelegate, ObservableObject {
+    static let useCallKit = false
+    static let shared = CallController()
+    private let provider = CXProvider(configuration: CallController.configuration)
+    private let controller = CXCallController()
+    private let callManager = CallManager()
+    @Published var activeCallInvitation: CallInvitation?
+
+// PKPushRegistry will be used from notification service extension
+//    let registry = PKPushRegistry(queue: nil)
+
+    static let configuration: CXProviderConfiguration = {
+        let configuration = CXProviderConfiguration()
+        configuration.supportsVideo = true
+        configuration.supportedHandleTypes = [.generic]
+        configuration.includesCallsInRecents = true // TODO disable or add option
+        configuration.maximumCallsPerCallGroup = 1
+        return configuration
+    }()
+
+    override init() {
+        super.init()
+        self.provider.setDelegate(self, queue: nil)
+//        self.registry.delegate = self
+//        self.registry.desiredPushTypes = [.voIP]
+    }
+
+    func providerDidReset(_ provider: CXProvider) {
+    }
+
+    func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
+        logger.debug("CallController.provider CXStartCallAction")
+        if callManager.startOutgoingCall(callUUID: action.callUUID) {
+            action.fulfill()
+            provider.reportOutgoingCall(with: action.callUUID, startedConnectingAt: nil)
+        } else {
+            action.fail()
+        }
+    }
+
+    func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
+        logger.debug("CallController.provider CXAnswerCallAction")
+        if callManager.answerIncomingCall(callUUID: action.callUUID) {
+            action.fulfill()
+        } else {
+            action.fail()
+        }
+    }
+
+    func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
+        logger.debug("CallController.provider CXEndCallAction")
+        callManager.endCall(callUUID: action.callUUID) { ok in
+            if ok {
+                action.fulfill()
+            } else {
+                action.fail()
+            }
+        }
+    }
+
+    func provider(_ provider: CXProvider, timedOutPerforming action: CXAction) {
+        print("timed out", #function)
+        action.fulfill()
+    }
+
+    func provider(_ provider: CXProvider, didActivate audioSession: AVAudioSession) {
+        print("received", #function)
+//        do {
+//            try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: .mixWithOthers)
+//            logger.debug("audioSession category set")
+//            try audioSession.setActive(true)
+//            logger.debug("audioSession activated")
+//        } catch {
+//            print(error)
+//            logger.error("failed activating audio session")
+//        }
+    }
+
+    func provider(_ provider: CXProvider, didDeactivate audioSession: AVAudioSession) {
+        print("received", #function)
+    }
+
+//    func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
+//
+//    }
+
+// This will be needed when we have notification service extension
+//    func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
+//        if type == .voIP {
+//           // Extract the call information from the push notification payload
+//            if let displayName = payload.dictionaryPayload["displayName"] as? String,
+//               let contactId = payload.dictionaryPayload["contactId"] as? String,
+//               let uuidStr = payload.dictionaryPayload["uuid"] as? String,
+//               let uuid = UUID(uuidString: uuidStr) {
+//                let callUpdate = CXCallUpdate()
+//                callUpdate.remoteHandle = CXHandle(type: .phoneNumber, value: displayName)
+//                provider.reportNewIncomingCall(with: uuid, update: callUpdate, completion: { error in
+//                    if error != nil {
+//                        let m = ChatModel.shared
+//                        m.callInvitations.removeValue(forKey: contactId)
+//                    }
+//                    // Tell PushKit that the notification is handled.
+//                    completion()
+//                })
+//            }
+//        }
+//    }
+
+    func reportNewIncomingCall(invitation: CallInvitation, completion: @escaping (Error?) -> Void) {
+        logger.debug("CallController.reportNewIncomingCall")
+        if !UserDefaults.standard.bool(forKey: DEFAULT_EXPERIMENTAL_CALLS) { return }
+        if CallController.useCallKit, let uuid = invitation.callkitUUID {
+            let update = CXCallUpdate()
+            update.remoteHandle = CXHandle(type: .generic, value: invitation.contact.displayName)
+            update.hasVideo = invitation.peerMedia == .video
+            provider.reportNewIncomingCall(with: uuid, update: update, completion: completion)
+        } else {
+            NtfManager.shared.notifyCallInvitation(invitation)
+            if invitation.callTs.timeIntervalSinceNow >= -180 {
+                activeCallInvitation = invitation
+            }
+        }
+    }
+
+    func reportOutgoingCall(call: Call, connectedAt dateConnected: Date?) {
+        if CallController.useCallKit, let uuid = call.callkitUUID {
+            provider.reportOutgoingCall(with: uuid, connectedAt: dateConnected)
+        }
+    }
+
+    func reportCallRemoteEnded(invitation: CallInvitation) {
+        if CallController.useCallKit, let uuid = invitation.callkitUUID {
+            provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
+        } else if invitation.contact.id == activeCallInvitation?.contact.id {
+            activeCallInvitation = nil
+        }
+    }
+
+    func reportCallRemoteEnded(call: Call) {
+        if CallController.useCallKit, let uuid = call.callkitUUID {
+            provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
+        }
+    }
+
+    func startCall(_ contact: Contact, _ media: CallMediaType) {
+        logger.debug("CallController.startCall")
+        let uuid = callManager.newOutgoingCall(contact, media)
+        if CallController.useCallKit {
+            let handle = CXHandle(type: .generic, value: contact.displayName)
+            let action = CXStartCallAction(call: uuid, handle: handle)
+            action.isVideo = media == .video
+            requestTransaction(with: action)
+        } else if callManager.startOutgoingCall(callUUID: uuid) {
+            logger.debug("CallController.startCall: call started")
+        } else {
+            logger.error("CallController.startCall: no active call")
+        }
+    }
+
+    func answerCall(invitation: CallInvitation) {
+        callManager.answerIncomingCall(invitation: invitation)
+        if invitation.contact.id == self.activeCallInvitation?.contact.id {
+            self.activeCallInvitation = nil
+        }
+    }
+
+    func endCall(callUUID: UUID) {
+        if CallController.useCallKit {
+            requestTransaction(with: CXEndCallAction(call: callUUID))
+        } else {
+            callManager.endCall(callUUID: callUUID) { ok in
+                if ok {
+                    logger.debug("CallController.endCall: call ended")
+                } else {
+                    logger.error("CallController.endCall: no actove call pr call invitation to end")
+                }
+            }
+        }
+    }
+
+    func endCall(invitation: CallInvitation) {
+        callManager.endCall(invitation: invitation) {
+            if invitation.contact.id == self.activeCallInvitation?.contact.id {
+                DispatchQueue.main.async {
+                    self.activeCallInvitation = nil
+                }
+            }
+        }
+    }
+
+    func endCall(call: Call, completed: @escaping () -> Void) {
+        callManager.endCall(call: call, completed: completed)
+    }
+
+    private func requestTransaction(with action: CXAction) {
+        let t = CXTransaction()
+        t.addAction(action)
+        controller.request(t) { error in
+            if let error = error {
+                logger.error("CallController.requestTransaction error requesting transaction: \(error.localizedDescription)")
+            } else {
+                logger.debug("CallController.requestTransaction requested transaction successfully")
+            }
+        }
+    }
+}

apps/ios/Shared/Views/Call/CallManager.swift

@@ -0,0 +1,106 @@
+//
+//  CallManager.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 22/05/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+
+class CallManager {
+    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> UUID {
+        let uuid = UUID()
+        ChatModel.shared.activeCall = Call(direction: .outgoing, contact: contact, callkitUUID: uuid, callState: .waitCapabilities, localMedia: media)
+        return uuid
+    }
+
+    func startOutgoingCall(callUUID: UUID) -> Bool {
+        let m = ChatModel.shared
+        if let call = m.activeCall, call.callkitUUID == callUUID {
+            m.showCallView = true
+            m.callCommand = .capabilities(media: call.localMedia, useWorker: true)
+            return true
+        }
+        return false
+    }
+
+    func answerIncomingCall(callUUID: UUID) -> Bool {
+        if let invitation = getCallInvitation(callUUID) {
+            answerIncomingCall(invitation: invitation)
+            return true
+        }
+        return false
+    }
+
+    func answerIncomingCall(invitation: CallInvitation) {
+        let m = ChatModel.shared
+        m.callInvitations.removeValue(forKey: invitation.contact.id)
+        m.activeCall = Call(
+            direction: .incoming,
+            contact: invitation.contact,
+            callkitUUID: invitation.callkitUUID,
+            callState: .invitationAccepted,
+            localMedia: invitation.peerMedia,
+            sharedKey: invitation.sharedKey
+        )
+        m.showCallView = true
+        let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
+        logger.debug("answerIncomingCall useRelay \(useRelay)")
+        m.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey, useWorker: true, relay: useRelay)
+    }
+
+    func endCall(callUUID: UUID, completed: @escaping (Bool) -> Void) {
+        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
+            endCall(call: call) { completed(true) }
+        } else if let invitation = getCallInvitation(callUUID) {
+            endCall(invitation: invitation) { completed(true) }
+        } else {
+            completed(false)
+        }
+    }
+
+    func endCall(call: Call, completed: @escaping () -> Void) {
+        let m = ChatModel.shared
+        if case .ended = call.callState {
+            logger.debug("CallManager.endCall: call ended")
+            m.activeCall = nil
+            m.showCallView = false
+            completed()
+        } else {
+            logger.debug("CallManager.endCall: ending call...")
+            m.callCommand = .end
+            m.showCallView = false
+            Task {
+                do {
+                    try await apiEndCall(call.contact)
+                } catch {
+                    logger.error("CallController.provider apiEndCall error: \(responseError(error))")
+                }
+                DispatchQueue.main.async {
+                    m.activeCall = nil
+                    completed()
+                }
+            }
+        }
+    }
+
+    func endCall(invitation: CallInvitation, completed: @escaping () -> Void) {
+        ChatModel.shared.callInvitations.removeValue(forKey: invitation.contact.id)
+        Task {
+            do {
+                try await apiRejectCall(invitation.contact)
+            } catch {
+                logger.error("CallController.provider apiRejectCall error: \(responseError(error))")
+            }
+            completed()
+        }
+    }
+
+    private func getCallInvitation(_ callUUID: UUID) -> CallInvitation? {
+        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callkitUUID == callUUID }) {
+            return invitation
+        }
+        return nil
+    }
+}

apps/ios/Shared/Views/Call/IncomingCallView.swift

@@ -0,0 +1,86 @@
+//
+//  IncomingCallView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 24/05/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct IncomingCallView: View {
+    @EnvironmentObject var m: ChatModel
+    @ObservedObject var cc = CallController.shared
+
+    var body: some View {
+        let sp = SoundPlayer.shared
+        if let invitation = cc.activeCallInvitation {
+            if m.showCallView {
+                incomingCall(invitation)
+            } else {
+                incomingCall(invitation)
+                .onAppear { sp.startRingtone() }
+                .onDisappear { sp.stopRingtone() }
+            }
+        }
+    }
+
+    private func incomingCall(_ invitation: CallInvitation) -> some View {
+        VStack(alignment: .leading, spacing: 6) {
+            HStack {
+                Image(systemName: invitation.peerMedia == .video ? "video.fill" : "phone.fill").foregroundColor(.green)
+                Text(invitation.callTypeText)
+            }
+            HStack {
+                ProfilePreview(profileOf: invitation.contact, color: .white)
+                Spacer()
+
+                callButton("Reject", "phone.down.fill", .red) {
+                    cc.endCall(invitation: invitation)
+                }
+
+                callButton("Ignore", "multiply", .accentColor) {
+                    cc.activeCallInvitation = nil
+                }
+
+                callButton("Accept", "checkmark", .green) {
+                    if let call = m.activeCall {
+                        cc.endCall(call: call) {
+                            DispatchQueue.main.async {
+                                cc.answerCall(invitation: invitation)
+                            }
+                        }
+                    } else {
+                        cc.answerCall(invitation: invitation)
+                    }
+                }
+            }
+        }
+        .padding(.horizontal, 16)
+        .padding(.vertical, 12)
+        .frame(maxWidth: .infinity)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+    }
+
+    private func callButton(_ text: LocalizedStringKey, _ image: String, _ color: Color, action: @escaping () -> Void) -> some View {
+        Button(action: action, label: {
+            VStack(spacing: 2) {
+                Image(systemName: image)
+                    .scaleEffect(1.24)
+                    .foregroundColor(color)
+                    .frame(width: 24, height: 24)
+                Text(text)
+                    .font(.caption)
+                    .foregroundColor(.secondary)
+            }
+            .frame(minWidth: 44)
+        })
+    }
+}
+
+struct IncomingCallView_Previews: PreviewProvider {
+    static var previews: some View {
+        CallController.shared.activeCallInvitation = CallInvitation.sampleData
+        return IncomingCallView()
+    }
+}

apps/ios/Shared/Views/Call/SoundPlayer.swift

@@ -0,0 +1,45 @@
+//
+//  SoundPlayer.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 24/05/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import AVFoundation
+
+class SoundPlayer {
+    static let shared = SoundPlayer()
+    private var audioPlayer: AVAudioPlayer?
+
+    func startRingtone() {
+        audioPlayer?.stop()
+        logger.debug("startRingtone")
+        guard let path = Bundle.main.path(forResource: "ringtone2", ofType: "m4a", inDirectory: "sounds") else {
+            logger.debug("startRingtone: file not found")
+            return
+        }
+        do {
+            let player = try AVAudioPlayer(contentsOf: URL(fileURLWithPath: path))
+            if player.prepareToPlay() {
+                audioPlayer = player
+            }
+        } catch {
+            logger.debug("startRingtone: AVAudioPlayer error \(error.localizedDescription)")
+        }
+
+        Task {
+            while let player = audioPlayer {
+                player.play()
+                AudioServicesPlayAlertSound(kSystemSoundID_Vibrate)
+                _ = try? await Task.sleep(nanoseconds: UInt64(player.duration * 1_000_000_000))
+            }
+        }
+    }
+
+    func stopRingtone() {
+        audioPlayer?.stop()
+        audioPlayer = nil
+    }
+}

apps/ios/Shared/Views/Call/WebRTC.swift

@@ -9,85 +9,83 @@
 import Foundation
 import SwiftUI
 
-class Call: Equatable {
+class Call: ObservableObject, Equatable {
     static func == (lhs: Call, rhs: Call) -> Bool {
         lhs.contact.apiId == rhs.contact.apiId
     }
 
+    var direction: CallDirection
     var contact: Contact
-    var callState: CallState
+    var callkitUUID: UUID?
     var localMedia: CallMediaType
-    var localCapabilities: CallCapabilities?
-    var peerMedia: CallMediaType?
-    var sharedKey: String?
-    var audioEnabled: Bool
-    var videoEnabled: Bool
+    @Published var callState: CallState
+    @Published var localCapabilities: CallCapabilities?
+    @Published var peerMedia: CallMediaType?
+    @Published var sharedKey: String?
+    @Published var audioEnabled = true
+    @Published var videoEnabled: Bool
+    @Published var localCamera = VideoCamera.user
+    @Published var connectionInfo: ConnectionInfo?
 
     init(
+        direction: CallDirection,
         contact: Contact,
+        callkitUUID: UUID?,
         callState: CallState,
         localMedia: CallMediaType,
-        localCapabilities: CallCapabilities? = nil,
-        peerMedia: CallMediaType? = nil,
-        sharedKey: String? = nil,
-        audioEnabled: Bool? = nil,
-        videoEnabled: Bool? = nil
+        sharedKey: String? = nil
     ) {
+        self.direction = direction
         self.contact = contact
+        self.callkitUUID = callkitUUID
         self.callState = callState
         self.localMedia = localMedia
-        self.localCapabilities = localCapabilities
-        self.peerMedia = peerMedia
         self.sharedKey = sharedKey
-        self.audioEnabled = audioEnabled ?? true
-        self.videoEnabled = videoEnabled ?? (localMedia == .video)
+        self.videoEnabled = localMedia == .video
     }
 
-    func copy(
-        contact: Contact? = nil,
-        callState: CallState? = nil,
-        localMedia: CallMediaType? = nil,
-        localCapabilities: CallCapabilities? = nil,
-        peerMedia: CallMediaType? = nil,
-        sharedKey: String? = nil,
-        audioEnabled: Bool? = nil,
-        videoEnabled: Bool? = nil
-    ) -> Call {
-        Call (
-            contact: contact ?? self.contact,
-            callState: callState ?? self.callState,
-            localMedia: localMedia ?? self.localMedia,
-            localCapabilities: localCapabilities ?? self.localCapabilities,
-            peerMedia: peerMedia ?? self.peerMedia,
-            sharedKey: sharedKey ?? self.sharedKey,
-            audioEnabled: audioEnabled ?? self.audioEnabled,
-            videoEnabled: videoEnabled ?? self.videoEnabled
-        )
+    var encrypted: Bool { get { localEncrypted && sharedKey != nil } }
+    var localEncrypted: Bool { get { localCapabilities?.encryption ?? false } }
+    var encryptionStatus: LocalizedStringKey {
+        get {
+            switch callState {
+            case .waitCapabilities: return ""
+            case .invitationSent: return localEncrypted ? "e2e encrypted" : "no e2e encryption"
+            case .invitationAccepted: return sharedKey == nil ? "contact has no e2e encryption" : "contact has e2e encryption"
+            default: return !localEncrypted ? "no e2e encryption" : sharedKey == nil ? "contact has no e2e encryption" : "e2e encrypted" 
+            }
+        }
     }
+    var hasMedia: Bool { get { callState == .offerSent || callState == .negotiated || callState == .connected } }
+}
 
-    var encrypted: Bool {
-        (localCapabilities?.encryption ?? false) && sharedKey != nil
-    }
+enum CallDirection {
+    case incoming
+    case outgoing
 }
 
 enum CallState {
-    case waitCapabilities
-    case invitationSent
-    case invitationReceived
-    case offerSent
-    case offerReceived
-    case negotiated
+    case waitCapabilities   // outgoing call started
+    case invitationSent     // outgoing call - sent invitation
+    case invitationAccepted // incoming call started
+    case offerSent          // incoming - webrtc started and offer sent
+    case offerReceived      // outgoing - webrtc offer received via API
+    case answerReceived     // incoming - webrtc answer received via API
+    case negotiated         // outgoing - webrtc offer processed and answer sent, incoming - webrtc answer processed
     case connected
+    case ended
 
     var text: LocalizedStringKey {
         switch self {
         case .waitCapabilities: return "starting…"
         case .invitationSent: return "waiting for answer…"
-        case .invitationReceived: return "starting…"
+        case .invitationAccepted: return "starting…"
         case .offerSent: return "waiting for confirmation…"
         case .offerReceived: return "received answer…"
+        case .answerReceived: return "received confirmation…"
         case .negotiated: return "connecting…"
         case .connected: return "connected"
+        case .ended: return "ended"
         }
     }
 }
@@ -97,29 +95,34 @@ struct WVAPICall: Encodable {
     var command: WCallCommand
 }
 
-struct WVAPIMessage: Equatable, Decodable {
+struct WVAPIMessage: Equatable, Decodable, Encodable {
     var corrId: Int?
     var resp: WCallResponse
     var command: WCallCommand?
 }
 
 enum WCallCommand: Equatable, Encodable, Decodable {
-    case capabilities
-    case start(media: CallMediaType, aesKey: String? = nil)
-    case accept(offer: String, iceCandidates: [String], media: CallMediaType, aesKey: String? = nil)
-    case answer(answer: String, iceCandidates: [String])
-    case ice(iceCandidates: [String])
+    case capabilities(media: CallMediaType, useWorker: Bool? = nil)
+    case start(media: CallMediaType, aesKey: String? = nil, useWorker: Bool? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
+    case offer(offer: String, iceCandidates: String, media: CallMediaType, aesKey: String? = nil, useWorker: Bool? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
+    case answer(answer: String, iceCandidates: String)
+    case ice(iceCandidates: String)
     case media(media: CallMediaType, enable: Bool)
+    case camera(camera: VideoCamera)
     case end
 
     enum CodingKeys: String, CodingKey {
         case type
         case media
+        case camera
         case aesKey
+        case useWorker
         case offer
         case answer
         case iceCandidates
         case enable
+        case iceServers
+        case relay
     }
 
     var cmdType: String {
@@ -127,10 +130,11 @@ enum WCallCommand: Equatable, Encodable, Decodable {
             switch self {
             case .capabilities: return "capabilities"
             case .start: return "start"
-            case .accept: return "accept"
+            case .offer: return "offer"
             case .answer: return "answer"
             case .ice: return "ice"
             case .media: return "media"
+            case .camera: return "camera"
             case .end: return "end"
             }
         }
@@ -139,18 +143,26 @@ enum WCallCommand: Equatable, Encodable, Decodable {
     func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         switch self {
-        case .capabilities:
+        case let .capabilities(media, useWorker):
             try container.encode("capabilities", forKey: .type)
-        case let .start(media, aesKey):
+            try container.encode(media, forKey: .media)
+            try container.encode(useWorker, forKey: .useWorker)
+        case let .start(media, aesKey, useWorker, iceServers, relay):
             try container.encode("start", forKey: .type)
             try container.encode(media, forKey: .media)
             try container.encode(aesKey, forKey: .aesKey)
-        case let .accept(offer, iceCandidates, media, aesKey):
-            try container.encode("accept", forKey: .type)
+            try container.encode(useWorker, forKey: .useWorker)
+            try container.encode(iceServers, forKey: .iceServers)
+            try container.encode(relay, forKey: .relay)
+        case let .offer(offer, iceCandidates, media, aesKey, useWorker, iceServers, relay):
+            try container.encode("offer", forKey: .type)
             try container.encode(offer, forKey: .offer)
             try container.encode(iceCandidates, forKey: .iceCandidates)
             try container.encode(media, forKey: .media)
             try container.encode(aesKey, forKey: .aesKey)
+            try container.encode(useWorker, forKey: .useWorker)
+            try container.encode(iceServers, forKey: .iceServers)
+            try container.encode(relay, forKey: .relay)
         case let .answer(answer, iceCandidates):
             try container.encode("answer", forKey: .type)
             try container.encode(answer, forKey: .answer)
@@ -162,6 +174,9 @@ enum WCallCommand: Equatable, Encodable, Decodable {
             try container.encode("media", forKey: .type)
             try container.encode(media, forKey: .media)
             try container.encode(enable, forKey: .enable)
+        case let .camera(camera):
+            try container.encode("camera", forKey: .type)
+            try container.encode(camera, forKey: .camera)
         case .end:
             try container.encode("end", forKey: .type)
         }
@@ -172,28 +187,39 @@ enum WCallCommand: Equatable, Encodable, Decodable {
         let type = try container.decode(String.self, forKey: CodingKeys.type)
         switch type {
         case "capabilities":
-            self = .capabilities
+            let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
+            let useWorker = try container.decode((Bool?).self, forKey: CodingKeys.useWorker)
+            self = .capabilities(media: media, useWorker: useWorker)
         case "start":
             let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
             let aesKey = try? container.decode(String.self, forKey: CodingKeys.aesKey)
-            self = .start(media: media, aesKey: aesKey)
-        case "accept":
+            let useWorker = try container.decode((Bool?).self, forKey: CodingKeys.useWorker)
+            let iceServers = try container.decode(([RTCIceServer]?).self, forKey: .iceServers)
+            let relay = try container.decode((Bool?).self, forKey: .relay)
+            self = .start(media: media, aesKey: aesKey, useWorker: useWorker, iceServers: iceServers, relay: relay)
+        case "offer":
             let offer = try container.decode(String.self, forKey: CodingKeys.offer)
-            let iceCandidates = try container.decode([String].self, forKey: CodingKeys.iceCandidates)
+            let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
             let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
             let aesKey = try? container.decode(String.self, forKey: CodingKeys.aesKey)
-            self = .accept(offer: offer, iceCandidates: iceCandidates, media: media, aesKey: aesKey)
+            let useWorker = try container.decode((Bool?).self, forKey: CodingKeys.useWorker)
+            let iceServers = try container.decode(([RTCIceServer]?).self, forKey: .iceServers)
+            let relay = try container.decode((Bool?).self, forKey: .relay)
+            self = .offer(offer: offer, iceCandidates: iceCandidates, media: media, aesKey: aesKey, useWorker: useWorker, iceServers: iceServers, relay: relay)
         case "answer":
             let answer = try container.decode(String.self, forKey: CodingKeys.answer)
-            let iceCandidates = try container.decode([String].self, forKey: CodingKeys.iceCandidates)
+            let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
             self = .answer(answer: answer, iceCandidates: iceCandidates)
         case "ice":
-            let iceCandidates = try container.decode([String].self, forKey: CodingKeys.iceCandidates)
+            let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
             self = .ice(iceCandidates: iceCandidates)
         case "media":
             let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
             let enable = try container.decode(Bool.self, forKey: CodingKeys.enable)
             self = .media(media: media, enable: enable)
+        case "camera":
+            let camera = try container.decode(VideoCamera.self, forKey: CodingKeys.camera)
+            self = .camera(camera: camera)
         case "end":
             self = .end
         default:
@@ -205,12 +231,11 @@ enum WCallCommand: Equatable, Encodable, Decodable {
 
 enum WCallResponse: Equatable, Decodable {
     case capabilities(capabilities: CallCapabilities)
-    case offer(offer: String, iceCandidates: [String], capabilities: CallCapabilities)
-    // TODO remove accept, it is needed for debugging
-//    case accept(offer: String, iceCandidates: [String], media: CallMediaType, aesKey: String? = nil)
-    case answer(answer: String, iceCandidates: [String])
-    case ice(iceCandidates: [String])
+    case offer(offer: String, iceCandidates: String, capabilities: CallCapabilities)
+    case answer(answer: String, iceCandidates: String)
+    case ice(iceCandidates: String)
     case connection(state: ConnectionState)
+    case connected(connectionInfo: ConnectionInfo)
     case ended
     case ok
     case error(message: String)
@@ -223,25 +248,23 @@ enum WCallResponse: Equatable, Decodable {
         case answer
         case iceCandidates
         case state
+        case connectionInfo
         case message
-        // TODO remove media, aesKey
-        case media
-        case aesKey
     }
 
     var respType: String {
         get {
             switch self {
-            case .capabilities: return("capabilities")
-            case .offer: return("offer")
-//            case .accept: return("accept")
-            case .answer: return("answer (TODO remove)")
-            case .ice: return("ice")
-            case .connection: return("connection")
-            case .ended: return("ended")
-            case .ok: return("ok")
-            case .error: return("error")
-            case .invalid: return("invalid")
+            case .capabilities: return "capabilities"
+            case .offer: return "offer"
+            case .answer: return "answer"
+            case .ice: return "ice"
+            case .connection: return "connection"
+            case .connected: return "connected"
+            case .ended: return "ended"
+            case .ok: return "ok"
+            case .error: return "error"
+            case .invalid: return "invalid"
             }
         }
     }
@@ -256,19 +279,22 @@ enum WCallResponse: Equatable, Decodable {
                 self = .capabilities(capabilities: capabilities)
             case "offer":
                 let offer = try container.decode(String.self, forKey: CodingKeys.offer)
-                let iceCandidates = try container.decode([String].self, forKey: CodingKeys.iceCandidates)
+                let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
                 let capabilities = try container.decode(CallCapabilities.self, forKey: CodingKeys.capabilities)
                 self = .offer(offer: offer, iceCandidates: iceCandidates, capabilities: capabilities)
             case "answer":
                 let answer = try container.decode(String.self, forKey: CodingKeys.answer)
-                let iceCandidates = try container.decode([String].self, forKey: CodingKeys.iceCandidates)
+                let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
                 self = .answer(answer: answer, iceCandidates: iceCandidates)
             case "ice":
-                let iceCandidates = try container.decode([String].self, forKey: CodingKeys.iceCandidates)
+                let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
                 self = .ice(iceCandidates: iceCandidates)
             case "connection":
                 let state = try container.decode(ConnectionState.self, forKey: CodingKeys.state)
                 self = .connection(state: state)
+            case "connected":
+                let connectionInfo = try container.decode(ConnectionInfo.self, forKey: CodingKeys.connectionInfo)
+                self = .connected(connectionInfo: connectionInfo)
             case "ended":
                 self = .ended
             case "ok":
@@ -286,39 +312,42 @@ enum WCallResponse: Equatable, Decodable {
 }
 
 // This protocol is for debugging
-//extension WCallResponse: Encodable {
-//    func encode(to encoder: Encoder) throws {
-//        var container = encoder.container(keyedBy: CodingKeys.self)
-//        switch self {
-//        case .capabilities:
-//            try container.encode("capabilities", forKey: .type)
-//        case let .offer(offer, iceCandidates, capabilities):
-//            try container.encode("offer", forKey: .type)
-//            try container.encode(offer, forKey: .offer)
-//            try container.encode(iceCandidates, forKey: .iceCandidates)
-//            try container.encode(capabilities, forKey: .capabilities)
-//        case let .answer(answer, iceCandidates):
-//            try container.encode("answer", forKey: .type)
-//            try container.encode(answer, forKey: .answer)
-//            try container.encode(iceCandidates, forKey: .iceCandidates)
-//        case let .ice(iceCandidates):
-//            try container.encode("ice", forKey: .type)
-//            try container.encode(iceCandidates, forKey: .iceCandidates)
-//        case let .connection(state):
-//            try container.encode("connection", forKey: .type)
-//            try container.encode(state, forKey: .state)
-//        case .ended:
-//            try container.encode("ended", forKey: .type)
-//        case .ok:
-//            try container.encode("ok", forKey: .type)
-//        case let .error(message):
-//            try container.encode("error", forKey: .type)
-//            try container.encode(message, forKey: .message)
-//        case let .invalid(type):
-//            try container.encode(type, forKey: .type)
-//        }
-//    }
-//}
+extension WCallResponse: Encodable {
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        switch self {
+        case .capabilities:
+            try container.encode("capabilities", forKey: .type)
+        case let .offer(offer, iceCandidates, capabilities):
+            try container.encode("offer", forKey: .type)
+            try container.encode(offer, forKey: .offer)
+            try container.encode(iceCandidates, forKey: .iceCandidates)
+            try container.encode(capabilities, forKey: .capabilities)
+        case let .answer(answer, iceCandidates):
+            try container.encode("answer", forKey: .type)
+            try container.encode(answer, forKey: .answer)
+            try container.encode(iceCandidates, forKey: .iceCandidates)
+        case let .ice(iceCandidates):
+            try container.encode("ice", forKey: .type)
+            try container.encode(iceCandidates, forKey: .iceCandidates)
+        case let .connection(state):
+            try container.encode("connection", forKey: .type)
+            try container.encode(state, forKey: .state)
+        case let .connected(connectionInfo):
+            try container.encode("connected", forKey: .type)
+            try container.encode(connectionInfo, forKey: .connectionInfo)
+        case .ended:
+            try container.encode("ended", forKey: .type)
+        case .ok:
+            try container.encode("ok", forKey: .type)
+        case let .error(message):
+            try container.encode("error", forKey: .type)
+            try container.encode(message, forKey: .message)
+        case let .invalid(type):
+            try container.encode(type, forKey: .type)
+        }
+    }
+}
 
 struct ConnectionState: Codable, Equatable {
     var connectionState: String
@@ -326,3 +355,41 @@ struct ConnectionState: Codable, Equatable {
     var iceGatheringState: String
     var signalingState: String
 }
+
+struct ConnectionInfo: Codable, Equatable {
+    var localCandidate: RTCIceCandidate?
+    var remoteCandidate: RTCIceCandidate?
+
+    var text: LocalizedStringKey {
+        get {
+            if localCandidate?.candidateType == .host && remoteCandidate?.candidateType == .host {
+                return "peer-to-peer"
+            } else if localCandidate?.candidateType == .relay && remoteCandidate?.candidateType == .relay {
+                return "via relay"
+            } else {
+                let unknown = NSLocalizedString("unknown", comment: "connection info")
+                return "\(localCandidate?.candidateType?.rawValue ?? unknown) / \(remoteCandidate?.candidateType?.rawValue ?? unknown)"
+            }
+        }
+    }
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate
+struct RTCIceCandidate: Codable, Equatable {
+    var candidateType: RTCIceCandidateType?
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceCandidate/type
+enum RTCIceCandidateType: String, Codable {
+    case host = "host"
+    case serverReflexive = "srflx"
+    case peerReflexive = "prflx"
+    case relay = "relay"
+}
+
+// https://developer.mozilla.org/en-US/docs/Web/API/RTCIceServer
+struct RTCIceServer: Codable, Equatable {
+    var urls: [String]
+    var username: String? = nil
+    var credential: String? = nil
+}

apps/ios/Shared/Views/Call/WebRTCView.swift

@@ -9,20 +9,24 @@
 import SwiftUI
 import WebKit
 
-class WebRTCCoordinator: NSObject, WKNavigationDelegate, WKScriptMessageHandler {
-    var webViewReady: Binding<Bool>
+class WebRTCCoordinator: NSObject, WKNavigationDelegate, WKScriptMessageHandler, WKUIDelegate {
+    var rtcWebView: Binding<WKWebView?>
     var webViewMsg: Binding<WVAPIMessage?>
-    private var webView: WKWebView?
 
-    internal init(webViewReady: Binding<Bool>, webViewMsg: Binding<WVAPIMessage?>) {
-        self.webViewReady = webViewReady
+    internal init(rtcWebView: Binding<WKWebView?>, webViewMsg: Binding<WVAPIMessage?>) {
+        self.rtcWebView = rtcWebView
         self.webViewMsg = webViewMsg
     }
 
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
         webView.allowsBackForwardNavigationGestures = false
-        self.webView = webView
-        webViewReady.wrappedValue = true
+        self.rtcWebView.wrappedValue = webView
+        ChatModel.shared.callWebView = webView
+    }
+
+    func webView(_ webView: WKWebView, decideMediaCapturePermissionsFor origin : WKSecurityOrigin, initiatedBy frame: WKFrameInfo, type: WKMediaCaptureType) async -> WKPermissionDecision {
+        print("webView", #function)
+        return .grant
     }
 
     // receive message from WKWebView
@@ -31,31 +35,37 @@ class WebRTCCoordinator: NSObject, WKNavigationDelegate, WKScriptMessageHandler
         didReceive message: WKScriptMessage
     ) {
         logger.debug("WebRTCCoordinator.userContentController")
-        if let msgStr = message.body as? String,
-           let msg: WVAPIMessage = decodeJSON(msgStr) {
-            webViewMsg.wrappedValue = msg
-        } else {
-            logger.error("WebRTCCoordinator.userContentController: invalid message \(String(describing: message.body))")
-        }
-    }
-
-    func sendCommand(command: WCallCommand) {
-        if let webView = webView {
-            logger.debug("WebRTCCoordinator.sendCommand")
-            let apiCmd = encodeJSON(WVAPICall(command: command))
-            let js = "processCommand(\(apiCmd))"
-            webView.evaluateJavaScript(js)
+        switch message.name {
+        case "webrtc":
+            if let msgStr = message.body as? String,
+               let msg: WVAPIMessage = decodeJSON(msgStr) {
+                // this is the binding that communicates messages from webview to swift view
+                webViewMsg.wrappedValue = msg
+                if case .invalid = msg.resp {
+                    logger.error("WebRTCCoordinator.userContentController: invalid message \(String(describing: message.body))")
+                }
+            } else {
+                logger.error("WebRTCCoordinator.userContentController: message parsing error \(String(describing: message.body))")
+            }
+        case "logger":
+            if let msgStr = message.body as? String {
+                logger.error("WebRTCCoordinator console.log: \(msgStr)")
+            } else {
+                logger.error("WebRTCCoordinator console.log: \(String(describing: message.body))")
+            }
+        default:
+            logger.error("WebRTCCoordinator.userContentController: invalid message.name \(message.name)")
         }
     }
 }
 
 struct WebRTCView: UIViewRepresentable {
-    @Binding var coordinator: WebRTCCoordinator?
-    @Binding var webViewReady: Bool
+    @State private var coordinator: WebRTCCoordinator?
+    @Binding var rtcWebView: WKWebView?
     @Binding var webViewMsg: WVAPIMessage?
 
     func makeCoordinator() -> WebRTCCoordinator {
-        WebRTCCoordinator(webViewReady: $webViewReady, webViewMsg: $webViewMsg)
+        WebRTCCoordinator(rtcWebView: $rtcWebView, webViewMsg: $webViewMsg)
     }
 
     func makeUIView(context: Context) -> WKWebView {
@@ -69,10 +79,14 @@ struct WebRTCView: UIViewRepresentable {
         cfg.mediaTypesRequiringUserActionForPlayback = []
         cfg.allowsInlineMediaPlayback = true
 
-        let source = "sendMessageToNative = (msg) => webkit.messageHandlers.webrtc.postMessage(JSON.stringify(msg))"
-        let script = WKUserScript(source: source, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
-        wkController.addUserScript(script)
-        wkController.add(wkCoordinator, name: "webrtc")
+        let addScript = { (handler: String, source: String) in
+            let script = WKUserScript(source: source, injectionTime: .atDocumentEnd, forMainFrameOnly: false)
+            wkController.addUserScript(script)
+            wkController.add(wkCoordinator, name: handler)
+        }
+
+        addScript("webrtc", "sendMessageToNative = (msg) => webkit.messageHandlers.webrtc.postMessage(JSON.stringify(msg))")
+        addScript("logger", "console.log = (arg) => webkit.messageHandlers.logger.postMessage(JSON.stringify(arg))")
 
         let wkWebView = WKWebView(frame: .zero, configuration: cfg)
         wkWebView.navigationDelegate = wkCoordinator
@@ -90,16 +104,22 @@ struct WebRTCView: UIViewRepresentable {
     }
 }
 
+func sendCallCommand(_ webView: WKWebView, _ command: WCallCommand) {
+    logger.debug("sendCallCommand: \(command.cmdType)")
+    let apiCmd = encodeJSON(WVAPICall(command: command))
+    let js = "processCommand(\(apiCmd))"
+    webView.evaluateJavaScript(js)
+}
+
 //struct CallViewDebug: View {
-//    @State private var coordinator: WebRTCCoordinator? = nil
 //    @State private var commandStr = ""
-//    @State private var webViewReady: Bool = false
+//    @State private var rtcWebView: WKWebView? = nil
 //    @State private var webViewMsg: WVAPIMessage? = nil
 //    @FocusState private var keyboardVisible: Bool
 //
 //    var body: some View {
 //        VStack(spacing: 30) {
-//            WebRTCView(coordinator: $coordinator, webViewReady: $webViewReady, webViewMsg: $webViewMsg).frame(maxHeight: 260)
+//            WebRTCView(rtcWebView: $rtcWebView, webViewMsg: $webViewMsg).frame(maxHeight: 260)
 //                .onChange(of: webViewMsg) { _ in
 //                    if let resp = webViewMsg {
 //                        commandStr = encodeJSON(resp)
@@ -127,19 +147,21 @@ struct WebRTCView: UIViewRepresentable {
 //                    commandStr = ""
 //                }
 //                Button("Send") {
-//                    if let c = coordinator,
+//                    if let wv = rtcWebView,
 //                       let command: WCallCommand = decodeJSON(commandStr) {
-//                        c.sendCommand(command: command)
+//                        sendCallCommand(wv, command)
 //                    }
 //                }
 //            }
 //            HStack(spacing: 20) {
 //                Button("Capabilities") {
-//
+//                    if let wv = rtcWebView {
+//                        sendCallCommand(wv, .capabilities(useWorker: true))
+//                    }
 //                }
 //                Button("Start") {
-//                    if let c = coordinator {
-//                        c.sendCommand(command: .start(media: .video))
+//                    if let wv = rtcWebView {
+//                        sendCallCommand(wv, .start(media: .video))
 //                    }
 //                }
 //                Button("Accept") {
@@ -158,9 +180,3 @@ struct WebRTCView: UIViewRepresentable {
 //        }
 //    }
 //}
-//
-//struct CallViewDebug_Previews: PreviewProvider {
-//    static var previews: some View {
-//        CallViewDebug()
-//    }
-//}

apps/ios/Shared/Views/Chat/ChatInfoView.swift

@@ -12,10 +12,16 @@ struct ChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var chat: Chat
-    @Binding var showChatInfo: Bool
-    @State var showDeleteAlert = false
+    @State var alert: ChatInfoViewAlert? = nil
     @State var deletingContact: Contact?
 
+    enum ChatInfoViewAlert: Identifiable {
+        case deleteContactAlert
+        case clearChatAlert
+
+        var id: ChatInfoViewAlert { get { self } }
+    }
+
     var body: some View {
         VStack{
             ChatInfoImage(chat: chat)
@@ -27,8 +33,8 @@ struct ChatInfoView: View {
             Text(chat.chatInfo.fullName).font(.title)
                 .padding(.bottom)
 
-            if case let .direct(contact) = chat.chatInfo {
-                VStack {
+            VStack {
+                if case let .direct(contact) = chat.chatInfo {
                     HStack {
                         serverImage()
                         Text(chat.serverInfo.networkStatus.statusString)
@@ -41,18 +47,39 @@ struct ChatInfoView: View {
                         .padding(.vertical, 8)
 
                     Spacer()
+                    Button() {
+                        alert = .clearChatAlert
+                    } label: {
+                        Label("Clear conversation", systemImage: "gobackward")
+                    }
+                    .tint(Color.orange)
                     Button(role: .destructive) {
                         deletingContact = contact
-                        showDeleteAlert = true
+                        alert = .deleteContactAlert
                     } label: {
                         Label("Delete contact", systemImage: "trash")
                     }
                     .padding()
                 }
+                else if case .group = chat.chatInfo {
+                    Spacer()
+                    Button() {
+                        alert = .clearChatAlert
+                    } label: {
+                        Label("Clear conversation", systemImage: "gobackward")
+                    }
+                    .tint(Color.orange)
+                    .padding()
+                }
             }
+            .alert(item: $alert) { alertItem in
+                switch(alertItem) {
+                case .deleteContactAlert: return deleteContactAlert(deletingContact!)
+                case .clearChatAlert: return clearChatAlert()
+                }
+            }
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         }
-        .alert(isPresented: $showDeleteAlert) { deleteContactAlert(deletingContact!) }
-        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
     }
 
     func serverImage() -> some View {
@@ -71,7 +98,7 @@ struct ChatInfoView: View {
                         try await apiDeleteChat(type: .direct, id: contact.apiId)
                         DispatchQueue.main.async {
                             chatModel.removeChat(contact.id)
-                            showChatInfo = false
+                            chatModel.showChatInfo = false
                         }
                     } catch let error {
                         logger.error("ChatInfoView.deleteContactAlert apiDeleteChat error: \(error.localizedDescription)")
@@ -81,11 +108,27 @@ struct ChatInfoView: View {
             secondaryButton: .cancel()
         )
     }
+
+    private func clearChatAlert() -> Alert {
+        Alert(
+            title: Text("Clear conversation?"),
+            message: Text("All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you."),
+            primaryButton: .destructive(Text("Clear")) {
+                Task {
+                    await clearChat(chat)
+                    DispatchQueue.main.async {
+                        chatModel.showChatInfo = false
+                    }
+                }
+            },
+            secondaryButton: .cancel()
+        )
+    }
 }
 
 struct ChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
         @State var showChatInfo = true
-        return ChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []), showChatInfo: $showChatInfo)
+        return ChatInfoView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []))
     }
 }

apps/ios/Shared/Views/Chat/ChatItem/CICallItemView.swift

@@ -0,0 +1,83 @@
+//
+//  CICallItemView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 20/05/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct CICallItemView: View {
+    @EnvironmentObject var m: ChatModel
+    var chatInfo: ChatInfo
+    var chatItem: ChatItem
+    var status: CICallStatus
+    var duration: Int
+
+    var body: some View {
+        let sent = chatItem.chatDir.sent
+        VStack(spacing: 4) {
+            switch status {
+            case .pending:
+                if sent {
+                    Image(systemName: "phone.arrow.up.right").foregroundColor(.secondary)
+                } else {
+                    acceptCallButton()
+                }
+            case .missed: missedCallIcon(sent).foregroundColor(.red)
+            case .rejected: Image(systemName: "phone.down").foregroundColor(.red)
+            case .accepted: connectingCallIcon()
+            case .negotiated: connectingCallIcon()
+            case .progress: Image(systemName: "phone.and.waveform.fill").foregroundColor(.green)
+            case .ended: endedCallIcon(sent)
+            case .error: missedCallIcon(sent).foregroundColor(.orange)
+            }
+
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
+                .padding(.bottom, 8)
+                .padding(.horizontal, 12)
+        }
+    }
+
+    private func missedCallIcon(_ sent: Bool) -> some View {
+        Image(systemName: sent ? "phone.arrow.up.right" : "phone.arrow.down.left")
+    }
+
+    private func connectingCallIcon() -> some View {
+        Image(systemName: "phone.connection").foregroundColor(.green)
+    }
+
+    @ViewBuilder private func endedCallIcon(_ sent: Bool) -> some View {
+        HStack {
+            Image(systemName: "phone.down")
+            Text(CICallStatus.durationText(duration)).foregroundColor(.secondary)
+        }
+    }
+
+
+    @ViewBuilder private func acceptCallButton() -> some View {
+        if case let .direct(contact) = chatInfo {
+            Button {
+                if let invitation = m.callInvitations[contact.id] {
+                    CallController.shared.answerCall(invitation: invitation)
+                    logger.debug("acceptCallButton call answered")
+                } else {
+                    AlertManager.shared.showAlertMsg(title: "Call already ended!")
+                }
+            } label: {
+                Label("Answer call", systemImage: "phone.arrow.down.left")
+            }
+        } else {
+            Image(systemName: "phone.arrow.down.left").foregroundColor(.secondary)
+        }
+    }
+}
+
+//struct CICallItemView_Previews: PreviewProvider {
+//    static var previews: some View {
+//        CICallItemView()
+//    }
+//}

apps/ios/Shared/Views/Chat/ChatItem/CIFileView.swift

@@ -148,16 +148,16 @@ struct CIFileView_Previews: PreviewProvider {
             file: nil
         )
         Group{
-            ChatItemView(chatItem: sentFile)
-            ChatItemView(chatItem: ChatItem.getFileMsgContentSample())
-            ChatItemView(chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation))
-            ChatItemView(chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted))
-            ChatItemView(chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer))
-            ChatItemView(chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled))
-            ChatItemView(chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation))
-            ChatItemView(chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation))
-            ChatItemView(chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation))
-            ChatItemView(chatItem: fileChatItemWtFile)
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: sentFile)
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample())
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: fileChatItemWtFile)
         }
         .previewLayout(.fixed(width: 360, height: 360))
     }

apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift

@@ -23,9 +23,14 @@ struct CIImageView: View {
                 .fullScreenCover(isPresented: $showFullScreenImage) {
                     ZStack {
                         Color.black.edgesIgnoringSafeArea(.all)
-                        Image(uiImage: uiImage)
-                            .resizable()
-                            .scaledToFit()
+                        ZoomableScrollView {
+                            ZStack {
+                                Color.black.edgesIgnoringSafeArea(.all)
+                                Image(uiImage: uiImage)
+                                    .resizable()
+                                    .scaledToFit()
+                            }
+                        }
                     }
                     .onTapGesture { showFullScreenImage = false }
                     .gesture(
@@ -42,11 +47,23 @@ struct CIImageView: View {
               let uiImage = UIImage(data: data) {
                 imageView(uiImage)
                     .onTapGesture {
-                        if case .rcvAccepted = file?.fileStatus {
-                            AlertManager.shared.showAlertMsg(
-                                title: "Waiting for image",
-                                message: "Image will be received when your contact is online, please wait or check later!"
-                            )
+                        if let file = file {
+                            switch file.fileStatus {
+                            case .rcvInvitation:
+                                Task {
+                                    await receiveFile(fileId: file.fileId)
+                                    // TODO image accepted alert?
+                                }
+                            case .rcvAccepted:
+                                AlertManager.shared.showAlertMsg(
+                                    title: "Waiting for image",
+                                    message: "Image will be received when your contact is online, please wait or check later!"
+                                )
+                            case .rcvTransfer: () // ?
+                            case .rcvComplete: () // ?
+                            case .rcvCancelled: () // TODO
+                            default: ()
+                            }
                         }
                     }
             }

apps/ios/Shared/Views/Chat/ChatItem/DeletedItemView.swift

@@ -9,7 +9,6 @@
 import SwiftUI
 
 struct DeletedItemView: View {
-    @Environment(\.colorScheme) var colorScheme
     var chatItem: ChatItem
     var showMember = false
 
@@ -29,11 +28,6 @@ struct DeletedItemView: View {
         .background(Color(uiColor: .tertiarySystemGroupedBackground))
         .cornerRadius(18)
         .textSelection(.disabled)
-//        .background(Color(uiColor: .systemBackground))
-//        .overlay(
-//            RoundedRectangle(cornerRadius: 18)
-//                .stroke(.quaternary, lineWidth: 1)
-//        )
     }
 }
 

apps/ios/Shared/Views/Chat/ChatItem/FramedItemView.swift

@@ -139,7 +139,7 @@ struct FramedItemView: View {
 
     @ViewBuilder private func ciMsgContentView(_ ci: ChatItem, _ showMember: Bool = false) -> some View {
         let v = MsgContentView(
-            content: ci.content,
+            text: ci.text,
             formattedText: ci.formattedText,
             sender: showMember ? ci.memberDisplayName : nil,
             metaText: ci.timestampText,
@@ -168,7 +168,8 @@ private struct MetaColorPreferenceKey: PreferenceKey {
 
 private func ciQuotedMsgView(_ qi: CIQuote) -> some View {
     MsgContentView(
-        content: qi,
+        text: qi.text,
+        formattedText: qi.formattedText,
         sender: qi.getSender(ChatModel.shared.currentUser)
     )
     .lineLimit(3)

apps/ios/Shared/Views/Chat/ChatItem/IntegrityErrorItemView.swift

@@ -0,0 +1,53 @@
+//
+//  IntegrityErrorItemView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 28/05/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct IntegrityErrorItemView: View {
+    var chatItem: ChatItem
+    var showMember = false
+
+    var body: some View {
+        HStack(alignment: .bottom, spacing: 0) {
+            if showMember, let member = chatItem.memberDisplayName {
+                Text(member).fontWeight(.medium) + Text(": ")
+            }
+            Text(chatItem.content.text)
+                .foregroundColor(.red)
+                .italic()
+            CIMetaView(chatItem: chatItem)
+                .padding(.horizontal, 12)
+        }
+        .padding(.leading, 12)
+        .padding(.vertical, 6)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
+        .textSelection(.disabled)
+        .onTapGesture { skippedMessagesAlert() }
+    }
+
+    private func skippedMessagesAlert() {
+        AlertManager.shared.showAlertMsg(
+            title: "Skipped messages",
+            message: """
+                It can happen when:
+                1. The messages expire on the server if they were not received for 30 days,
+                2. The server you use to receive the messages from this contact was updated and restarted.
+                3. The connection is compromised.
+                Please connect to the developers via Settings to receive the updates about the servers.
+                We will be adding server redundancy to prevent lost messages.
+                """
+        )
+    }
+}
+
+struct IntegrityErrorItemView_Previews: PreviewProvider {
+    static var previews: some View {
+        IntegrityErrorItemView(chatItem: ChatItem.getIntegrityErrorSample())
+    }
+}

apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift

@@ -12,14 +12,14 @@ private let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
 private let linkColor = Color(uiColor: uiLinkColor)
 
 struct MsgContentView: View {
-    var content: ItemContent
+    var text: String
     var formattedText: [FormattedText]? = nil
     var sender: String? = nil
     var metaText: Text? = nil
     var edited = false
 
     var body: some View {
-        let v = messageText(content.text, formattedText, sender)
+        let v = messageText(text, formattedText, sender)
         if let mt = metaText {
             return v + reserveSpaceForMeta(mt, edited)
         } else {
@@ -90,7 +90,7 @@ struct MsgContentView_Previews: PreviewProvider {
     static var previews: some View {
         let chatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
         return MsgContentView(
-            content: chatItem.content,
+            text: chatItem.text,
             formattedText: chatItem.formattedText,
             sender: chatItem.memberDisplayName,
             metaText: chatItem.timestampText

apps/ios/Shared/Views/Chat/ChatItemView.swift

@@ -9,34 +9,49 @@
 import SwiftUI
 
 struct ChatItemView: View {
+    var chatInfo: ChatInfo
     var chatItem: ChatItem
     var showMember = false
     var maxWidth: CGFloat = .infinity
 
     var body: some View {
-        if chatItem.isMsgContent() {
-            if (chatItem.quotedItem == nil && chatItem.file == nil && isShortEmoji(chatItem.content.text)) {
-                EmojiItemView(chatItem: chatItem)
-            } else {
-                FramedItemView(chatItem: chatItem, showMember: showMember, maxWidth: maxWidth)
-            }
-        } else if chatItem.isDeletedContent() {
-            DeletedItemView(chatItem: chatItem, showMember: showMember)
-        } else if chatItem.isCall() {
+        switch chatItem.content {
+        case .sndMsgContent: contentItemView()
+        case .rcvMsgContent: contentItemView()
+        case .sndDeleted: deletedItemView()
+        case .rcvDeleted: deletedItemView()
+        case let .sndCall(status, duration): callItemView(status, duration)
+        case let .rcvCall(status, duration): callItemView(status, duration)
+        case .rcvIntegrityError: IntegrityErrorItemView(chatItem: chatItem, showMember: showMember)
+        }
+    }
+
+    @ViewBuilder private func contentItemView() -> some View {
+        if (chatItem.quotedItem == nil && chatItem.file == nil && isShortEmoji(chatItem.content.text)) {
+            EmojiItemView(chatItem: chatItem)
+        } else {
             FramedItemView(chatItem: chatItem, showMember: showMember, maxWidth: maxWidth)
         }
     }
+
+    private func deletedItemView() -> some View {
+        DeletedItemView(chatItem: chatItem, showMember: showMember)
+    }
+
+    private func callItemView(_ status: CICallStatus, _ duration: Int) -> some View {
+        CICallItemView(chatInfo: chatInfo, chatItem: chatItem, status: status, duration: duration)
+    }
 }
 
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ChatItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"))
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"))
-            ChatItemView(chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"))
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"))
-            ChatItemView(chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"))
-            ChatItemView(chatItem: ChatItem.getDeletedContentSample())
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"))
+            ChatItemView(chatInfo: ChatInfo.sampleData.direct, chatItem: ChatItem.getDeletedContentSample())
         }
         .previewLayout(.fixed(width: 360, height: 70))
     }

apps/ios/Shared/Views/Chat/ChatView.swift

@@ -13,12 +13,11 @@ private let memberImageSize: CGFloat = 34
 struct ChatView: View {
     @EnvironmentObject var chatModel: ChatModel
     @Environment(\.colorScheme) var colorScheme
+    @AppStorage(DEFAULT_EXPERIMENTAL_CALLS) private var enableCalls = false
     @ObservedObject var chat: Chat
-    @Binding var showCallView: Bool
     @State private var composeState = ComposeState()
     @State private var deletingItem: ChatItem? = nil
     @FocusState private var keyboardVisible: Bool
-    @State private var showChatInfo = false
     @State private var showDeleteMessage = false
 
     var body: some View {
@@ -98,35 +97,29 @@ struct ChatView: View {
             }
             ToolbarItem(placement: .principal) {
                 Button {
-                    showChatInfo = true
+                    chatModel.showChatInfo = true
                 } label: {
                     ChatInfoToolbar(chat: chat)
                 }
-                .sheet(isPresented: $showChatInfo) {
-                    ChatInfoView(chat: chat, showChatInfo: $showChatInfo)
+                .sheet(isPresented: $chatModel.showChatInfo) {
+                    ChatInfoView(chat: chat)
+                }
+            }
+            ToolbarItem(placement: .navigationBarTrailing) {
+                if enableCalls, case let .direct(contact) = cInfo {
+                    HStack {
+                        callButton(contact, .audio, imageName: "phone")
+                        callButton(contact, .video, imageName: "video")
+                    }
                 }
             }
-//            ToolbarItem(placement: .navigationBarTrailing) {
-//                if case let .direct(contact) = cInfo {
-//                    HStack {
-//                        callButton(contact, .audio, imageName: "phone")
-//                        callButton(contact, .video, imageName: "video")
-//                    }
-//                }
-//            }
         }
         .navigationBarBackButtonHidden(true)
     }
 
     private func callButton(_ contact: Contact, _ media: CallMediaType, imageName: String) -> some View {
         Button {
-            chatModel.activeCall = Call(
-                contact: contact,
-                callState: .waitCapabilities,
-                localMedia: media
-            )
-            showCallView = true
-            chatModel.callCommand = .capabilities
+            CallController.shared.startCall(contact, media)
         } label: {
             Image(systemName: imageName)
         }
@@ -134,7 +127,7 @@ struct ChatView: View {
 
     private func chatItemWithMenu(_ ci: ChatItem, _ maxWidth: CGFloat, showMember: Bool = false) -> some View {
         let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
-        return ChatItemView(chatItem: ci, showMember: showMember, maxWidth: maxWidth)
+        return ChatItemView(chatInfo: chat.chatInfo, chatItem: ci, showMember: showMember, maxWidth: maxWidth)
             .contextMenu {
                 if ci.isMsgContent() {
                     Button {
@@ -178,9 +171,12 @@ struct ChatView: View {
                     Button(role: .destructive) {
                         showDeleteMessage = true
                         deletingItem = ci
-                    } label: {
-                        Label("Delete", systemImage: "trash")
-                    }
+                    } label: { Label("Delete", systemImage: "trash") }
+                } else if ci.isDeletedContent() {
+                    Button(role: .destructive) {
+                        showDeleteMessage = true
+                        deletingItem = ci
+                    } label: { Label("Delete", systemImage: "trash") }
                 }
             }
             .confirmationDialog("Delete message?", isPresented: $showDeleteMessage, titleVisibility: .visible) {
@@ -227,7 +223,7 @@ struct ChatView: View {
     }
 
     func markAllRead() {
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.75) {
             if chatModel.chatId == chat.id {
                 Task { await markChatRead(chat) }
             }
@@ -260,7 +256,6 @@ struct ChatView: View {
 
 struct ChatView_Previews: PreviewProvider {
     static var previews: some View {
-        @State var showCallView = false
         let chatModel = ChatModel()
         chatModel.chatId = "@1"
         chatModel.chatItems = [
@@ -274,7 +269,7 @@ struct ChatView_Previews: PreviewProvider {
             ChatItem.getSample(8, .directSnd, .now, "👍👍👍👍"),
             ChatItem.getSample(9, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
         ]
-        return ChatView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []), showCallView: $showCallView)
+        return ChatView(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []))
             .environmentObject(chatModel)
     }
 }

apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift

@@ -10,7 +10,7 @@ import SwiftUI
 
 enum ComposePreview {
     case noPreview
-    case linkPreview(linkPreview: LinkPreview)
+    case linkPreview(linkPreview: LinkPreview?)
     case imagePreview(imagePreview: String)
     case filePreview(fileName: String)
 }
@@ -26,6 +26,7 @@ struct ComposeState {
     var preview: ComposePreview
     var contextItem: ComposeContextItem
     var inProgress: Bool = false
+    var useLinkPreviews: Bool = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
 
     init(
         message: String = "",
@@ -80,7 +81,7 @@ struct ComposeState {
         case .filePreview:
             return false
         default:
-            return true
+            return useLinkPreviews
         }
     }
 
@@ -124,9 +125,8 @@ struct ComposeView: View {
 
     @State private var showChooseSource = false
     @State private var showImagePicker = false
-    @State private var imageSource: ImageSource = .imageLibrary
+    @State private var showTakePhoto = false
     @State var chosenImage: UIImage? = nil
-
     @State private var showFileImporter = false
     @State var chosenFile: URL? = nil
     
@@ -171,27 +171,31 @@ struct ComposeView: View {
         }
         .confirmationDialog("Attach", isPresented: $showChooseSource, titleVisibility: .visible) {
             Button("Take picture") {
-                imageSource = .camera
-                showImagePicker = true
+                showTakePhoto = true
             }
             Button("Choose from library") {
-                imageSource = .imageLibrary
                 showImagePicker = true
             }
+            if UIPasteboard.general.hasImages {
+                Button("Paste image") {
+                    chosenImage = UIPasteboard.general.image
+                }
+            }
             Button("Choose file") {
                 showFileImporter = true
             }
         }
-        .sheet(isPresented: $showImagePicker) {
-            switch imageSource {
-            case .imageLibrary:
-                LibraryImagePicker(image: $chosenImage) {
-                    didSelectItem in showImagePicker = false
-                }
-            case .camera:
+        .fullScreenCover(isPresented: $showTakePhoto) {
+            ZStack {
+                Color.black.edgesIgnoringSafeArea(.all)
                 CameraImagePicker(image: $chosenImage)
             }
         }
+        .sheet(isPresented: $showImagePicker) {
+            LibraryImagePicker(image: $chosenImage) {
+                didSelectItem in showImagePicker = false
+            }
+        }
         .onChange(of: chosenImage) { image in
             if let image = image,
                let imagePreview = resizeImageToStrSize(image, maxDataSize: 14000) {
@@ -408,11 +412,13 @@ struct ComposeView: View {
         if let uri = composeState.linkPreview()?.uri.absoluteString {
             cancelledLinks.insert(uri)
         }
+        pendingLinkUrl = nil
         composeState = composeState.copy(preview: .noPreview)
     }
 
     private func loadLinkPreview(_ url: URL) {
         if pendingLinkUrl == url {
+            composeState = composeState.copy(preview: .linkPreview(linkPreview: nil))
             getLinkPreview(url: url) { linkPreview in
                 if let linkPreview = linkPreview,
                    pendingLinkUrl == url {
@@ -434,6 +440,7 @@ struct ComposeView: View {
         switch (composeState.preview) {
         case let .linkPreview(linkPreview: linkPreview):
             if let url = parseMessage(composeState.message),
+               let linkPreview = linkPreview,
                url == linkPreview.uri {
                 return .link(text: composeState.message, preview: linkPreview)
             } else {

apps/ios/Shared/Views/Chat/ComposeMessage/ContextItemView.swift

@@ -21,7 +21,12 @@ struct ContextItemView: View {
                 .aspectRatio(contentMode: .fit)
                 .frame(width: 16, height: 16)
                 .foregroundColor(.secondary)
-            contextText(contextItem).lineLimit(3)
+            MsgContentView(
+                text: contextItem.text,
+                formattedText: contextItem.formattedText,
+                sender: contextItem.memberDisplayName
+            )
+            .lineLimit(3)
             Spacer()
             Button {
                 withAnimation {
@@ -37,14 +42,6 @@ struct ContextItemView: View {
         .background(chatItemFrameColor(contextItem, colorScheme))
         .padding(.top, 8)
     }
-    
-    func contextText(_ cxtItem: ChatItem) -> some View {
-        if let s = cxtItem.memberDisplayName {
-            return (Text(s).fontWeight(.medium) + Text(": \(cxtItem.text)"))
-        } else {
-            return Text(cxtItem.text)
-        }
-    }
 }
 
 struct ContextItemView_Previews: PreviewProvider {

apps/ios/Shared/Views/ChatList/ChatListNavLink.swift

@@ -11,7 +11,6 @@ import SwiftUI
 struct ChatListNavLink: View {
     @EnvironmentObject var chatModel: ChatModel
     @State var chat: Chat
-    @Binding var showCallView: Bool
     @State private var showContactRequestDialog = false
 
     var body: some View {
@@ -28,7 +27,7 @@ struct ChatListNavLink: View {
     }
 
     private func chatView() -> some View {
-        ChatView(chat: chat, showCallView: $showCallView)
+        ChatView(chat: chat)
         .onAppear {
             do {
                 let cInfo = chat.chatInfo
@@ -54,6 +53,9 @@ struct ChatListNavLink: View {
                 markReadButton()
             }
         }
+        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            clearChatButton()
+        }
         .swipeActions(edge: .trailing) {
             Button(role: .destructive) {
                 AlertManager.shared.showAlert(
@@ -90,6 +92,9 @@ struct ChatListNavLink: View {
             }
         }
         .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            clearChatButton()
+        }
+        .swipeActions(edge: .trailing) {
             Button(role: .destructive) {
                 AlertManager.shared.showAlert(deleteGroupAlert(groupInfo))
             } label: {
@@ -108,6 +113,15 @@ struct ChatListNavLink: View {
         .tint(Color.accentColor)
     }
 
+    private func clearChatButton() -> some View {
+        Button {
+            AlertManager.shared.showAlert(clearChatAlert())
+        } label: {
+            Label("Clear", systemImage: "gobackward")
+        }
+        .tint(Color.orange)
+    }
+
     private func contactRequestNavLink(_ contactRequest: UserContactRequest) -> some View {
         ContactRequestView(contactRequest: contactRequest, chat: chat)
         .swipeActions(edge: .trailing, allowsFullSwipe: true) {
@@ -173,6 +187,17 @@ struct ChatListNavLink: View {
         )
     }
 
+    private func clearChatAlert() -> Alert {
+        Alert(
+            title: Text("Clear conversation?"),
+            message: Text("All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you."),
+            primaryButton: .destructive(Text("Clear")) {
+                Task { await clearChat(chat) }
+            },
+            secondaryButton: .cancel()
+        )
+    }
+
     private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
         Alert(
             title: Text("Delete group"),
@@ -253,20 +278,19 @@ struct ChatListNavLink: View {
 struct ChatListNavLink_Previews: PreviewProvider {
     static var previews: some View {
         @State var chatId: String? = "@1"
-        @State var showCallView = false
         return Group {
             ChatListNavLink(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
-            ), showCallView: $showCallView)
+            ))
             ChatListNavLink(chat: Chat(
                 chatInfo: ChatInfo.sampleData.direct,
                 chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
-            ), showCallView: $showCallView)
+            ))
             ChatListNavLink(chat: Chat(
                 chatInfo: ChatInfo.sampleData.contactRequest,
                 chatItems: []
-            ), showCallView: $showCallView)
+            ))
         }
         .previewLayout(.fixed(width: 360, height: 80))
     }

apps/ios/Shared/Views/ChatList/ChatListView.swift

@@ -13,7 +13,6 @@ struct ChatListView: View {
     // not really used in this view
     @State private var showSettings = false
     @State private var searchText = ""
-    @State private var showCallView = false
     @AppStorage(DEFAULT_PENDING_CONNECTIONS) private var pendingConnections = true
 
     var user: User
@@ -22,7 +21,7 @@ struct ChatListView: View {
         let v = NavigationView {
             List {
                 ForEach(filteredChats()) { chat in
-                    ChatListNavLink(chat: chat, showCallView: $showCallView)
+                    ChatListNavLink(chat: chat)
                         .padding(.trailing, -16)
                 }
             }
@@ -50,29 +49,6 @@ struct ChatListView: View {
                     NewChatButton()
                 }
             }
-            .fullScreenCover(isPresented: $showCallView) {
-                ActiveCallView(showCallView: $showCallView)
-            }
-            .onChange(of: showCallView) { _ in
-                if (showCallView) { return }
-                if let call = chatModel.activeCall {
-                    Task {
-                        do {
-                            try await apiEndCall(call.contact)
-                        } catch {
-                            logger.error("ChatListView apiEndCall error: \(error.localizedDescription)")
-                        }
-                    }
-                }
-                chatModel.callCommand = .end
-            }
-            .onChange(of: chatModel.activeCallInvitation) { _ in
-                if let contactRef = chatModel.activeCallInvitation,
-                   case let .direct(contact) = chatModel.getChat(contactRef.id)?.chatInfo,
-                   let invitation = chatModel.callInvitations.removeValue(forKey: contactRef.id) {
-                    answerCallAlert(contact, invitation)
-                }
-            }
         }
         .navigationViewStyle(.stack)
 
@@ -96,29 +72,6 @@ struct ChatListView: View {
                 $0.chatInfo.chatViewName.localizedLowercase.contains(s)
             }
     }
-
-    private func answerCallAlert(_ contact: Contact, _ invitation: CallInvitation) {
-        AlertManager.shared.showAlert(Alert(
-            title: Text("Incoming call"),
-            primaryButton: .default(Text("Answer")) {
-                if chatModel.activeCallInvitation == nil {
-                    DispatchQueue.main.async {
-                        AlertManager.shared.showAlertMsg(title: "Call already ended!")
-                    }
-                } else {
-                    chatModel.activeCallInvitation = nil
-                    chatModel.activeCall = Call(
-                        contact: contact,
-                        callState: .invitationReceived,
-                        localMedia: invitation.peerMedia
-                    )
-                    showCallView = true
-                    chatModel.callCommand = .start(media: invitation.peerMedia, aesKey: invitation.sharedKey)
-                }
-            },
-            secondaryButton: .cancel()
-        ))
-    }
 }
 
 struct ChatListView_Previews: PreviewProvider {

apps/ios/Shared/Views/ChatList/ChatPreviewView.swift

@@ -29,7 +29,7 @@ struct ChatPreviewView: View {
                         .foregroundColor(chat.chatInfo.ready ? .primary : .secondary)
                         .frame(maxHeight: .infinity, alignment: .topLeading)
                     Spacer()
-                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.createdAt))
+                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.updatedAt))
                         .font(.subheadline)
                         .frame(minWidth: 60, alignment: .trailing)
                         .foregroundColor(.secondary)

apps/ios/Shared/Views/Helpers/ImagePicker.swift

@@ -9,11 +9,6 @@
 import SwiftUI
 import PhotosUI
 
-enum ImageSource {
-    case imageLibrary
-    case camera
-}
-
 struct LibraryImagePicker: UIViewControllerRepresentable {
     typealias UIViewControllerType = PHPickerViewController
     @Binding var image: UIImage?

apps/ios/Shared/Views/Helpers/LocalAuthenticationUtils.swift

@@ -0,0 +1,64 @@
+//
+//  LocalAuthenticationUtils.swift
+//  SimpleX (iOS)
+//
+//  Created by Efim Poberezkin on 26.05.2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import LocalAuthentication
+
+enum LAResult {
+    case success
+    case failed(authError: String?)
+    case unavailable(authError: String?)
+}
+
+func authenticate(reason: String, completed: @escaping (LAResult) -> Void) {
+    let laContext = LAContext()
+    var authAvailabilityError: NSError?
+    if laContext.canEvaluatePolicy(.deviceOwnerAuthentication, error: &authAvailabilityError) {
+        laContext.evaluatePolicy(.deviceOwnerAuthentication, localizedReason: reason) { success, authError in
+            DispatchQueue.main.async {
+                if success {
+                    completed(LAResult.success)
+                } else {
+                    logger.error("authentication error: \(authError.debugDescription)")
+                    completed(LAResult.failed(authError: authError?.localizedDescription))
+                }
+            }
+        }
+    } else {
+        logger.error("authentication availability error: \(authAvailabilityError.debugDescription)")
+        completed(LAResult.unavailable(authError: authAvailabilityError?.localizedDescription))
+    }
+}
+
+func laTurnedOnAlert() -> Alert {
+    mkAlert(
+        title: "SimpleX Lock turned on",
+        message: "You will be required to authenticate when you start or resume the app after 30 seconds in background."
+    )
+}
+
+func laFailedAlert() -> Alert {
+    mkAlert(
+        title: "Authentication failed",
+        message: "You could not be verified; please try again."
+    )
+}
+
+func laUnavailableInstructionAlert() -> Alert {
+    mkAlert(
+        title: "Authentication unavailable",
+        message: "Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication."
+    )
+}
+
+func laUnavailableTurningOffAlert() -> Alert {
+    mkAlert(
+        title: "Authentication unavailable",
+        message: "Device authentication is disabled. Turning off SimpleX Lock."
+    )
+}