PushRule: add beforeRuleId and afterRuleId parameter when creating a rule

Use retrofit2.Call.awaitResponse extension provided by Retrofit 2.

.idea/dictionaries/bmarty.xml

@@ -7,6 +7,7 @@
       <w>ciphertext</w>
       <w>coroutine</w>
       <w>decryptor</w>
+      <w>displayname</w>
       <w>emoji</w>
       <w>emojis</w>
       <w>fdroid</w>

CHANGES.md

@@ -1,3 +1,33 @@
+Changes in RiotX 0.23.0 (2020-XX-XX)
+===================================================
+
+Features ✨:
+ - Call with WebRTC support (##611)
+ - Add capability to change the display name (#1529)
+
+Improvements 🙌:
+ - "Add Matrix app" menu is now always visible (#1495)
+
+Bugfix 🐛:
+ - Fix dark theme issue on login screen (#1097)
+ - Incomplete predicate in RealmCryptoStore#getOutgoingRoomKeyRequest (#1519)
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ - 
+
+Build 🧱:
+ - Enable code optimization (Proguard)
+ - SDK is now API level 21 minimum, and so RiotX (#405)
+
+Other changes:
+ - Use `retrofit2.Call.awaitResponse` extension provided by Retrofit 2. (#1526)
+ - Fix minor typo in contribution guide (#1512)
+ - Fix self-assignment of callback in `DefaultRoomPushRuleService#setRoomNotificationState` (#1520)
+ - Random housekeeping clean-ups indicated by Lint (#1520)
+
 Changes in RiotX 0.22.0 (2020-06-15)
 ===================================================
 

CONTRIBUTING.md

@@ -19,7 +19,11 @@ An Android Studio template has been added to the project to help creating all fi
 
 To install the template (to be done only once):
 - Go to folder `./tools/template`.
-- Run the script `./configure.sh`.
+- Mac OSX: Run the script `./configure.sh`.
+
+   Linux: Run `ANDROID_STUDIO=/path/to/android-studio ./configure`
+    - e.g. `ANDROID_STUDIO=/usr/local/android-studio ./configure`
+
 - Restart Android Studio.
 
 To create a new screen:
@@ -27,7 +31,7 @@ To create a new screen:
 - Then right click on the package, and select `New/New Vector/RiotX Feature`.
 - Follow the Wizard, especially replace `Main` by something more relevant to your feature.
 - Click on `Finish`.
-- Remainning steps are described as TODO in the generated files, or will be pointed out by the compilator, or at runtime :)
+- Remaining steps are described as TODO in the generated files, or will be pointed out by the compilator, or at runtime :)
 
 Note that if the templates are modified, the only things to do is to restart Android Studio for the change to take effect.
 

README.md

@@ -11,8 +11,8 @@ RiotX is an Android Matrix Client currently in beta but in active development.
 
 It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience. RiotX will become the official replacement as soon as all features are implemented.
 
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.riotx)
-[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.riotx)
+[<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.riotx)
+[<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.riotx)
 
 Nightly build: [![Buildkite](https://badge.buildkite.com/657d3db27364448d69d54f66c690f7788bc6aa80a7628e37f3.svg?branch=develop)](https://buildkite.com/matrix-dot-org/riotx-android/builds?branch=develop)
 

docs/voip_signaling.md

@@ -0,0 +1,420 @@
+   ╔════════════════════════════════════════════════╗
+   ║                                                ║
+   ║A] Placing a call offer                         ║
+   ║                                                ║
+   ╚════════════════════════════════════════════════╝
+
+
+
+                                                    ┌───────────────┐
+                                                    │    Matrix     │
+                                                    ├───────────────┴ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─
+                                                                                                                     │
+                                                    │
+                                                                                                                     │
+              ┌─────────────────┐                   │                  ┌───────────────────────────┐                                      ┌─────────────────┐
+              │     Caller      │                                      │      Signaling Room       │                 │                    │     Callee      │
+              └─────────────────┘                   │                  ├───────────────────────────┤                                      └─────────────────┘
+                                       ┌────┐                          │                           │                 │
+                                       │ 3  │       │                  │  ┌────────────────────┐   │
+              ┌─────────────────┐──────┴────┴──────────────────────────┼─▶│   m.call.invite    │   │                 │                    ┌─────────────────┐
+              │                 │                   │                  │  │      mx event      │   │                                      │                 │
+              │                 │                                      │  └────────────────────┘   │                 │                    │                 │
+              │                 │                   │                  │                           │                                      │                 │
+              │     Riot.im     │                                      │                           │                 │                    │     Riot.im     │
+           ┌──│       App       │                   │                  │                           │                                      │       App       │
+           │  │                 │                                      │                           │                 │                    │                 │
+           │  │                 │                   │                  │                           │                                      │                 │
+           │  │                 │                                      │                           │                 │                    │                 │
+           │  └─────────────────┘                   │                  │                           │                                      └─────────────────┘
+      ┌────┤     ▲                                                     │                           │                 │
+      │ 1  │     ├────┐                             │                  └───────────────────────────┘
+      └────┤     │ 2  │                              ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ┘
+           │  ┌──┴────┴─────────┐                                                                                                         ┌─────────────────┐
+           │  │                 │                                                                                                         │                 │
+           │  │                 │                                                                                                         │                 │
+           │  │     WebRtc      │                                                                                                         │     WebRtc      │
+           └─▶│                 │                                                                                                         │                 │
+              │                 │                                                                                                         │                 │
+              │                 │                                                                                                         │                 │
+              └─────────────────┘                                                                                                         └─────────────────┘
+
+
+
+
+
+
+
+
+
+       ┌────┐
+       │ 1  │  The Caller app get access to system resources (camera, mic), eventually stun/turn servers, define some
+       └────┘  constrains (video quality, format) and pass it to WebRtc in order to create a Peer Call offer
+
+       ┌────┐
+       │ 2  │  The WebRtc layer creates a call Offer (sdp) that needs to be sent to callee
+       └────┘
+
+       ┌────┐  The app layer, takes the webrtc offer, encapsulate it in a matrix event adds a callId and send it to the other
+       │ 3  │  user via the room
+       └────┘
+                   ┌──────────────┐
+                   │   mx event   │
+                   ├──────────────┴────────┐
+                   │ type: m.call.invite   │
+                   │ + callId              │
+                   │                       │
+                   │ ┌──────────────────┐  │
+                   │ │    webrtc sdp    │  │
+                   │ └──────────────────┘  │
+                   └───────────────────────┘
+
+
+
+
+
+
+
+   ╔════════════════════════════════════════════════╗
+   ║                                                ║
+   ║B] Sending connection establishment info        ║
+   ║                                                ║
+   ╚════════════════════════════════════════════════╝
+
+
+
+                                                   ┌───────────────┐
+                                                   │    Matrix     │
+                                                   ├───────────────┴ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─
+                                                                                                                    │
+                                                   │
+                                                                                                                    │
+             ┌─────────────────┐                   │                  ┌───────────────────────────┐                                      ┌─────────────────┐
+             │     Caller      │                                      │      Signaling Room       │                 │                    │     Callee      │
+             └─────────────────┘                   │                  ├───────────────────────────┤                                      └─────────────────┘
+                                                                      │  ┌────────────────────┐   │                 │
+                                                   │                  │  │   m.call.invite    │   │
+             ┌─────────────────┐                                      │  │      mx event      │   │                 │                    ┌─────────────────┐
+             │                 │      ┌────┐       │                  │  └────────────────────┘   │                                      │                 │
+             │                 │      │ 3  │                          │  ┌────────────────────┐   │                 │                    │                 │
+             │                 │──────┴────┴───────┼──────────────────┼─▶│ m.call.candidates  │   │                                      │                 │
+             │     Riot.im     │                                      │  │      mx event      │   │                 │                    │     Riot.im     │
+             │       App       │                   │                  │  └────────────────────┘   │                                      │       App       │
+             │                 │                                      │                           │                 │                    │                 │
+             │                 │                   │                  │                           │                                      │                 │
+             │                 │                                      │                           │                 │                    │                 │
+             └─────────────────┘                   │                  │                           │                                      └─────────────────┘
+                     ▲                                                │                           │                 │
+                     ├────┐                        │                  └───────────────────────────┘
+                     │ 2  │                         ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ┘
+             ┌───────┴────┴────┐                                                                                                         ┌─────────────────┐
+             │                 │                                                                                                         │                 │
+             │                 │                                                                                                         │                 │
+             │     WebRtc      │                   ┌───────────────┐                                                                     │     WebRtc      │
+             │                 │                   │  Stun / Turn  │                                                                     │                 │
+             │                 │                   ├───────────────┴ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─                                         │                 │
+             │                 │                                                                │                                        │                 │
+             └─────────────────┘                   │                                                                                     └─────────────────┘
+                      ▲                                                                         │
+                      │                            │
+                      └──────────┬────┬───────────▶                                             │
+              ┌───────────────┐  │ 1  │            │
+              │               │  └────┘                                                         │
+              │ Network Stack │                    │
+              │               │                     ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ┘
+              │               │
+              └───────────────┘
+
+
+
+
+       ┌────┐
+       │ 1  │  The WebRtc layer gathers information on how it can be reach by the other peer directly (Ice candidates)
+       └────┘
+               ┌──────────────────────────────────────────────────────────────────┐
+               │candidate:1 1 tcp 1518149375 127.0.0.1 35990 typ host             │
+               └──────────────────────────────────────────────────────────────────┘
+               ┌──────────────────────────────────────────────────────────────────┐
+               │candidate:2 1 UDP 2130706431 192.168.1.102 1816 typ host          │
+               └──────────────────────────────────────────────────────────────────┘
+
+       ┌────┐
+       │ 2  │  The WebRTC layer notifies the App layer when it finds new Ice Candidates
+       └────┘
+
+
+
+       ┌────┐  The app layer, takes the ice candidates, encapsulate them in one or several matrix event adds the callId and
+       │ 3  │  send it to the other user via the room
+       └────┘
+                   ┌──────────────┐
+                   │   mx event   │
+                   ├──────────────┴────────────────────────┐
+                   │  type: m.call.candidates              │
+                   │                                       │
+                   │  +CallId                              │
+                   │                                       │
+                   │ ┌──────────────────┐                  │
+                   │ │ice candidate sdp │                  │
+                   │ └──────────────────┘                  │
+                   │ ┌──────────────────┐                  │
+                   │ │ice candidate sdp │                  │
+                   │ └──────────────────┘                  │
+                   │ ┌──────────────────┐                  │
+                   │ │ice candidate sdp │                  │
+                   │ └──────────────────┘                  │
+                   └───────────────────────────────────────┘
+
+
+
+
+
+    ╔════════════════════════════════════════════════╗
+    ║                                                ║
+    ║C] Receiving a call offer                       ║
+    ║                                                ║
+    ╚════════════════════════════════════════════════╝
+
+
+
+                                                    ┌───────────────┐
+                                                    │    Matrix     │
+                                                    ├───────────────┴ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─
+                                                                                                                     │
+                                                    │                                                                                     ┌─────────────────┐
+                                                                                                                     │                    │     Callee      │
+              ┌─────────────────┐                   │                  ┌───────────────────────────┐                                      └─────────────────┘
+              │     Caller      │                                      │      Signaling Room       │                 │
+              └─────────────────┘                   │                  ├───────────────────────────┤
+                                                                       │  ┌────────────────────┐   │                 │                    ┌─────────────────┐
+                                                    │                  │  │   m.call.invite    │───┼────────────────────────────┬────┬───▶│                 │
+              ┌─────────────────┐                                      │  │      mx event      │   │                 │          │ 1  │    │                 │
+              │                 │                   │                  │  └────────────────────┘   │                            └────┘    │                 │
+              │                 │                                      │  ┌────────────────────┐   │                 │                    │     Riot.im     │
+              │                 │                   │                  │  │ m.call.candidates  │   │                                      │       App       │
+              │     Riot.im     │                                      │  │      mx event      │   │                 │                    │                 │
+              │       App       │                   │                  │  └────────────────────┘   │                                      │                 │
+              │                 │                                      │  ┌────────────────────┐◀──┼─────────────────┼───┬────┬───────────┤                 │
+              │                 │◀──────────────────┼──────────────────┼──│   m.call.answer    │   │                     │ 4  │           └──┬──────────────┘
+              │                 │                                      │  │      mx event      │   │                 │   └────┘              ├────┐    ▲
+              └────┬────────────┘                   │                  │  └────────────────────┘   │                                         │ 2  │    ├────┐
+                   │                                                   │                           │                 │                       ├────┘    │ 3  │
+                   │                                │                  └───────────────────────────┘                                      ┌──▼─────────┴────┤
+              ┌────▼────────────┐                    ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ┘                    │                 │
+              │                 │                                                                                                         │                 │
+              │                 │                                                                                                         │     WebRtc      │
+              │     WebRtc      │                                                                                                         │              ┌──┴─────────────────┐
+              │                 │                                                                                                         │              │    caller offer    │
+   ┌──────────┴─────────┐       │                                                                                                         │              └──┬─────────────────┘
+   │   callee answer    │       │                                                                                                         └─────────────────┘
+   └────────────────────┴───────┘
+
+
+
+
+
+
+
+        ┌────┐
+        │ 1  │  Bob receives a call.invite event in a room, then creates a WebRTC peer connection object
+        └────┘
+
+        ┌────┐
+        │ 2  │  The encapsulated call offer sdp from the mx event is transmitted to WebRTC
+        └────┘
+
+        ┌────┐
+        │ 3  │  WebRTC then creates a call answer for the offer and send it back to app layer
+        └────┘
+
+
+        ┌────┐  The app layer, takes the webrtc answer, encapsulate it in a matrix event adds a callId and send it to the
+        │ 3  │  other user via the room
+        └────┘
+                    ┌──────────────┐
+                    │   mx event   │
+                    ├──────────────┴────────┐
+                    │ type: m.call.answer   │
+                    │ + callId              │
+                    │                       │
+                    │ ┌──────────────────┐  │
+                    │ │    webrtc sdp    │  │
+                    │ └──────────────────┘  │
+                    └───────────────────────┘
+
+
+
+
+
+
+    ╔════════════════════════════════════════════════╗
+    ║                                                ║
+    ║D] Callee sends connection establishment info   ║
+    ║                                                ║
+    ╚════════════════════════════════════════════════╝
+
+
+
+                                                    ┌───────────────┐
+                                                    │    Matrix     │
+                                                    ├───────────────┴ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─
+                                                                                                                     │
+                                                    │
+                                                                                                                     │
+              ┌─────────────────┐                   │                  ┌───────────────────────────┐                                      ┌─────────────────┐
+              │     Caller      │                                      │      Signaling Room       │                 │                    │     Callee      │
+              └─────────────────┘                   │                  ├───────────────────────────┤                                      └─────────────────┘
+                                                                       │  ┌────────────────────┐   │                 │
+                                                    │                  │  │   m.call.invite    │   │
+              ┌─────────────────┐                                      │  │      mx event      │   │                 │                    ┌─────────────────┐
+              │                 │                   │                  │  └────────────────────┘   │                                      │                 │
+              │                 │                                      │  ┌────────────────────┐   │                 │                    │                 │
+              │                 │                   │                  │  │ m.call.candidates  │   │                                      │                 │
+              │     Riot.im     │                                      │  │      mx event      │   │                 │                    │     Riot.im     │
+              │       App       │                   │                  │  └────────────────────┘   │                        ┌────┐        │       App       │
+              │                 │                                      │  ┌────────────────────┐   │                 │      │ 3  │        │                 │
+              │                 │◀──────────────────┼┐                 │  │   m.call.answer    │   │                ┌───────┴────┴────────│                 │
+              │                 │                    │                 │  │      mx event      │   │                ││                    │                 │
+              └─────────────────┘                   ││                 │  └────────────────────┘   │                │                     └─────────────────┘
+                   │                                 │                 │  ┌────────────────────┐   │                ││                         ▲
+                   │                                │└─────────────────┼──│ m.call.candidates  │   │                │                          ├────┐
+                   ▼                                                   │  │      mx event      │◀──┼────────────────┘│                         │ 2  │
+              ┌─────────────────┐                   │                  │  └────────────────────┘   │                                      ┌────┴────┴───────┐
+              │                 │                                      └───────────────────────────┘                 │                    │                 │
+              │                 │                   │                                                                                     │                 │
+              │     WebRtc      │                                                                                    │                    │     WebRtc      │
+              │                 │                   └ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─                     │             ┌───┴────────────────┐
+              │                 │                                                                                                         │             │    caller offer    │
+     ┌────────┴───────────┐     │                                                                                                         │             └───┬────────────────┘
+     │   callee answer    ├─────┘                                                  ┌───────────────┐                                      └─────────────────┘
+     ├────────────────────┤                                                        │  Stun / Turn  │                                               ▲
+     │     callee ice     │                                                        ├───────────────┴ ─ ─ ─ ─ ─ ─ ─ ─                       ┌────┐  │
+     │     candidates     │                                                                                         │                      │ 1  │  │
+     └────────────────────┘                                                        │                                                       ├────┴──┴───────┐
+                                                                                                                    │                      │               │
+                                                                                   │                                                       │ Network Stack │
+                                                                                                                    │◀─────────────────────┤               │
+                                                                                   │                                                       │               │
+                                                                                                                    │                      └───────────────┘
+                                                                                   │
+                                                                                    ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ┘
+
+
+        ┌────┐
+        │ 1  │  The WebRtc layer gathers information on how it can be reach by the other peer directly (Ice candidates)
+        └────┘
+                ┌──────────────────────────────────────────────────────────────────┐
+                │candidate:1 1 tcp 1518149375 127.0.0.1 35990 typ host             │
+                └──────────────────────────────────────────────────────────────────┘
+                ┌──────────────────────────────────────────────────────────────────┐
+                │candidate:2 1 UDP 2130706431 192.168.1.102 1816 typ host          │
+                └──────────────────────────────────────────────────────────────────┘
+
+        ┌────┐
+        │ 2  │  The WebRTC layer notifies the App layer when it finds new Ice Candidates
+        └────┘
+
+
+
+        ┌────┐  The app layer, takes the ice candidates, encapsulate them in one or several matrix event adds the callId and
+        │ 3  │  send it to the other user via the room
+        └────┘
+                    ┌──────────────┐
+                    │   mx event   │
+                    ├──────────────┴────────────────────────┐
+                    │  type: m.call.candidates              │
+                    │                                       │
+                    │  +CallId                              │
+                    │                                       │
+                    │ ┌──────────────────┐                  │
+                    │ │ice candidate sdp │                  │
+                    │ └──────────────────┘                  │
+                    │ ┌──────────────────┐                  │
+                    │ │ice candidate sdp │                  │
+                    │ └──────────────────┘                  │
+                    │ ┌──────────────────┐                  │
+                    │ │ice candidate sdp │                  │
+                    │ └──────────────────┘                  │
+                    └───────────────────────────────────────┘
+
+
+
+
+
+
+     ╔════════════════════════════════════════════════╗
+     ║                                                ║
+     ║D] Caller Callee connection                     ║
+     ║                                                ║
+     ╚════════════════════════════════════════════════╝
+
+
+
+
+
+
+
+
+                                                   ┌───────────────┐
+               ┌─────────────────┐                 │    Matrix     │                                                                       ┌─────────────────┐
+               │     Caller      │                 ├───────────────┴ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─                       │     Callee      │
+               └─────────────────┘                                                                                  │                      └─────────────────┘
+                                                   │
+                                                                                                                    │
+               ┌─────────────────┐                 │                                                                                       ┌─────────────────┐
+               │                 │                                                                                  │                      │                 │
+               │                 │                 │                                                                                       │                 │
+               │                 │                                                                                  │                      │                 │
+               │     Riot.im     │                 └ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─                       │     Riot.im     │
+               │       App       │                                                                                                         │       App       │
+               │                 │                                                                                                         │                 │
+               │                 │                                                                                                         │                 │
+               │                 │                                                                                                         │                 │
+               └─────────────────┘                                                                                                         └─────────────────┘
+                                                    ┌───────────────┐
+                                                    │   Internet    │
+                                                    ├───────────────┴ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─
+               ┌─────────────────┐                                                                                   │                     ┌─────────────────┐
+               │                 │                  │                                                                                      │                 │
+               │                 ├───────────────────────────────────────────────────────────────────────────────────┴─────────────────────┤                 │
+               │     WebRtc      │█████████████████████████████████████████████████████████████████████████████████████████████████████████│     WebRtc      │
+ ┌─────────────┴──────┐          ├────────────────────────────────────────┬──────────────────────────┬───────────────┬─────────────────────┤           ┌─────┴──────────────┐
+ │   callee answer    │          │                  │                     │   Video / Audio Stream   │                                     │           │    caller offer    │
+ ├────────────────────┤          │                                        └──────────────────────────┘               │                     │           ├────────────────────┤
+ │     callee ice     ├──────────┘                  └ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─                      └───────────┤     caller ice     │
+ │     candidates     │                                                                                                                                │     candidates     │
+ └────────────────────┘                                                                                                                                └────────────────────┘
+
+
+
+                                                         ┌─────────────────────────────────────────────────────┐
+                                                         │                                                     │░
+                                                         │ If connection is impossible (firewall), and a turn  │░
+                                                         │server is available, connection could happen through │░
+                                                         │                       a relay                       │░
+                                                         │                                                     │░
+                                                         └─────────────────────────────────────────────────────┘░
+                                                          ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+
+
+                                                     ┌───────────────┐
+                                                     │   Internet    │
+                                                     └─┬─────────────┴ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─
+                ┌─────────────────┐                                                                                     │                   ┌─────────────────┐
+                │                 │                    │                   ┌─────────────────────────┐                                      │                 │
+                │                 ├───────────────────────────────────────┐│                         │                  │                   │                 │
+                │     WebRtc      │███████████████████████████████████████││                         │                                      │     WebRtc      │
+                │                 ├───────────────────────────────────────┘│                         │                  │                   │                 │
+                │                 │           ┌────────┴─────────────────┐ │          Relay          │┌─────────────────────────────────────┤                 │
+┌───────────────┴────┐            │           │   Video / Audio Stream   │ │                         ││█████████████████████████████████████│         ┌───────┴────────────┐
+│   callee answer    ├────────────┘           └────────┬─────────────────┘ │                         │└─────────────────────────────────────┴─────────┤    caller offer    │
+├────────────────────┤                                                     │                         │                  │                             ├────────────────────┤
+│     callee ice     │                                 │                   │                         │                                                │     caller ice     │
+│     candidates     │                                                     └─────────────────────────┘                  │                             │     candidates     │
+└────────────────────┘                                 │                                                                                              └────────────────────┘
+                                                                                                                        │
+                                                       │
+                                                                                                                        │
+                                                       │
+                                                                                                                        │
+                                                       └ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─

matrix-sdk-android-rx/build.gradle

@@ -6,7 +6,7 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"

matrix-sdk-android/build.gradle

@@ -23,7 +23,7 @@ android {
     testOptions.unitTests.includeAndroidResources = true
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "0.0.1"
@@ -35,6 +35,10 @@ android {
         resValue "string", "git_sdk_revision", "\"${gitRevision()}\""
         resValue "string", "git_sdk_revision_unix_date", "\"${gitRevisionUnixDate()}\""
         resValue "string", "git_sdk_revision_date", "\"${gitRevisionDate()}\""
+
+        defaultConfig {
+            consumerProguardFiles 'proguard-rules.pro'
+        }
     }
 
     buildTypes {
@@ -49,9 +53,6 @@ android {
         release {
             buildConfigField "boolean", "LOG_PRIVATE_DATA", "false"
             buildConfigField "okhttp3.logging.HttpLoggingInterceptor.Level", "OKHTTP_LOGGING_LEVEL", "okhttp3.logging.HttpLoggingInterceptor.Level.NONE"
-
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -161,6 +162,10 @@ dependencies {
     // Phone number https://github.com/google/libphonenumber
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.23'
 
+    // Web RTC
+    // TODO meant for development purposes only. See http://webrtc.github.io/webrtc-org/native-code/android/
+    implementation 'org.webrtc:google-webrtc:1.0.+'
+
     debugImplementation 'com.airbnb.okreplay:okreplay:1.5.0'
     releaseImplementation 'com.airbnb.okreplay:noop:1.5.0'
     androidTestImplementation 'com.airbnb.okreplay:espresso:1.5.0'

matrix-sdk-android/proguard-rules.pro

@@ -19,3 +19,45 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+
+### EVENT BUS ###
+
+-keepattributes *Annotation*
+-keepclassmembers class * {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+
+### MOSHI ###
+
+# JSR 305 annotations are for embedding nullability information.
+
+-dontwarn javax.annotation.**
+
+-keepclasseswithmembers class * {
+    @com.squareup.moshi.* <methods>;
+}
+
+-keep @com.squareup.moshi.JsonQualifier interface *
+
+# Enum field names are used by the integrated EnumJsonAdapter.
+# values() is synthesized by the Kotlin compiler and is used by EnumJsonAdapter indirectly
+# Annotate enums with @JsonClass(generateAdapter = false) to use them with Moshi.
+-keepclassmembers @com.squareup.moshi.JsonClass class * extends java.lang.Enum {
+    <fields>;
+    **[] values();
+}
+
+-keep class kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoaderImpl
+
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
+
+### OKHTTP for Android Studio ###
+-keep class okhttp3.Headers { *; }
+-keep interface okhttp3.Interceptor.* { *; }
+
+### OLM JNI ###
+-keep class org.matrix.olm.** { *; }

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/gossiping/KeyShareTests.kt

@@ -90,7 +90,7 @@ class KeyShareTests : InstrumentedTest {
         } catch (failure: Throwable) {
         }
 
-        val outgoingRequestBefore = aliceSession2.cryptoService().getOutgoingRoomKeyRequest()
+        val outgoingRequestsBefore = aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
         // Try to request
         aliceSession2.cryptoService().requestRoomKeyForEvent(receivedEvent.root)
 
@@ -100,10 +100,10 @@ class KeyShareTests : InstrumentedTest {
         var outGoingRequestId: String? = null
 
         mTestHelper.retryPeriodicallyWithLatch(waitLatch) {
-            aliceSession2.cryptoService().getOutgoingRoomKeyRequest()
+            aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
                     .filter { req ->
                         // filter out request that was known before
-                        !outgoingRequestBefore.any { req.requestId == it.requestId }
+                        !outgoingRequestsBefore.any { req.requestId == it.requestId }
                     }
                     .let {
                         val outgoing = it.firstOrNull { it.sessionId == eventMegolmSessionId }
@@ -115,10 +115,10 @@ class KeyShareTests : InstrumentedTest {
 
         Log.v("TEST", "=======> Outgoing requet Id is $outGoingRequestId")
 
-        val outgoingRequestAfter = aliceSession2.cryptoService().getOutgoingRoomKeyRequest()
+        val outgoingRequestAfter = aliceSession2.cryptoService().getOutgoingRoomKeyRequests()
 
         // We should have a new request
-        Assert.assertTrue(outgoingRequestAfter.size > outgoingRequestBefore.size)
+        Assert.assertTrue(outgoingRequestAfter.size > outgoingRequestsBefore.size)
         Assert.assertNotNull(outgoingRequestAfter.first { it.sessionId == eventMegolmSessionId })
 
         // The first session should see an incoming request
@@ -126,7 +126,7 @@ class KeyShareTests : InstrumentedTest {
         mTestHelper.waitWithLatch { latch ->
             mTestHelper.retryPeriodicallyWithLatch(latch) {
                 // DEBUG LOGS
-                aliceSession.cryptoService().getIncomingRoomKeyRequest().let {
+                aliceSession.cryptoService().getIncomingRoomKeyRequests().let {
                     Log.v("TEST", "Incoming request Session 1 (looking for $outGoingRequestId)")
                     Log.v("TEST", "=========================")
                     it.forEach { keyRequest ->
@@ -135,7 +135,7 @@ class KeyShareTests : InstrumentedTest {
                     Log.v("TEST", "=========================")
                 }
 
-                val incoming = aliceSession.cryptoService().getIncomingRoomKeyRequest().firstOrNull { it.requestId == outGoingRequestId }
+                val incoming = aliceSession.cryptoService().getIncomingRoomKeyRequests().firstOrNull { it.requestId == outGoingRequestId }
                 incoming?.state == GossipingRequestState.REJECTED
             }
         }
@@ -155,7 +155,7 @@ class KeyShareTests : InstrumentedTest {
 
         mTestHelper.waitWithLatch { latch ->
             mTestHelper.retryPeriodicallyWithLatch(latch) {
-                aliceSession.cryptoService().getIncomingRoomKeyRequest().let {
+                aliceSession.cryptoService().getIncomingRoomKeyRequests().let {
                     Log.v("TEST", "Incoming request Session 1")
                     Log.v("TEST", "=========================")
                     it.forEach {
@@ -171,7 +171,7 @@ class KeyShareTests : InstrumentedTest {
         Thread.sleep(6_000)
         mTestHelper.waitWithLatch { latch ->
             mTestHelper.retryPeriodicallyWithLatch(latch) {
-                aliceSession2.cryptoService().getOutgoingRoomKeyRequest().let {
+                aliceSession2.cryptoService().getOutgoingRoomKeyRequests().let {
                     it.any { it.requestBody?.sessionId == eventMegolmSessionId && it.state == OutgoingGossipingRequestState.CANCELLED }
                 }
             }
@@ -252,7 +252,7 @@ class KeyShareTests : InstrumentedTest {
             }
         })
 
-        val txId: String = "m.testVerif12"
+        val txId = "m.testVerif12"
         aliceVerificationService2.beginKeyVerification(VerificationMethod.SAS, aliceSession1.myUserId, aliceSession1.sessionParams.deviceId
                 ?: "", txId)
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/auth/data/HomeServerConnectionConfig.kt

@@ -69,7 +69,7 @@ data class HomeServerConnectionConfig(
          */
         fun withHomeServerUri(hsUri: Uri): Builder {
             if (hsUri.scheme != "http" && hsUri.scheme != "https") {
-                throw RuntimeException("Invalid home server URI: " + hsUri)
+                throw RuntimeException("Invalid home server URI: $hsUri")
             }
             // ensure trailing /
             val hsString = hsUri.toString().ensureTrailingSlash()

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/extensions/Try.kt

@@ -16,10 +16,15 @@
 
 package im.vector.matrix.android.api.extensions
 
-inline fun <A> tryThis(operation: () -> A): A? {
+import timber.log.Timber
+
+inline fun <A> tryThis(message: String? = null, operation: () -> A): A? {
     return try {
         operation()
     } catch (any: Throwable) {
+        if (message != null) {
+            Timber.e(any, message)
+        }
         null
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/PushRuleService.kt

@@ -29,13 +29,25 @@ interface PushRuleService {
 
     fun getPushRules(scope: String = RuleScope.GLOBAL): RuleSet
 
-    fun updatePushRuleEnableStatus(kind: RuleKind, pushRule: PushRule, enabled: Boolean, callback: MatrixCallback<Unit>): Cancelable
+    fun updatePushRuleEnableStatus(kind: RuleKind,
+                                   pushRule: PushRule,
+                                   enabled: Boolean,
+                                   callback: MatrixCallback<Unit>): Cancelable
 
-    fun addPushRule(kind: RuleKind, pushRule: PushRule, callback: MatrixCallback<Unit>): Cancelable
+    fun addPushRule(kind: RuleKind,
+                    pushRule: PushRule,
+                    beforeRuleId: String?,
+                    afterRuleId: String?,
+                    callback: MatrixCallback<Unit>): Cancelable
 
-    fun updatePushRuleActions(kind: RuleKind, oldPushRule: PushRule, newPushRule: PushRule, callback: MatrixCallback<Unit>): Cancelable
+    fun updatePushRuleActions(kind: RuleKind,
+                              oldPushRule: PushRule,
+                              newPushRule: PushRule,
+                              callback: MatrixCallback<Unit>): Cancelable
 
-    fun removePushRule(kind: RuleKind, pushRule: PushRule, callback: MatrixCallback<Unit>): Cancelable
+    fun removePushRule(kind: RuleKind,
+                       pushRule: PushRule,
+                       callback: MatrixCallback<Unit>): Cancelable
 
     fun addPushRuleListener(listener: PushRuleListener)
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/rest/GetPushRulesResponse.kt

@@ -31,7 +31,7 @@ internal data class GetPushRulesResponse(
         val global: RuleSet,
 
         /**
-         * Device specific rules, apply only to current device
+         * Device specific rules, apply only to current device. Not used anymore
          */
         @Json(name = "device")
         val device: RuleSet? = null

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/Session.kt

@@ -24,6 +24,7 @@ import im.vector.matrix.android.api.pushrules.PushRuleService
 import im.vector.matrix.android.api.session.account.AccountService
 import im.vector.matrix.android.api.session.accountdata.AccountDataService
 import im.vector.matrix.android.api.session.cache.CacheService
+import im.vector.matrix.android.api.session.call.CallSignalingService
 import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
 import im.vector.matrix.android.api.session.content.ContentUrlResolver
 import im.vector.matrix.android.api.session.crypto.CryptoService
@@ -165,6 +166,11 @@ interface Session :
      */
     fun integrationManagerService(): IntegrationManagerService
 
+    /**
+     * Returns the call signaling service associated with the session
+     */
+    fun callSignalingService(): CallSignalingService
+
     /**
      * Add a listener to the session.
      * @param listener the listener to add.

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallSignalingService.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.call
+
+import im.vector.matrix.android.api.MatrixCallback
+import im.vector.matrix.android.api.util.Cancelable
+
+interface CallSignalingService {
+
+    fun getTurnServer(callback: MatrixCallback<TurnServerResponse>): Cancelable
+
+    /**
+     * Create an outgoing call
+     */
+    fun createOutgoingCall(roomId: String, otherUserId: String, isVideoCall: Boolean): MxCall
+
+    fun addCallListener(listener: CallsListener)
+
+    fun removeCallListener(listener: CallsListener)
+
+    fun getCallWithId(callId: String) : MxCall?
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallState.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.call
+
+import org.webrtc.PeerConnection
+
+sealed class CallState {
+
+    /** Idle, setting up objects */
+    object Idle : CallState()
+
+    /** Dialing.  Outgoing call is signaling the remote peer */
+    object Dialing : CallState()
+
+    /** Local ringing. Incoming call offer received */
+    object LocalRinging : CallState()
+
+    /** Answering.  Incoming call is responding to remote peer */
+    object Answering : CallState()
+
+    /**
+     * Connected. Incoming/Outgoing call, ice layer connecting or connected
+     * Notice that the PeerState failed is not always final, if you switch network, new ice candidtates
+     * could be exchanged, and the connection could go back to connected
+     * */
+    data class Connected(val iceConnectionState: PeerConnection.PeerConnectionState) : CallState()
+
+    /** Terminated.  Incoming/Outgoing call, the call is terminated */
+    object Terminated : CallState()
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/CallsListener.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.call
+
+import im.vector.matrix.android.api.session.room.model.call.CallAnswerContent
+import im.vector.matrix.android.api.session.room.model.call.CallCandidatesContent
+import im.vector.matrix.android.api.session.room.model.call.CallHangupContent
+import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
+
+interface CallsListener {
+    /**
+     * Called when there is an incoming call within the room.
+     */
+    fun onCallInviteReceived(mxCall: MxCall, callInviteContent: CallInviteContent)
+
+    fun onCallIceCandidateReceived(mxCall: MxCall, iceCandidatesContent: CallCandidatesContent)
+
+    /**
+     * An outgoing call is started.
+     */
+    fun onCallAnswerReceived(callAnswerContent: CallAnswerContent)
+
+    /**
+     * Called when a called has been hung up
+     */
+    fun onCallHangupReceived(callHangupContent: CallHangupContent)
+
+    fun onCallManagedByOtherSession(callId: String)
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/EglUtils.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.matrix.android.api.session.call
+
+import org.webrtc.EglBase
+import timber.log.Timber
+
+/**
+ * The root [EglBase] instance shared by the entire application for
+ * the sake of reducing the utilization of system resources (such as EGL
+ * contexts)
+ * by performing a runtime check.
+ */
+object EglUtils {
+
+    // TODO how do we release that?
+
+    /**
+     * Lazily creates and returns the one and only [EglBase] which will
+     * serve as the root for all contexts that are needed.
+     */
+    @get:Synchronized var rootEglBase: EglBase? = null
+        get() {
+            if (field == null) {
+                val configAttributes = EglBase.CONFIG_PLAIN
+                try {
+                    field = EglBase.createEgl14(configAttributes)
+                            ?: EglBase.createEgl10(configAttributes) // Fall back to EglBase10.
+                } catch (ex: Throwable) {
+                    Timber.e(ex, "Failed to create EglBase")
+                }
+            }
+            return field
+        }
+        private set
+
+    val rootEglBaseContext: EglBase.Context?
+        get() {
+            val eglBase = rootEglBase
+            return eglBase?.eglBaseContext
+        }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/MxCall.kt

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.call
+
+import org.webrtc.IceCandidate
+import org.webrtc.SessionDescription
+
+interface MxCallDetail {
+    val callId: String
+    val isOutgoing: Boolean
+    val roomId: String
+    val otherUserId: String
+    val isVideoCall: Boolean
+}
+
+/**
+ * Define both an incoming call and on outgoing call
+ */
+interface MxCall : MxCallDetail {
+
+    var state: CallState
+    /**
+     * Pick Up the incoming call
+     * It has no effect on outgoing call
+     */
+    fun accept(sdp: SessionDescription)
+
+    /**
+     * Reject an incoming call
+     * It's an alias to hangUp
+     */
+    fun reject() = hangUp()
+
+    /**
+     * End the call
+     */
+    fun hangUp()
+
+    /**
+     * Start a call
+     * Send offer SDP to the other participant.
+     */
+    fun offerSdp(sdp: SessionDescription)
+
+    /**
+     * Send Ice candidate to the other participant.
+     */
+    fun sendLocalIceCandidates(candidates: List<IceCandidate>)
+
+    /**
+     * Send removed ICE candidates to the other participant.
+     */
+    fun sendLocalIceCandidateRemovals(candidates: List<IceCandidate>)
+
+    fun addListener(listener: StateListener)
+    fun removeListener(listener: StateListener)
+
+    interface StateListener {
+        fun onStateUpdate(call: MxCall)
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/call/TurnServerResponse.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.call
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+// TODO Should not be exposed
+/**
+ * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#get-matrix-client-r0-voip-turnserver
+ */
+@JsonClass(generateAdapter = true)
+data class TurnServerResponse(
+        /**
+         * Required. The username to use.
+         */
+        @Json(name = "username") val username: String?,
+
+        /**
+         * Required. The password to use.
+         */
+        @Json(name = "password") val password: String?,
+
+        /**
+         * Required. A list of TURN URIs
+         */
+        @Json(name = "uris") val uris: List<String>?,
+
+        /**
+         * Required. The time-to-live in seconds
+         */
+        @Json(name = "ttl") val ttl: Int?
+)

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt

@@ -138,7 +138,9 @@ interface CryptoService {
 
     fun removeSessionListener(listener: NewSessionListener)
 
-    fun getOutgoingRoomKeyRequest(): List<OutgoingRoomKeyRequest>
-    fun getIncomingRoomKeyRequest(): List<IncomingRoomKeyRequest>
+    fun getOutgoingRoomKeyRequests(): List<OutgoingRoomKeyRequest>
+
+    fun getIncomingRoomKeyRequests(): List<IncomingRoomKeyRequest>
+
     fun getGossipingEventsTrail(): List<Event>
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/EventType.kt

@@ -58,7 +58,6 @@ object EventType {
     const val STATE_ROOM_ENCRYPTION = "m.room.encryption"
 
     // Call Events
-
     const val CALL_INVITE = "m.call.invite"
     const val CALL_CANDIDATES = "m.call.candidates"
     const val CALL_ANSWER = "m.call.answer"

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/profile/ProfileService.kt

@@ -35,12 +35,19 @@ interface ProfileService {
     }
 
     /**
-     * Return the current dispayname for this user
+     * Return the current display name for this user
      * @param userId the userId param to look for
      *
      */
     fun getDisplayName(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable
 
+    /**
+     * Update the display name for this user
+     * @param userId the userId to update the display name of
+     * @param newDisplayName the new display name of the user
+     */
+    fun setDisplayName(userId: String, newDisplayName: String, matrixCallback: MatrixCallback<Unit>): Cancelable
+
     /**
      * Return the current avatarUrl for this user.
      * @param userId the userId param to look for

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt

@@ -17,6 +17,7 @@
 package im.vector.matrix.android.api.session.room
 
 import androidx.lifecycle.LiveData
+import im.vector.matrix.android.api.session.room.call.RoomCallService
 import im.vector.matrix.android.api.session.room.crypto.RoomCryptoService
 import im.vector.matrix.android.api.session.room.members.MembershipService
 import im.vector.matrix.android.api.session.room.model.RoomSummary
@@ -47,6 +48,7 @@ interface Room :
         StateService,
         UploadsService,
         ReportingService,
+        RoomCallService,
         RelationService,
         RoomCryptoService,
         RoomPushRuleService {

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/call/RoomCallService.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.room.call
+
+/**
+ * This interface defines methods to handle calls in a room. It's implemented at the room level.
+ */
+interface RoomCallService {
+    /**
+     * Return true if calls (audio or video) can be performed on this Room
+     */
+    fun canStartCall(): Boolean
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/Membership.kt

@@ -17,10 +17,12 @@
 package im.vector.matrix.android.api.session.room.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
 /**
  * Represents the membership of a user on a room
  */
+@JsonClass(generateAdapter = false)
 enum class Membership(val value: String) {
 
     NONE("none"),

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomDirectoryVisibility.kt

@@ -17,7 +17,9 @@
 package im.vector.matrix.android.api.session.room.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = false)
 enum class RoomDirectoryVisibility {
     @Json(name = "private") PRIVATE,
     @Json(name = "public") PUBLIC

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomGuestAccessContent.kt

@@ -29,6 +29,7 @@ data class RoomGuestAccessContent(
         @Json(name = "guest_access") val guestAccess: GuestAccess? = null
 )
 
+@JsonClass(generateAdapter = false)
 enum class GuestAccess(val value: String) {
     @Json(name = "can_join")
     CanJoin("can_join"),

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomHistoryVisibility.kt

@@ -17,10 +17,12 @@
 package im.vector.matrix.android.api.session.room.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
 /**
  * Ref: https://matrix.org/docs/spec/client_server/latest#room-history-visibility
  */
+@JsonClass(generateAdapter = false)
 enum class RoomHistoryVisibility {
     /**
      * All events while this is the m.room.history_visibility value may be shared by any

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomJoinRules.kt

@@ -18,10 +18,12 @@
 package im.vector.matrix.android.api.session.room.model
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
 /**
  * Enum for [RoomJoinRulesContent] : https://matrix.org/docs/spec/client_server/r0.4.0#m-room-join-rules
  */
+@JsonClass(generateAdapter = false)
 enum class RoomJoinRules(val value: String) {
 
     @Json(name = "public")

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt

@@ -62,6 +62,9 @@ data class RoomSummary constructor(
     val isFavorite: Boolean
         get() = tags.any { it.name == RoomTag.ROOM_TAG_FAVOURITE }
 
+    val canStartCall: Boolean
+        get() = isDirect && joinedMembersCount == 2
+
     companion object {
         const val NOT_IN_BREADCRUMBS = -1
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallAnswerContent.kt

@@ -19,16 +19,34 @@ package im.vector.matrix.android.api.session.room.model.call
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
+/**
+ * This event is sent by the callee when they wish to answer the call.
+ */
 @JsonClass(generateAdapter = true)
 data class CallAnswerContent(
+        /**
+         * Required. The ID of the call this event relates to.
+         */
         @Json(name = "call_id") val callId: String,
-        @Json(name = "version") val version: Int,
-        @Json(name = "answer") val answer: Answer
+        /**
+         * Required. The session description object
+         */
+        @Json(name = "answer") val answer: Answer,
+        /**
+         * Required. The version of the VoIP specification this messages adheres to. This specification is version 0.
+         */
+        @Json(name = "version") val version: Int = 0
 ) {
 
     @JsonClass(generateAdapter = true)
     data class Answer(
-            @Json(name = "type") val type: String,
+            /**
+             * Required. The type of session description. Must be 'answer'.
+             */
+            @Json(name = "type") val type: SdpType = SdpType.ANSWER,
+            /**
+             * Required. The SDP text of the session description.
+             */
             @Json(name = "sdp") val sdp: String
     )
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallCandidatesContent.kt

@@ -19,17 +19,39 @@ package im.vector.matrix.android.api.session.room.model.call
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
+/**
+ * This event is sent by callers after sending an invite and by the callee after answering.
+ * Its purpose is to give the other party additional ICE candidates to try using to communicate.
+ */
 @JsonClass(generateAdapter = true)
 data class CallCandidatesContent(
+        /**
+         * Required. The ID of the call this event relates to.
+         */
         @Json(name = "call_id") val callId: String,
-        @Json(name = "version") val version: Int,
-        @Json(name = "candidates") val candidates: List<Candidate> = emptyList()
+        /**
+         * Required. Array of objects describing the candidates.
+         */
+        @Json(name = "candidates") val candidates: List<Candidate> = emptyList(),
+        /**
+         * Required. The version of the VoIP specification this messages adheres to. This specification is version 0.
+         */
+        @Json(name = "version") val version: Int = 0
 ) {
 
     @JsonClass(generateAdapter = true)
     data class Candidate(
+            /**
+             * Required. The SDP media type this candidate is intended for.
+             */
             @Json(name = "sdpMid") val sdpMid: String,
-            @Json(name = "sdpMLineIndex") val sdpMLineIndex: String,
+            /**
+             * Required. The index of the SDP 'm' line this candidate is intended for.
+             */
+            @Json(name = "sdpMLineIndex") val sdpMLineIndex: Int,
+            /**
+             * Required. The SDP 'a' line of the candidate.
+             */
             @Json(name = "candidate") val candidate: String
     )
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallHangupContent.kt

@@ -19,8 +19,32 @@ package im.vector.matrix.android.api.session.room.model.call
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
+/**
+ * Sent by either party to signal their termination of the call. This can be sent either once
+ * the call has been established or before to abort the call.
+ */
 @JsonClass(generateAdapter = true)
 data class CallHangupContent(
+        /**
+         * Required. The ID of the call this event relates to.
+         */
         @Json(name = "call_id") val callId: String,
-        @Json(name = "version") val version: Int
-)
+        /**
+         * Required. The version of the VoIP specification this message adheres to. This specification is version 0.
+         */
+        @Json(name = "version") val version: Int = 0,
+        /**
+         * Optional error reason for the hangup. This should not be provided when the user naturally ends or rejects the call.
+         * When there was an error in the call negotiation, this should be `ice_failed` for when ICE negotiation fails
+         * or `invite_timeout` for when the other party did not answer in time. One of: ["ice_failed", "invite_timeout"]
+         */
+        @Json(name = "reason") val reason: Reason? = null
+) {
+    enum class Reason {
+        @Json(name = "ice_failed")
+        ICE_FAILED,
+
+        @Json(name = "invite_timeout")
+        INVITE_TIMEOUT
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/CallInviteContent.kt

@@ -19,23 +19,45 @@ package im.vector.matrix.android.api.session.room.model.call
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
+/**
+ * This event is sent by the caller when they wish to establish a call.
+ */
 @JsonClass(generateAdapter = true)
 data class CallInviteContent(
-        @Json(name = "call_id") val callId: String,
-        @Json(name = "version") val version: Int,
-        @Json(name = "lifetime") val lifetime: Int,
-        @Json(name = "offer") val offer: Offer
+        /**
+         * Required. A unique identifier for the call.
+         */
+        @Json(name = "call_id") val callId: String?,
+        /**
+         * Required. The session description object
+         */
+        @Json(name = "offer") val offer: Offer?,
+        /**
+         * Required. The version of the VoIP specification this message adheres to. This specification is version 0.
+         */
+        @Json(name = "version") val version: Int? = 0,
+        /**
+         * Required. The time in milliseconds that the invite is valid for.
+         * Once the invite age exceeds this value, clients should discard it.
+         * They should also no longer show the call as awaiting an answer in the UI.
+         */
+        @Json(name = "lifetime") val lifetime: Int?
 ) {
-
     @JsonClass(generateAdapter = true)
     data class Offer(
-            @Json(name = "type") val type: String,
-            @Json(name = "sdp") val sdp: String
+            /**
+             * Required. The type of session description. Must be 'offer'.
+             */
+            @Json(name = "type") val type: SdpType? = SdpType.OFFER,
+            /**
+             * Required. The SDP text of the session description.
+             */
+            @Json(name = "sdp") val sdp: String?
     ) {
         companion object {
             const val SDP_VIDEO = "m=video"
         }
     }
 
-    fun isVideo(): Boolean = offer.sdp.contains(Offer.SDP_VIDEO)
+    fun isVideo(): Boolean = offer?.sdp?.contains(Offer.SDP_VIDEO) == true
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/call/SdpType.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.api.session.room.model.call
+
+import com.squareup.moshi.Json
+
+enum class SdpType {
+    @Json(name = "offer")
+    OFFER,
+
+    @Json(name = "answer")
+    ANSWER
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomPreset.kt

@@ -17,7 +17,9 @@
 package im.vector.matrix.android.api.session.room.model.create
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
+@JsonClass(generateAdapter = false)
 enum class CreateRoomPreset {
     @Json(name = "private_chat")
     PRESET_PRIVATE_CHAT,

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomNotificationState.kt

@@ -20,23 +20,20 @@ package im.vector.matrix.android.api.session.room.notification
  * Defines the room notification state
  */
 enum class RoomNotificationState {
-    /**
-     * All the messages will trigger a noisy notification
-     */
-    ALL_MESSAGES_NOISY,
-
     /**
      * All the messages will trigger a notification
+     * This is the default for DMs
      */
     ALL_MESSAGES,
 
     /**
-     * Only the messages with user display name / user name will trigger notifications
+     * Only the messages with user display name / user name, or keywords will trigger notifications
+     * This is the default for Rooms
      */
-    MENTIONS_ONLY,
+    MENTIONS_AND_KEYWORDS,
 
     /**
      * No notifications
      */
-    MUTE
+    NONE
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetContent.kt

@@ -21,6 +21,9 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import im.vector.matrix.android.api.util.JsonDict
 
+/**
+ * Ref: https://github.com/matrix-org/matrix-doc/issues/1236
+ */
 @JsonClass(generateAdapter = true)
 data class WidgetContent(
         @Json(name = "creatorUserId") val creatorUserId: String? = null,

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetType.kt

@@ -16,6 +16,9 @@
 
 package im.vector.matrix.android.api.session.widgets.model
 
+/**
+ * Ref: https://github.com/matrix-org/matrix-doc/issues/1236
+ */
 sealed class WidgetType(open val preferred: String, open val legacy: String = preferred) {
     object Jitsi : WidgetType("m.jitsi", "jitsi")
     object TradingView : WidgetType("m.tradingview")

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoModule.kt

@@ -67,6 +67,7 @@ import im.vector.matrix.android.internal.crypto.tasks.DefaultEncryptEventTask
 import im.vector.matrix.android.internal.crypto.tasks.DefaultGetDeviceInfoTask
 import im.vector.matrix.android.internal.crypto.tasks.DefaultGetDevicesTask
 import im.vector.matrix.android.internal.crypto.tasks.DefaultInitializeCrossSigningTask
+import im.vector.matrix.android.internal.crypto.tasks.DefaultSendEventTask
 import im.vector.matrix.android.internal.crypto.tasks.DefaultSendToDeviceTask
 import im.vector.matrix.android.internal.crypto.tasks.DefaultSendVerificationMessageTask
 import im.vector.matrix.android.internal.crypto.tasks.DefaultSetDeviceNameTask
@@ -80,6 +81,7 @@ import im.vector.matrix.android.internal.crypto.tasks.EncryptEventTask
 import im.vector.matrix.android.internal.crypto.tasks.GetDeviceInfoTask
 import im.vector.matrix.android.internal.crypto.tasks.GetDevicesTask
 import im.vector.matrix.android.internal.crypto.tasks.InitializeCrossSigningTask
+import im.vector.matrix.android.internal.crypto.tasks.SendEventTask
 import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
 import im.vector.matrix.android.internal.crypto.tasks.SendVerificationMessageTask
 import im.vector.matrix.android.internal.crypto.tasks.SetDeviceNameTask
@@ -251,4 +253,7 @@ internal abstract class CryptoModule {
 
     @Binds
     abstract fun bindInitializeCrossSigningTask(task: DefaultInitializeCrossSigningTask): InitializeCrossSigningTask
+
+    @Binds
+    abstract fun bindSendEventTask(task: DefaultSendEventTask): SendEventTask
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DefaultCryptoService.kt

@@ -1262,11 +1262,11 @@ internal class DefaultCryptoService @Inject constructor(
         return "DefaultCryptoService of $userId ($deviceId)"
     }
 
-    override fun getOutgoingRoomKeyRequest(): List<OutgoingRoomKeyRequest> {
+    override fun getOutgoingRoomKeyRequests(): List<OutgoingRoomKeyRequest> {
         return cryptoStore.getOutgoingRoomKeyRequests()
     }
 
-    override fun getIncomingRoomKeyRequest(): List<IncomingRoomKeyRequest> {
+    override fun getIncomingRoomKeyRequests(): List<IncomingRoomKeyRequest> {
         return cryptoStore.getIncomingRoomKeyRequests()
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStore.kt

@@ -897,9 +897,9 @@ internal class RealmCryptoStore @Inject constructor(
             it.toOutgoingGossipingRequest() as? OutgoingRoomKeyRequest
         }.firstOrNull {
             it.requestBody?.algorithm == requestBody.algorithm
-            it.requestBody?.roomId == requestBody.roomId
-            it.requestBody?.senderKey == requestBody.senderKey
-            it.requestBody?.sessionId == requestBody.sessionId
+                    && it.requestBody?.roomId == requestBody.roomId
+                    && it.requestBody?.senderKey == requestBody.senderKey
+                    && it.requestBody?.sessionId == requestBody.sessionId
         }
     }
 
@@ -1266,7 +1266,7 @@ internal class RealmCryptoStore @Inject constructor(
                                 deviceInfoEntity.trustLevelEntity = it
                             }
                         } else {
-                            locallyVerified?.let { trustEntity.locallyVerified = it  }
+                            locallyVerified?.let { trustEntity.locallyVerified = it }
                             trustEntity.crossSignedVerified = crossSignedVerified
                         }
                     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendEventTask.kt

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.matrix.android.internal.crypto.tasks
+
+import im.vector.matrix.android.api.session.crypto.CryptoService
+import im.vector.matrix.android.api.session.events.model.Event
+import im.vector.matrix.android.api.session.room.send.SendState
+import im.vector.matrix.android.internal.network.executeRequest
+import im.vector.matrix.android.internal.session.room.RoomAPI
+import im.vector.matrix.android.internal.session.room.send.LocalEchoUpdater
+import im.vector.matrix.android.internal.session.room.send.SendResponse
+import im.vector.matrix.android.internal.task.Task
+import org.greenrobot.eventbus.EventBus
+import javax.inject.Inject
+
+internal interface SendEventTask : Task<SendEventTask.Params, String> {
+    data class Params(
+            val event: Event,
+            val cryptoService: CryptoService?
+    )
+}
+
+internal class DefaultSendEventTask @Inject constructor(
+        private val localEchoUpdater: LocalEchoUpdater,
+        private val encryptEventTask: DefaultEncryptEventTask,
+        private val roomAPI: RoomAPI,
+        private val eventBus: EventBus) : SendEventTask {
+
+    override suspend fun execute(params: SendEventTask.Params): String {
+        val event = handleEncryption(params)
+        val localId = event.eventId!!
+
+        try {
+            localEchoUpdater.updateSendState(localId, SendState.SENDING)
+            val executeRequest = executeRequest<SendResponse>(eventBus) {
+                apiCall = roomAPI.send(
+                        localId,
+                        roomId = event.roomId ?: "",
+                        content = event.content,
+                        eventType = event.type
+                )
+            }
+            localEchoUpdater.updateSendState(localId, SendState.SENT)
+            return executeRequest.eventId
+        } catch (e: Throwable) {
+            localEchoUpdater.updateSendState(localId, SendState.UNDELIVERED)
+            throw e
+        }
+    }
+
+    private suspend fun handleEncryption(params: SendEventTask.Params): Event {
+        if (params.cryptoService?.isRoomEncrypted(params.event.roomId ?: "") == true) {
+            try {
+                return encryptEventTask.execute(EncryptEventTask.Params(
+                        params.event.roomId ?: "",
+                        params.event,
+                        listOf("m.relates_to"),
+                        params.cryptoService
+                ))
+            } catch (throwable: Throwable) {
+                // We said it's ok to send verification request in clear
+            }
+        }
+        return params.event
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tools/HkdfSha256.kt

@@ -28,7 +28,7 @@ import kotlin.math.ceil
  */
 object HkdfSha256 {
 
-    public fun deriveSecret(inputKeyMaterial: ByteArray, salt: ByteArray?, info: ByteArray, outputLength: Int): ByteArray {
+    fun deriveSecret(inputKeyMaterial: ByteArray, salt: ByteArray?, info: ByteArray, outputLength: Int): ByteArray {
         return expand(extract(salt, inputKeyMaterial), info, outputLength)
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SendVerificationMessageWorker.kt

@@ -85,7 +85,7 @@ internal class SendVerificationMessageWorker(context: Context,
         private const val OUTPUT_KEY_FAILED = "failed"
 
         fun hasFailed(outputData: Data): Boolean {
-            return outputData.getBoolean(SendVerificationMessageWorker.OUTPUT_KEY_FAILED, false)
+            return outputData.getBoolean(OUTPUT_KEY_FAILED, false)
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 New Vector Ltd
+ * Copyright 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,13 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import org.greenrobot.eventbus.EventBus
 import retrofit2.Call
+import retrofit2.awaitResponse
 import java.io.IOException
 
-internal suspend inline fun <DATA> executeRequest(eventBus: EventBus?,
+internal suspend inline fun <DATA : Any> executeRequest(eventBus: EventBus?,
                                                   block: Request<DATA>.() -> Unit) = Request<DATA>(eventBus).apply(block).execute()
 
-internal class Request<DATA>(private val eventBus: EventBus?) {
+internal class Request<DATA : Any>(private val eventBus: EventBus?) {
 
     var isRetryable = false
     var initialDelay: Long = 100L

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt

@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright 2019 New Vector Ltd
+ *  * Copyright 2020 New Vector Ltd
  *  *
  *  * Licensed under the Apache License, Version 2.0 (the "License");
  *  * you may not use this file except in compliance with the License.
@@ -26,8 +26,6 @@ import im.vector.matrix.android.internal.di.MoshiProvider
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
-import retrofit2.Call
-import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
 import java.io.IOException
@@ -35,23 +33,6 @@ import java.net.HttpURLConnection
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
-internal suspend fun <T> Call<T>.awaitResponse(): Response<T> {
-    return suspendCancellableCoroutine { continuation ->
-        continuation.invokeOnCancellation {
-            cancel()
-        }
-        enqueue(object : Callback<T> {
-            override fun onResponse(call: Call<T>, response: Response<T>) {
-                continuation.resume(response)
-            }
-
-            override fun onFailure(call: Call<T>, t: Throwable) {
-                continuation.resumeWithException(t)
-            }
-        })
-    }
-}
-
 internal suspend fun okhttp3.Call.awaitResponse(): okhttp3.Response {
     return suspendCancellableCoroutine { continuation ->
         continuation.invokeOnCancellation {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/Fingerprint.kt

@@ -33,7 +33,7 @@ data class Fingerprint(
 
     @Throws(CertificateException::class)
     fun matchesCert(cert: X509Certificate): Boolean {
-        var o: Fingerprint? = when (hashType) {
+        val o: Fingerprint? = when (hashType) {
             HashType.SHA256 -> newSha256Fingerprint(cert)
             HashType.SHA1   -> newSha1Fingerprint(cert)
         }
@@ -76,6 +76,7 @@ data class Fingerprint(
         }
     }
 
+    @JsonClass(generateAdapter = false)
     enum class HashType {
         @Json(name = "sha-1") SHA1,
         @Json(name = "sha-256")SHA256

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt

@@ -28,6 +28,7 @@ import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.account.AccountService
 import im.vector.matrix.android.api.session.accountdata.AccountDataService
 import im.vector.matrix.android.api.session.cache.CacheService
+import im.vector.matrix.android.api.session.call.CallSignalingService
 import im.vector.matrix.android.api.session.content.ContentUploadStateTracker
 import im.vector.matrix.android.api.session.content.ContentUrlResolver
 import im.vector.matrix.android.api.session.crypto.CryptoService
@@ -110,7 +111,8 @@ internal class DefaultSession @Inject constructor(
         private val integrationManagerService: IntegrationManagerService,
         private val taskExecutor: TaskExecutor,
         private val widgetDependenciesHolder: WidgetDependenciesHolder,
-        private val shieldTrustUpdater: ShieldTrustUpdater)
+        private val shieldTrustUpdater: ShieldTrustUpdater,
+        private val callSignalingService: Lazy<CallSignalingService>)
     : Session,
         RoomService by roomService.get(),
         RoomDirectoryService by roomDirectoryService.get(),
@@ -245,6 +247,8 @@ internal class DefaultSession @Inject constructor(
 
     override fun integrationManagerService() = integrationManagerService
 
+    override fun callSignalingService(): CallSignalingService = callSignalingService.get()
+
     override fun addListener(listener: Session.Listener) {
         sessionListeners.addListener(listener)
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionComponent.kt

@@ -30,6 +30,7 @@ import im.vector.matrix.android.internal.di.SessionAssistedInjectModule
 import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
 import im.vector.matrix.android.internal.session.account.AccountModule
 import im.vector.matrix.android.internal.session.cache.CacheModule
+import im.vector.matrix.android.internal.session.call.CallModule
 import im.vector.matrix.android.internal.session.content.ContentModule
 import im.vector.matrix.android.internal.session.content.UploadContentWorker
 import im.vector.matrix.android.internal.session.filter.FilterModule
@@ -83,7 +84,8 @@ import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
             AccountDataModule::class,
             ProfileModule::class,
             SessionAssistedInjectModule::class,
-            AccountModule::class
+            AccountModule::class,
+            CallModule::class
         ]
 )
 @SessionScope

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt

@@ -59,6 +59,7 @@ import im.vector.matrix.android.internal.network.RetrofitFactory
 import im.vector.matrix.android.internal.network.httpclient.addAccessTokenInterceptor
 import im.vector.matrix.android.internal.network.token.AccessTokenProvider
 import im.vector.matrix.android.internal.network.token.HomeserverAccessTokenProvider
+import im.vector.matrix.android.internal.session.call.CallEventObserver
 import im.vector.matrix.android.internal.session.group.GroupSummaryUpdater
 import im.vector.matrix.android.internal.session.homeserver.DefaultHomeServerCapabilitiesService
 import im.vector.matrix.android.internal.session.room.EventRelationsAggregationUpdater
@@ -243,6 +244,10 @@ internal abstract class SessionModule {
     @IntoSet
     abstract fun bindEventRelationsAggregationUpdater(updater: EventRelationsAggregationUpdater): LiveEntityObserver
 
+    @Binds
+    @IntoSet
+    abstract fun bindCallEventObserver(observer: CallEventObserver): LiveEntityObserver
+
     @Binds
     @IntoSet
     abstract fun bindRoomTombstoneEventLiveObserver(observer: RoomTombstoneEventLiveObserver): LiveEntityObserver

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventObserver.kt

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.call
+
+import com.zhuinden.monarchy.Monarchy
+import im.vector.matrix.android.api.session.events.model.EventType
+import im.vector.matrix.android.internal.database.RealmLiveEntityObserver
+import im.vector.matrix.android.internal.database.mapper.asDomain
+import im.vector.matrix.android.internal.database.model.EventEntity
+import im.vector.matrix.android.internal.database.query.whereTypes
+import im.vector.matrix.android.internal.di.SessionDatabase
+import im.vector.matrix.android.internal.di.UserId
+import io.realm.OrderedCollectionChangeSet
+import io.realm.RealmConfiguration
+import io.realm.RealmResults
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+internal class CallEventObserver @Inject constructor(
+        @SessionDatabase realmConfiguration: RealmConfiguration,
+        @UserId private val userId: String,
+        private val task: CallEventsObserverTask
+) : RealmLiveEntityObserver<EventEntity>(realmConfiguration) {
+
+    override val query = Monarchy.Query<EventEntity> {
+        EventEntity.whereTypes(it, listOf(
+                EventType.CALL_ANSWER,
+                EventType.CALL_CANDIDATES,
+                EventType.CALL_INVITE,
+                EventType.CALL_HANGUP,
+                EventType.ENCRYPTED)
+        )
+    }
+
+    override fun onChange(results: RealmResults<EventEntity>, changeSet: OrderedCollectionChangeSet) {
+        Timber.v("EventRelationsAggregationUpdater called with ${changeSet.insertions.size} insertions")
+
+        val insertedDomains = changeSet.insertions
+                .asSequence()
+                .mapNotNull { results[it]?.asDomain() }
+                .toList()
+
+        val params = CallEventsObserverTask.Params(
+                insertedDomains,
+                userId
+        )
+        observerScope.launch {
+            task.execute(params)
+        }
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallEventsObserverTask.kt

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.call
+
+import com.zhuinden.monarchy.Monarchy
+import im.vector.matrix.android.api.session.crypto.CryptoService
+import im.vector.matrix.android.api.session.crypto.MXCryptoError
+import im.vector.matrix.android.api.session.events.model.Event
+import im.vector.matrix.android.api.session.events.model.EventType
+import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
+import im.vector.matrix.android.internal.task.Task
+import im.vector.matrix.android.internal.util.awaitTransaction
+import io.realm.Realm
+import timber.log.Timber
+import javax.inject.Inject
+
+internal interface CallEventsObserverTask : Task<CallEventsObserverTask.Params, Unit> {
+
+    data class Params(
+            val events: List<Event>,
+            val userId: String
+    )
+}
+
+internal class DefaultCallEventsObserverTask @Inject constructor(
+        private val monarchy: Monarchy,
+        private val cryptoService: CryptoService,
+        private val callService: DefaultCallSignalingService) : CallEventsObserverTask {
+
+    override suspend fun execute(params: CallEventsObserverTask.Params) {
+        val events = params.events
+        val userId = params.userId
+        monarchy.awaitTransaction { realm ->
+            Timber.v(">>> DefaultCallEventsObserverTask[${params.hashCode()}] called with ${events.size} events")
+            update(realm, events, userId)
+            Timber.v("<<< DefaultCallEventsObserverTask[${params.hashCode()}] finished")
+        }
+    }
+
+    private fun update(realm: Realm, events: List<Event>, userId: String) {
+        val now = System.currentTimeMillis()
+        // TODO might check if an invite is not closed (hangup/answsered) in the same event batch?
+        events.forEach { event ->
+            event.roomId ?: return@forEach Unit.also {
+                Timber.w("Event with no room id ${event.eventId}")
+            }
+            val age = now - (event.ageLocalTs ?: now)
+            if (age > 40_000) {
+                // To old to ring?
+                return@forEach
+            }
+            event.ageLocalTs
+            decryptIfNeeded(event)
+            if (EventType.isCallEvent(event.getClearType())) {
+                callService.onCallEvent(event)
+            }
+        }
+        Timber.v("$realm : $userId")
+    }
+
+    private fun decryptIfNeeded(event: Event) {
+        if (event.isEncrypted() && event.mxDecryptionResult == null) {
+            try {
+                val result = cryptoService.decryptEvent(event, event.roomId ?: "")
+                event.mxDecryptionResult = OlmDecryptionResult(
+                        payload = result.clearEvent,
+                        senderKey = result.senderCurve25519Key,
+                        keysClaimed = result.claimedEd25519Key?.let { k -> mapOf("ed25519" to k) },
+                        forwardingCurve25519KeyChain = result.forwardingCurve25519KeyChain
+                )
+            } catch (e: MXCryptoError) {
+                Timber.v("Call service: Failed to decrypt event")
+                // TODO -> we should keep track of this and retry, or aggregation will be broken
+            }
+        }
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/CallModule.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.call
+
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import im.vector.matrix.android.api.session.call.CallSignalingService
+import im.vector.matrix.android.internal.session.SessionScope
+import retrofit2.Retrofit
+
+@Module
+internal abstract class CallModule {
+
+    @Module
+    companion object {
+        @Provides
+        @JvmStatic
+        @SessionScope
+        fun providesVoipApi(retrofit: Retrofit): VoipApi {
+            return retrofit.create(VoipApi::class.java)
+        }
+    }
+
+    @Binds
+    abstract fun bindCallSignalingService(service: DefaultCallSignalingService): CallSignalingService
+
+    @Binds
+    abstract fun bindGetTurnServerTask(task: DefaultGetTurnServerTask): GetTurnServerTask
+
+    @Binds
+    abstract fun bindCallEventsObserverTask(task: DefaultCallEventsObserverTask): CallEventsObserverTask
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/DefaultCallSignalingService.kt

@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.call
+
+import im.vector.matrix.android.api.MatrixCallback
+import im.vector.matrix.android.api.extensions.tryThis
+import im.vector.matrix.android.api.session.call.CallSignalingService
+import im.vector.matrix.android.api.session.call.CallState
+import im.vector.matrix.android.api.session.call.CallsListener
+import im.vector.matrix.android.api.session.call.MxCall
+import im.vector.matrix.android.api.session.call.TurnServerResponse
+import im.vector.matrix.android.api.session.events.model.Event
+import im.vector.matrix.android.api.session.events.model.EventType
+import im.vector.matrix.android.api.session.events.model.toModel
+import im.vector.matrix.android.api.session.room.model.call.CallAnswerContent
+import im.vector.matrix.android.api.session.room.model.call.CallCandidatesContent
+import im.vector.matrix.android.api.session.room.model.call.CallHangupContent
+import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
+import im.vector.matrix.android.api.util.Cancelable
+import im.vector.matrix.android.api.util.NoOpCancellable
+import im.vector.matrix.android.internal.di.UserId
+import im.vector.matrix.android.internal.session.SessionScope
+import im.vector.matrix.android.internal.session.call.model.MxCallImpl
+import im.vector.matrix.android.internal.session.room.send.LocalEchoEventFactory
+import im.vector.matrix.android.internal.session.room.send.RoomEventSender
+import im.vector.matrix.android.internal.task.TaskExecutor
+import im.vector.matrix.android.internal.task.configureWith
+import timber.log.Timber
+import java.util.UUID
+import javax.inject.Inject
+
+@SessionScope
+internal class DefaultCallSignalingService @Inject constructor(
+        @UserId
+        private val userId: String,
+        private val localEchoEventFactory: LocalEchoEventFactory,
+        private val roomEventSender: RoomEventSender,
+        private val taskExecutor: TaskExecutor,
+        private val turnServerTask: GetTurnServerTask
+) : CallSignalingService {
+
+    private val callListeners = mutableSetOf<CallsListener>()
+
+    private val activeCalls = mutableListOf<MxCall>()
+
+    private var cachedTurnServerResponse: TurnServerResponse? = null
+
+    override fun getTurnServer(callback: MatrixCallback<TurnServerResponse>): Cancelable {
+        if (cachedTurnServerResponse != null) {
+            cachedTurnServerResponse?.let { callback.onSuccess(it) }
+            return NoOpCancellable
+        }
+        return turnServerTask
+                .configureWith(GetTurnServerTask.Params) {
+                    this.callback = object : MatrixCallback<TurnServerResponse> {
+                        override fun onSuccess(data: TurnServerResponse) {
+                            cachedTurnServerResponse = data
+                            callback.onSuccess(data)
+                        }
+
+                        override fun onFailure(failure: Throwable) {
+                            callback.onFailure(failure)
+                        }
+                    }
+                }
+                .executeBy(taskExecutor)
+    }
+
+    override fun createOutgoingCall(roomId: String, otherUserId: String, isVideoCall: Boolean): MxCall {
+        return MxCallImpl(
+                callId = UUID.randomUUID().toString(),
+                isOutgoing = true,
+                roomId = roomId,
+                userId = userId,
+                otherUserId = otherUserId,
+                isVideoCall = isVideoCall,
+                localEchoEventFactory = localEchoEventFactory,
+                roomEventSender = roomEventSender
+        ).also {
+            activeCalls.add(it)
+        }
+    }
+
+    override fun addCallListener(listener: CallsListener) {
+        callListeners.add(listener)
+    }
+
+    override fun removeCallListener(listener: CallsListener) {
+        callListeners.remove(listener)
+    }
+
+    override fun getCallWithId(callId: String): MxCall? {
+        Timber.v("## VOIP getCallWithId $callId all calls ${activeCalls.map { it.callId }}")
+        return activeCalls.find { it.callId == callId }
+    }
+
+    internal fun onCallEvent(event: Event) {
+        when (event.getClearType()) {
+            EventType.CALL_ANSWER     -> {
+                event.getClearContent().toModel<CallAnswerContent>()?.let {
+                    if (event.senderId == userId) {
+                        // ok it's an answer from me.. is it remote echo or other session
+                        val knownCall = getCallWithId(it.callId)
+                        if (knownCall == null) {
+                            Timber.d("## VOIP onCallEvent ${event.getClearType()} id ${it.callId} send by me")
+                        } else if (!knownCall.isOutgoing) {
+                            // incoming call
+                            // if it was anwsered by this session, the call state would be in Answering(or connected) state
+                            if (knownCall.state == CallState.LocalRinging) {
+                                // discard current call, it's answered by another of my session
+                                onCallManageByOtherSession(it.callId)
+                            }
+                        }
+                        return
+                    }
+
+                    onCallAnswer(it)
+                }
+            }
+            EventType.CALL_INVITE     -> {
+                if (event.senderId == userId) {
+                    // Always ignore local echos of invite
+                    return
+                }
+                event.getClearContent().toModel<CallInviteContent>()?.let { content ->
+                    val incomingCall = MxCallImpl(
+                            callId = content.callId ?: return@let,
+                            isOutgoing = false,
+                            roomId = event.roomId ?: return@let,
+                            userId = userId,
+                            otherUserId = event.senderId ?: return@let,
+                            isVideoCall = content.isVideo(),
+                            localEchoEventFactory = localEchoEventFactory,
+                            roomEventSender = roomEventSender
+                    )
+                    activeCalls.add(incomingCall)
+                    onCallInvite(incomingCall, content)
+                }
+            }
+            EventType.CALL_HANGUP     -> {
+                event.getClearContent().toModel<CallHangupContent>()?.let { content ->
+
+                    if (event.senderId == userId) {
+                        // ok it's an answer from me.. is it remote echo or other session
+                        val knownCall = getCallWithId(content.callId)
+                        if (knownCall == null) {
+                            Timber.d("## VOIP onCallEvent ${event.getClearType()} id ${content.callId} send by me")
+                        } else if (!knownCall.isOutgoing) {
+                            // incoming call
+                            if (knownCall.state == CallState.LocalRinging) {
+                                // discard current call, it's answered by another of my session
+                                onCallManageByOtherSession(content.callId)
+                            }
+                        }
+                        return
+                    }
+
+                    onCallHangup(content)
+                    activeCalls.removeAll { it.callId == content.callId }
+                }
+            }
+            EventType.CALL_CANDIDATES -> {
+                if (event.senderId == userId) {
+                    // Always ignore local echos of invite
+                    return
+                }
+                event.getClearContent().toModel<CallCandidatesContent>()?.let { content ->
+                    activeCalls.firstOrNull { it.callId == content.callId }?.let {
+                        onCallIceCandidate(it, content)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun onCallHangup(hangup: CallHangupContent) {
+        callListeners.toList().forEach {
+            tryThis {
+                it.onCallHangupReceived(hangup)
+            }
+        }
+    }
+
+    private fun onCallAnswer(answer: CallAnswerContent) {
+        callListeners.toList().forEach {
+            tryThis {
+                it.onCallAnswerReceived(answer)
+            }
+        }
+    }
+
+    private fun onCallManageByOtherSession(callId: String) {
+        callListeners.toList().forEach {
+            tryThis {
+                it.onCallManagedByOtherSession(callId)
+            }
+        }
+    }
+
+    private fun onCallInvite(incomingCall: MxCall, invite: CallInviteContent) {
+        // Ignore the invitation from current user
+        if (incomingCall.otherUserId == userId) return
+
+        callListeners.toList().forEach {
+            tryThis {
+                it.onCallInviteReceived(incomingCall, invite)
+            }
+        }
+    }
+
+    private fun onCallIceCandidate(incomingCall: MxCall, candidates: CallCandidatesContent) {
+        callListeners.toList().forEach {
+            tryThis {
+                it.onCallIceCandidateReceived(incomingCall, candidates)
+            }
+        }
+    }
+
+    companion object {
+        const val CALL_TIMEOUT_MS = 120_000
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/GetTurnServerTask.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.call
+
+import im.vector.matrix.android.api.session.call.TurnServerResponse
+import im.vector.matrix.android.internal.network.executeRequest
+import im.vector.matrix.android.internal.task.Task
+import org.greenrobot.eventbus.EventBus
+import javax.inject.Inject
+
+internal abstract class GetTurnServerTask : Task<GetTurnServerTask.Params, TurnServerResponse> {
+    object Params
+}
+
+internal class DefaultGetTurnServerTask @Inject constructor(private val voipAPI: VoipApi,
+                                                            private val eventBus: EventBus) : GetTurnServerTask() {
+
+    override suspend fun execute(params: Params): TurnServerResponse {
+        return executeRequest(eventBus) {
+            apiCall = voipAPI.getTurnServer()
+        }
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/VoipApi.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.call
+
+import im.vector.matrix.android.api.session.call.TurnServerResponse
+import im.vector.matrix.android.internal.network.NetworkConstants
+import retrofit2.Call
+import retrofit2.http.GET
+
+internal interface VoipApi {
+
+    @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "voip/turnServer")
+    fun getTurnServer(): Call<TurnServerResponse>
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/call/model/MxCallImpl.kt

@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.call.model
+
+import im.vector.matrix.android.api.session.call.CallState
+import im.vector.matrix.android.api.session.call.MxCall
+import im.vector.matrix.android.api.session.events.model.Content
+import im.vector.matrix.android.api.session.events.model.Event
+import im.vector.matrix.android.api.session.events.model.EventType
+import im.vector.matrix.android.api.session.events.model.LocalEcho
+import im.vector.matrix.android.api.session.events.model.UnsignedData
+import im.vector.matrix.android.api.session.events.model.toContent
+import im.vector.matrix.android.api.session.room.model.call.CallAnswerContent
+import im.vector.matrix.android.api.session.room.model.call.CallCandidatesContent
+import im.vector.matrix.android.api.session.room.model.call.CallHangupContent
+import im.vector.matrix.android.api.session.room.model.call.CallInviteContent
+import im.vector.matrix.android.internal.session.call.DefaultCallSignalingService
+import im.vector.matrix.android.internal.session.room.send.LocalEchoEventFactory
+import im.vector.matrix.android.internal.session.room.send.RoomEventSender
+import org.webrtc.IceCandidate
+import org.webrtc.SessionDescription
+import timber.log.Timber
+
+internal class MxCallImpl(
+        override val callId: String,
+        override val isOutgoing: Boolean,
+        override val roomId: String,
+        private val userId: String,
+        override val otherUserId: String,
+        override val isVideoCall: Boolean,
+        private val localEchoEventFactory: LocalEchoEventFactory,
+        private val roomEventSender: RoomEventSender
+) : MxCall {
+
+    override var state: CallState = CallState.Idle
+        set(value) {
+            field = value
+            dispatchStateChange()
+        }
+
+    private val listeners = mutableListOf<MxCall.StateListener>()
+
+    override fun addListener(listener: MxCall.StateListener) {
+        listeners.add(listener)
+    }
+
+    override fun removeListener(listener: MxCall.StateListener) {
+        listeners.remove(listener)
+    }
+
+    private fun dispatchStateChange() {
+        listeners.forEach {
+            try {
+                it.onStateUpdate(this)
+            } catch (failure: Throwable) {
+                Timber.d("dispatchStateChange failed for call $callId : ${failure.localizedMessage}")
+            }
+        }
+    }
+
+    init {
+        if (isOutgoing) {
+            state = CallState.Idle
+        } else {
+            // because it's created on reception of an offer
+            state = CallState.LocalRinging
+        }
+    }
+
+    override fun offerSdp(sdp: SessionDescription) {
+        if (!isOutgoing) return
+        Timber.v("## VOIP offerSdp $callId")
+        state = CallState.Dialing
+        CallInviteContent(
+                callId = callId,
+                lifetime = DefaultCallSignalingService.CALL_TIMEOUT_MS,
+                offer = CallInviteContent.Offer(sdp = sdp.description)
+        )
+                .let { createEventAndLocalEcho(type = EventType.CALL_INVITE, roomId = roomId, content = it.toContent()) }
+                .also { roomEventSender.sendEvent(it) }
+    }
+
+    override fun sendLocalIceCandidates(candidates: List<IceCandidate>) {
+        CallCandidatesContent(
+                callId = callId,
+                candidates = candidates.map {
+                    CallCandidatesContent.Candidate(
+                            sdpMid = it.sdpMid,
+                            sdpMLineIndex = it.sdpMLineIndex,
+                            candidate = it.sdp
+                    )
+                }
+        )
+                .let { createEventAndLocalEcho(type = EventType.CALL_CANDIDATES, roomId = roomId, content = it.toContent()) }
+                .also { roomEventSender.sendEvent(it) }
+    }
+
+    override fun sendLocalIceCandidateRemovals(candidates: List<IceCandidate>) {
+        // For now we don't support this flow
+    }
+
+    override fun hangUp() {
+        Timber.v("## VOIP hangup $callId")
+        CallHangupContent(
+                callId = callId
+        )
+                .let { createEventAndLocalEcho(type = EventType.CALL_HANGUP, roomId = roomId, content = it.toContent()) }
+                .also { roomEventSender.sendEvent(it) }
+        state = CallState.Terminated
+    }
+
+    override fun accept(sdp: SessionDescription) {
+        Timber.v("## VOIP accept $callId")
+        if (isOutgoing) return
+        state = CallState.Answering
+        CallAnswerContent(
+                callId = callId,
+                answer = CallAnswerContent.Answer(sdp = sdp.description)
+        )
+                .let { createEventAndLocalEcho(type = EventType.CALL_ANSWER, roomId = roomId, content = it.toContent()) }
+                .also { roomEventSender.sendEvent(it) }
+    }
+
+    private fun createEventAndLocalEcho(localId: String = LocalEcho.createLocalEchoId(), type: String, roomId: String, content: Content): Event {
+        return Event(
+                roomId = roomId,
+                originServerTs = System.currentTimeMillis(),
+                senderId = userId,
+                eventId = localId,
+                type = type,
+                content = content,
+                unsignedData = UnsignedData(age = null, transactionId = localId)
+        )
+                .also { localEchoEventFactory.createLocalEcho(it) }
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt

@@ -111,9 +111,13 @@ internal class DefaultPushRuleService @Inject constructor(
                 .executeBy(taskExecutor)
     }
 
-    override fun addPushRule(kind: RuleKind, pushRule: PushRule, callback: MatrixCallback<Unit>): Cancelable {
+    override fun addPushRule(kind: RuleKind,
+                             pushRule: PushRule,
+                             beforeRuleId: String?,
+                             afterRuleId: String?,
+                             callback: MatrixCallback<Unit>): Cancelable {
         return addPushRuleTask
-                .configureWith(AddPushRuleTask.Params(kind, pushRule)) {
+                .configureWith(AddPushRuleTask.Params(kind, pushRule, beforeRuleId, afterRuleId)) {
                     this.callback = callback
                 }
                 .executeBy(taskExecutor)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/DefaultProfileService.kt

@@ -34,7 +34,8 @@ import javax.inject.Inject
 internal class DefaultProfileService @Inject constructor(private val taskExecutor: TaskExecutor,
                                                          private val monarchy: Monarchy,
                                                          private val refreshUserThreePidsTask: RefreshUserThreePidsTask,
-                                                         private val getProfileInfoTask: GetProfileInfoTask) : ProfileService {
+                                                         private val getProfileInfoTask: GetProfileInfoTask,
+                                                         private val setDisplayNameTask: SetDisplayNameTask) : ProfileService {
 
     override fun getDisplayName(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable {
         val params = GetProfileInfoTask.Params(userId)
@@ -54,6 +55,14 @@ internal class DefaultProfileService @Inject constructor(private val taskExecuto
                 .executeBy(taskExecutor)
     }
 
+    override fun setDisplayName(userId: String, newDisplayName: String, matrixCallback: MatrixCallback<Unit>): Cancelable {
+        return setDisplayNameTask
+                .configureWith(SetDisplayNameTask.Params(userId = userId, newDisplayName = newDisplayName)) {
+                    callback = matrixCallback
+                }
+                .executeBy(taskExecutor)
+    }
+
     override fun getAvatarUrl(userId: String, matrixCallback: MatrixCallback<Optional<String>>): Cancelable {
         val params = GetProfileInfoTask.Params(userId)
         return getProfileInfoTask

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileAPI.kt

@@ -23,6 +23,7 @@ import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
+import retrofit2.http.PUT
 import retrofit2.http.Path
 
 internal interface ProfileAPI {
@@ -42,6 +43,12 @@ internal interface ProfileAPI {
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/3pid")
     fun getThreePIDs(): Call<AccountThreePidsResponse>
 
+    /**
+     * Change user display name
+     */
+    @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "profile/{userId}/displayname")
+    fun setDisplayName(@Path("userId") userId: String, @Body body: SetDisplayNameBody): Call<Unit>
+
     /**
      * Bind a threePid
      * Ref: https://matrix.org/docs/spec/client_server/latest#post-matrix-client-r0-account-3pid-bind

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/ProfileModule.kt

@@ -51,4 +51,7 @@ internal abstract class ProfileModule {
 
     @Binds
     abstract fun bindUnbindThreePidsTask(task: DefaultUnbindThreePidsTask): UnbindThreePidsTask
+
+    @Binds
+    abstract fun bindSetDisplayNameTask(task: DefaultSetDisplayNameTask): SetDisplayNameTask
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetDisplayNameBody.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.matrix.android.internal.session.profile
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal data class SetDisplayNameBody(
+        /**
+         * The new display name for this user.
+         */
+        @Json(name = "displayname")
+        val displayName: String
+)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/profile/SetDisplayNameTask.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.profile
+
+import im.vector.matrix.android.internal.network.executeRequest
+import im.vector.matrix.android.internal.task.Task
+import org.greenrobot.eventbus.EventBus
+import javax.inject.Inject
+
+internal abstract class SetDisplayNameTask : Task<SetDisplayNameTask.Params, Unit> {
+    data class Params(
+            val userId: String,
+            val newDisplayName: String
+    )
+}
+
+internal class DefaultSetDisplayNameTask @Inject constructor(
+        private val profileAPI: ProfileAPI,
+        private val eventBus: EventBus) : SetDisplayNameTask() {
+
+    override suspend fun execute(params: Params) {
+        return executeRequest(eventBus) {
+            val body = SetDisplayNameBody(
+                    displayName = params.newDisplayName
+            )
+            apiCall = profileAPI.setDisplayName(params.userId, body)
+        }
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddPushRuleTask.kt

@@ -25,7 +25,9 @@ import javax.inject.Inject
 internal interface AddPushRuleTask : Task<AddPushRuleTask.Params, Unit> {
     data class Params(
             val kind: RuleKind,
-            val pushRule: PushRule
+            val pushRule: PushRule,
+            val beforeRuleId: String?,
+            val afterRuleId: String?
     )
 }
 
@@ -36,7 +38,13 @@ internal class DefaultAddPushRuleTask @Inject constructor(
 
     override suspend fun execute(params: AddPushRuleTask.Params) {
         return executeRequest(eventBus) {
-            apiCall = pushRulesApi.addRule(params.kind.value, params.pushRule.ruleId, params.pushRule)
+            apiCall = pushRulesApi.addRule(
+                    kind = params.kind.value,
+                    ruleId = params.pushRule.ruleId,
+                    beforeRuleId = params.beforeRuleId,
+                    afterRuleId = params.afterRuleId,
+                    rule = params.pushRule
+            )
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/EnabledBody.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.matrix.android.internal.session.pushers
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+internal class EnabledBody(
+        @Json(name = "enabled")
+        val enabled: Boolean
+)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/PushRulesApi.kt

@@ -24,7 +24,11 @@ import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.PUT
 import retrofit2.http.Path
+import retrofit2.http.Query
 
+/**
+ * Ref: https://matrix.org/docs/spec/client_server/r0.6.1#push-rules-api
+ */
 internal interface PushRulesApi {
     /**
      * Get all push rules
@@ -37,12 +41,12 @@ internal interface PushRulesApi {
      *
      * @param kind   the notification kind (sender, room...)
      * @param ruleId the ruleId
-     * @param enable the new enable status
+     * @param body   the new enable status
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}/enabled")
     fun updateEnableRuleStatus(@Path("kind") kind: String,
                                @Path("ruleId") ruleId: String,
-                               @Body enable: Boolean?)
+                               @Body body: EnabledBody)
             : Call<Unit>
 
     /**
@@ -71,15 +75,22 @@ internal interface PushRulesApi {
             : Call<Unit>
 
     /**
-     * Add the ruleID enable status
+     * This endpoint allows the creation, modification and deletion of pushers for this user ID. The
+     * behaviour of this endpoint varies depending on the values in the JSON body.
      *
-     * @param kind   the notification kind (sender, room...)
-     * @param ruleId the ruleId.
-     * @param rule   the rule to add.
+     * @param kind         the notification kind (sender, room...)
+     * @param ruleId       the ruleId.
+     * @param beforeRuleId Use 'before' with a rule_id as its value to make the new rule the next-most important rule with
+     *                     respect to the given user defined rule. It is not possible to add a rule relative to a predefined server rule.
+     * @param afterRuleId  This makes the new rule the next-less important rule relative to the given user defined rule. It
+     *                     is not possible to add a rule relative to a predefined server rule.
+     * @param rule         the rule to add. Note: only a subset of PushRule is documented: actions, condition, pattern. We should create a dedicated model
      */
     @PUT(NetworkConstants.URI_API_PREFIX_PATH_R0 + "pushrules/global/{kind}/{ruleId}")
     fun addRule(@Path("kind") kind: String,
                 @Path("ruleId") ruleId: String,
+                @Query("before") beforeRuleId: String?,
+                @Query("after") afterRuleId: String?,
                 @Body rule: PushRule)
             : Call<Unit>
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/UpdatePushRuleActionsTask.kt

@@ -39,7 +39,11 @@ internal class DefaultUpdatePushRuleActionsTask @Inject constructor(
         if (params.oldPushRule.enabled != params.newPushRule.enabled) {
             // First change enabled state
             executeRequest<Unit>(eventBus) {
-                apiCall = pushRulesApi.updateEnableRuleStatus(params.kind.value, params.newPushRule.ruleId, params.newPushRule.enabled)
+                apiCall = pushRulesApi.updateEnableRuleStatus(
+                        params.kind.value,
+                        params.newPushRule.ruleId,
+                        EnabledBody(enabled = params.newPushRule.enabled)
+                )
             }
         }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/UpdatePushRuleEnableStatusTask.kt

@@ -35,7 +35,11 @@ internal class DefaultUpdatePushRuleEnableStatusTask @Inject constructor(
 
     override suspend fun execute(params: UpdatePushRuleEnableStatusTask.Params) {
         return executeRequest(eventBus) {
-            apiCall = pushRulesApi.updateEnableRuleStatus(params.kind.value, params.pushRule.ruleId, params.enabled)
+            apiCall = pushRulesApi.updateEnableRuleStatus(
+                    params.kind.value,
+                    params.pushRule.ruleId,
+                    EnabledBody(enabled = params.enabled)
+            )
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt

@@ -23,6 +23,7 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.crypto.CryptoService
 import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.room.Room
+import im.vector.matrix.android.api.session.room.call.RoomCallService
 import im.vector.matrix.android.api.session.room.members.MembershipService
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.session.room.model.relation.RelationService
@@ -58,6 +59,7 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
                                                private val stateService: StateService,
                                                private val uploadsService: UploadsService,
                                                private val reportingService: ReportingService,
+                                               private val roomCallService: RoomCallService,
                                                private val readService: ReadService,
                                                private val typingService: TypingService,
                                                private val tagsService: TagsService,
@@ -74,6 +76,7 @@ internal class DefaultRoom @Inject constructor(override val roomId: String,
         StateService by stateService,
         UploadsService by uploadsService,
         ReportingService by reportingService,
+        RoomCallService by roomCallService,
         ReadService by readService,
         TypingService by typingService,
         TagsService by tagsService,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt

@@ -21,6 +21,7 @@ import im.vector.matrix.android.api.session.crypto.CryptoService
 import im.vector.matrix.android.api.session.room.Room
 import im.vector.matrix.android.internal.database.mapper.RoomSummaryMapper
 import im.vector.matrix.android.internal.session.SessionScope
+import im.vector.matrix.android.internal.session.room.call.DefaultRoomCallService
 import im.vector.matrix.android.internal.session.room.draft.DefaultDraftService
 import im.vector.matrix.android.internal.session.room.membership.DefaultMembershipService
 import im.vector.matrix.android.internal.session.room.notification.DefaultRoomPushRuleService
@@ -51,6 +52,7 @@ internal class DefaultRoomFactory @Inject constructor(private val monarchy: Mona
                                                       private val stateServiceFactory: DefaultStateService.Factory,
                                                       private val uploadsServiceFactory: DefaultUploadsService.Factory,
                                                       private val reportingServiceFactory: DefaultReportingService.Factory,
+                                                      private val roomCallServiceFactory: DefaultRoomCallService.Factory,
                                                       private val readServiceFactory: DefaultReadService.Factory,
                                                       private val typingServiceFactory: DefaultTypingService.Factory,
                                                       private val tagsServiceFactory: DefaultTagsService.Factory,
@@ -72,6 +74,7 @@ internal class DefaultRoomFactory @Inject constructor(private val monarchy: Mona
                 stateService = stateServiceFactory.create(roomId),
                 uploadsService = uploadsServiceFactory.create(roomId),
                 reportingService = reportingServiceFactory.create(roomId),
+                roomCallService = roomCallServiceFactory.create(roomId),
                 readService = readServiceFactory.create(roomId),
                 typingService = typingServiceFactory.create(roomId),
                 tagsService = tagsServiceFactory.create(roomId),

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/call/DefaultRoomCallService.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.room.call
+
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.matrix.android.api.extensions.orFalse
+import im.vector.matrix.android.api.session.room.call.RoomCallService
+import im.vector.matrix.android.internal.session.room.RoomGetter
+
+internal class DefaultRoomCallService @AssistedInject constructor(
+        @Assisted private val roomId: String,
+        private val roomGetter: RoomGetter
+) : RoomCallService {
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(roomId: String): RoomCallService
+    }
+
+    override fun canStartCall(): Boolean {
+        return roomGetter.getRoom(roomId)?.roomSummary()?.canStartCall.orFalse()
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/DefaultRoomPushRuleService.kt

@@ -51,7 +51,7 @@ internal class DefaultRoomPushRuleService @AssistedInject constructor(@Assisted
     override fun setRoomNotificationState(roomNotificationState: RoomNotificationState, matrixCallback: MatrixCallback<Unit>): Cancelable {
         return setRoomNotificationStateTask
                 .configureWith(SetRoomNotificationStateTask.Params(roomId, roomNotificationState)) {
-                    this.callback = callback
+                    this.callback = matrixCallback
                 }
                 .executeBy(taskExecutor)
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRuleMapper.kt

@@ -45,9 +45,13 @@ internal fun PushRuleEntity.toRoomPushRule(): RoomPushRule? {
     }
 }
 
+/**
+ * FIXME This is the trickiest part...
+ */
 internal fun RoomNotificationState.toRoomPushRule(roomId: String): RoomPushRule? {
     return when {
-        this == RoomNotificationState.ALL_MESSAGES       -> null
+        this == RoomNotificationState.ALL_MESSAGES -> null
+        /* TODO
         this == RoomNotificationState.ALL_MESSAGES_NOISY -> {
             val rule = PushRule(
                     actions = listOf(Action.Notify, Action.Sound()).toJson(),
@@ -56,7 +60,8 @@ internal fun RoomNotificationState.toRoomPushRule(roomId: String): RoomPushRule?
             )
             return RoomPushRule(RuleSetKey.ROOM, rule)
         }
-        else                                             -> {
+         */
+        else                                       -> {
             val condition = PushCondition(
                     kind = Condition.Kind.EventMatch.value,
                     key = "room_id",
@@ -68,7 +73,7 @@ internal fun RoomNotificationState.toRoomPushRule(roomId: String): RoomPushRule?
                     ruleId = roomId,
                     conditions = listOf(condition)
             )
-            val kind = if (this == RoomNotificationState.MUTE) {
+            val kind = if (this == RoomNotificationState.NONE) {
                 RuleSetKey.OVERRIDE
             } else {
                 RuleSetKey.ROOM
@@ -83,16 +88,17 @@ internal fun RoomPushRule.toRoomNotificationState(): RoomNotificationState {
         val actions = rule.getActions()
         if (actions.contains(Action.DoNotNotify)) {
             if (kind == RuleSetKey.OVERRIDE) {
-                RoomNotificationState.MUTE
+                RoomNotificationState.NONE
             } else {
-                RoomNotificationState.MENTIONS_ONLY
+                RoomNotificationState.MENTIONS_AND_KEYWORDS
             }
         } else if (actions.contains(Action.Notify)) {
             val hasSoundAction = actions.find {
                 it is Action.Sound
             } != null
             if (hasSoundAction) {
-                RoomNotificationState.ALL_MESSAGES_NOISY
+                RoomNotificationState.ALL_MESSAGES
+                // TODO RoomNotificationState.ALL_MESSAGES_NOISY
             } else {
                 RoomNotificationState.ALL_MESSAGES
             }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/SetRoomNotificationStateTask.kt

@@ -48,7 +48,7 @@ internal class DefaultSetRoomNotificationStateTask @Inject constructor(private v
         }
         val newRoomPushRule = params.roomNotificationState.toRoomPushRule(params.roomId)
         if (newRoomPushRule != null) {
-            addPushRuleTask.execute(AddPushRuleTask.Params(newRoomPushRule.kind, newRoomPushRule.rule))
+            addPushRuleTask.execute(AddPushRuleTask.Params(newRoomPushRule.kind, newRoomPushRule.rule, null, null))
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/DefaultSendService.kt

@@ -58,7 +58,8 @@ internal class DefaultSendService @AssistedInject constructor(
         private val localEchoEventFactory: LocalEchoEventFactory,
         private val cryptoService: CryptoService,
         private val taskExecutor: TaskExecutor,
-        private val localEchoRepository: LocalEchoRepository
+        private val localEchoRepository: LocalEchoRepository,
+        private val roomEventSender: RoomEventSender
 ) : SendService {
 
     @AssistedInject.Factory
@@ -111,20 +112,6 @@ internal class DefaultSendService @AssistedInject constructor(
                 .let { sendEvent(it) }
     }
 
-    private fun sendEvent(event: Event): Cancelable {
-        // Encrypted room handling
-        return if (cryptoService.isRoomEncrypted(roomId)) {
-            Timber.v("Send event in encrypted room")
-            val encryptWork = createEncryptEventWork(event, true)
-            // Note that event will be replaced by the result of the previous work
-            val sendWork = createSendEventWork(event, false)
-            timelineSendEventWorkCommon.postSequentialWorks(roomId, encryptWork, sendWork)
-        } else {
-            val sendWork = createSendEventWork(event, true)
-            timelineSendEventWorkCommon.postWork(roomId, sendWork)
-        }
-    }
-
     override fun sendMedias(attachments: List<ContentAttachmentData>,
                             compressBeforeSending: Boolean,
                             roomIds: Set<String>): Cancelable {
@@ -269,6 +256,10 @@ internal class DefaultSendService @AssistedInject constructor(
         return cancelableBag
     }
 
+    private fun sendEvent(event: Event): Cancelable {
+        return roomEventSender.sendEvent(event)
+    }
+
     private fun createLocalEcho(event: Event) {
         localEchoEventFactory.createLocalEcho(event)
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/MarkdownParser.kt

@@ -37,7 +37,7 @@ internal class MarkdownParser @Inject constructor(
     fun parse(text: String): TextContent {
         // If no special char are detected, just return plain text
         if (text.contains(mdSpecialChars).not()) {
-            return TextContent(text.toString())
+            return TextContent(text)
         }
 
         val document = parser.parse(text)
@@ -56,7 +56,7 @@ internal class MarkdownParser @Inject constructor(
             val plainText = textContentRenderer.render(document)
             TextContent(plainText, cleanHtmlText.postTreatment())
         } else {
-            TextContent(text.toString())
+            TextContent(text)
         }
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/RoomEventSender.kt

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.matrix.android.internal.session.room.send
+
+import androidx.work.BackoffPolicy
+import androidx.work.OneTimeWorkRequest
+import im.vector.matrix.android.api.session.crypto.CryptoService
+import im.vector.matrix.android.api.session.events.model.Event
+import im.vector.matrix.android.api.util.Cancelable
+import im.vector.matrix.android.internal.di.SessionId
+import im.vector.matrix.android.internal.di.WorkManagerProvider
+import im.vector.matrix.android.internal.session.room.timeline.TimelineSendEventWorkCommon
+import im.vector.matrix.android.internal.worker.WorkerParamsFactory
+import im.vector.matrix.android.internal.worker.startChain
+import timber.log.Timber
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+
+internal class RoomEventSender @Inject constructor(
+        private val workManagerProvider: WorkManagerProvider,
+        private val timelineSendEventWorkCommon: TimelineSendEventWorkCommon,
+        @SessionId private val sessionId: String,
+        private val cryptoService: CryptoService
+) {
+    fun sendEvent(event: Event): Cancelable {
+        // Encrypted room handling
+        return if (cryptoService.isRoomEncrypted(event.roomId ?: "")) {
+            Timber.v("Send event in encrypted room")
+            val encryptWork = createEncryptEventWork(event, true)
+            // Note that event will be replaced by the result of the previous work
+            val sendWork = createSendEventWork(event, false)
+            timelineSendEventWorkCommon.postSequentialWorks(event.roomId ?: "", encryptWork, sendWork)
+        } else {
+            val sendWork = createSendEventWork(event, true)
+            timelineSendEventWorkCommon.postWork(event.roomId ?: "", sendWork)
+        }
+    }
+
+    private fun createEncryptEventWork(event: Event, startChain: Boolean): OneTimeWorkRequest {
+        // Same parameter
+        val params = EncryptEventWorker.Params(sessionId, event)
+        val sendWorkData = WorkerParamsFactory.toData(params)
+
+        return workManagerProvider.matrixOneTimeWorkRequestBuilder<EncryptEventWorker>()
+                .setConstraints(WorkManagerProvider.workConstraints)
+                .setInputData(sendWorkData)
+                .startChain(startChain)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, WorkManagerProvider.BACKOFF_DELAY, TimeUnit.MILLISECONDS)
+                .build()
+    }
+
+    private fun createSendEventWork(event: Event, startChain: Boolean): OneTimeWorkRequest {
+        val sendContentWorkerParams = SendEventWorker.Params(sessionId, event)
+        val sendWorkData = WorkerParamsFactory.toData(sendContentWorkerParams)
+
+        return timelineSendEventWorkCommon.createWork<SendEventWorker>(sendWorkData, startChain)
+    }
+}

matrix-sdk-android/src/main/res/values/strings.xml

@@ -33,8 +33,8 @@
     <string name="notice_display_name_set_by_you">You set your display name to %1$s</string>
     <string name="notice_display_name_changed_from">%1$s changed their display name from %2$s to %3$s</string>
     <string name="notice_display_name_changed_from_by_you">You changed your display name from %1$s to %2$s</string>
-    <string name="notice_display_name_removed">%1$s removed their display name (%2$s)</string>
-    <string name="notice_display_name_removed_by_you">You removed your display name (%1$s)</string>
+    <string name="notice_display_name_removed">%1$s removed their display name (it was %2$s)</string>
+    <string name="notice_display_name_removed_by_you">You removed your display name (it was %1$s)</string>
     <string name="notice_room_topic_changed">%1$s changed the topic to: %2$s</string>
     <string name="notice_room_topic_changed_by_you">You changed the topic to: %1$s</string>
     <string name="notice_room_name_changed">%1$s changed the room name to: %2$s</string>
@@ -43,6 +43,8 @@
     <string name="notice_placed_video_call_by_you">You placed a video call.</string>
     <string name="notice_placed_voice_call">%s placed a voice call.</string>
     <string name="notice_placed_voice_call_by_you">You placed a voice call.</string>
+    <string name="notice_call_candidates">%s sent data to setup the call.</string>
+    <string name="notice_call_candidates_by_you">You sent data to setup the call.</string>
     <string name="notice_answered_call">%s answered the call.</string>
     <string name="notice_answered_call_by_you">You answered the call.</string>
     <string name="notice_ended_call">%s ended the call.</string>
@@ -362,4 +364,8 @@
 
     <string name="key_verification_request_fallback_message">%s is requesting to verify your key, but your client does not support in-chat key verification. You will need to use legacy key verification to verify keys.</string>
 
+    <string name="call_notification_answer">Accept</string>
+    <string name="call_notification_reject">Decline</string>
+    <string name="call_notification_hangup">Hang Up</string>
+
 </resources>

tools/templates/configure.sh

@@ -17,8 +17,9 @@
 #
 
 echo "Configure RiotX Template..."
+if [ -z ${ANDROID_STUDIO+x} ]; then ANDROID_STUDIO="/Applications/Android Studio.app/Contents"; fi
 {
-ln -s $(pwd)/RiotXFeature /Applications/Android\ Studio.app/Contents/plugins/android/lib/templates/other
+ln -s $(pwd)/RiotXFeature "${ANDROID_STUDIO%/}/plugins/android/lib/templates/other"
 } && {
   echo "Please restart Android Studio."
 }

vector/build.gradle

@@ -15,7 +15,7 @@ androidExtensions {
 }
 
 ext.versionMajor = 0
-ext.versionMinor = 22
+ext.versionMinor = 23
 ext.versionPatch = 0
 
 static def getGitTimestamp() {
@@ -107,9 +107,8 @@ android {
     compileSdkVersion 29
     defaultConfig {
         applicationId "im.vector.riotx"
-        // Set to API 19 because motionLayout is min API 18.
-        // In the future we may consider using an alternative of MotionLayout to support API 16. But for security reason, maybe not.
-        minSdkVersion 19
+        // Set to API 21: see #405
+        minSdkVersion 21
         targetSdkVersion 29
         multiDexEnabled true
 
@@ -192,8 +191,14 @@ android {
             resValue "bool", "debug_mode", "false"
             buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
 
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            postprocessing {
+                removeUnusedCode true
+                removeUnusedResources true
+                // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :)
+                obfuscate false
+                optimizeCode true
+                proguardFiles 'proguard-rules.pro'
+            }
         }
     }
 
@@ -385,6 +390,9 @@ dependencies {
 
     implementation 'com.github.BillCarsonFr:JsonViewer:0.5'
 
+    // TODO meant for development purposes only
+    implementation 'org.webrtc:google-webrtc:1.0.+'
+
     // QR-code
     // Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170
     implementation 'com.google.zxing:core:3.3.3'

vector/proguard-rules.pro

@@ -19,3 +19,5 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-keep class im.vector.riotx.features.** { *; }

vector/src/main/AndroidManifest.xml

@@ -3,13 +3,30 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="im.vector.riotx">
 
+    <!-- Needed for VOIP call to detect and switch to headset-->
+    <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
+    <!-- Call feature -->
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
+    <!-- Needed for voice call to toggle speaker on or off -->
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <!-- READ_PHONE_STATE is needed only if your calling app reads numbers from the `PHONE_STATE`
+            intent action. -->
+
+    <!-- Needed to show incoming calls activity in lock screen-->
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <!-- Needed for incoming calls  -->
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
     <!-- Adding CAMERA permission prevents Chromebooks to see the application on the PlayStore -->
     <!-- Tell that the Camera is not mandatory to install the application -->
     <uses-feature
@@ -172,6 +189,7 @@
         <activity
             android:name=".features.attachments.preview.AttachmentsPreviewActivity"
             android:theme="@style/AppTheme.AttachmentsPreview" />
+        <activity android:name=".features.call.VectorCallActivity" />
 
         <activity android:name=".features.terms.ReviewTermsActivity" />
         <activity android:name=".features.widgets.WidgetActivity" />
@@ -180,20 +198,47 @@
 
         <service
             android:name=".core.services.CallService"
-            android:exported="false" />
+            android:exported="false" >
+            <!-- in order to get headset button events -->
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </service>
 
         <service
             android:name=".core.services.VectorSyncService"
             android:exported="false" />
 
+        <service
+            android:name=".features.call.telecom.VectorConnectionService"
+            android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE">
+            <intent-filter>
+                <action android:name="android.telecom.ConnectionService" />
+            </intent-filter>
+        </service>
+
         <!-- Receivers -->
 
+        <receiver
+            android:name=".features.call.service.CallHeadsUpActionReceiver"
+            android:exported="false" />
+
         <!-- Exported false, should only be accessible from this app!! -->
         <receiver
             android:name=".features.notifications.NotificationBroadcastReceiver"
             android:enabled="true"
             android:exported="false" />
 
+        <!--
+        A media button receiver receives and helps translate hardware media playback buttons,
+        such as those found on wired and wireless headsets, into the appropriate callbacks in your app.
+           -->
+        <receiver android:name="androidx.media.session.MediaButtonReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
+
         <!-- Providers -->
 
         <provider

vector/src/main/java/im/vector/riotx/VectorApplication.kt

@@ -43,6 +43,7 @@ import im.vector.riotx.core.di.HasVectorInjector
 import im.vector.riotx.core.di.VectorComponent
 import im.vector.riotx.core.extensions.configureAndStart
 import im.vector.riotx.core.rx.RxConfig
+import im.vector.riotx.features.call.WebRtcPeerConnectionManager
 import im.vector.riotx.features.configuration.VectorConfiguration
 import im.vector.riotx.features.lifecycle.VectorActivityLifecycleCallbacks
 import im.vector.riotx.features.notifications.NotificationDrawerManager
@@ -80,6 +81,8 @@ class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration.
     @Inject lateinit var appStateHandler: AppStateHandler
     @Inject lateinit var rxConfig: RxConfig
     @Inject lateinit var popupAlertManager: PopupAlertManager
+    @Inject lateinit var webRtcPeerConnectionManager: WebRtcPeerConnectionManager
+
     lateinit var vectorComponent: VectorComponent
     private var fontThreadHandler: Handler? = null
 
@@ -122,6 +125,7 @@ class VectorApplication : Application(), HasVectorInjector, MatrixConfiguration.
             val lastAuthenticatedSession = authenticationService.getLastAuthenticatedSession()!!
             activeSessionHolder.setActiveSession(lastAuthenticatedSession)
             lastAuthenticatedSession.configureAndStart(applicationContext, pushRuleTriggerListener, sessionListener)
+            lastAuthenticatedSession.callSignalingService().addCallListener(webRtcPeerConnectionManager)
         }
         ProcessLifecycleOwner.get().lifecycle.addObserver(object : LifecycleObserver {
             @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)

vector/src/main/java/im/vector/riotx/core/di/ScreenComponent.kt

@@ -24,6 +24,8 @@ import dagger.Component
 import im.vector.riotx.core.error.ErrorFormatter
 import im.vector.riotx.core.preference.UserAvatarPreference
 import im.vector.riotx.features.MainActivity
+import im.vector.riotx.features.call.CallControlsBottomSheet
+import im.vector.riotx.features.call.VectorCallActivity
 import im.vector.riotx.features.createdirect.CreateDirectRoomActivity
 import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
 import im.vector.riotx.features.crypto.quads.SharedSecureStorageActivity
@@ -130,6 +132,7 @@ interface ScreenComponent {
     fun inject(activity: InviteUsersToRoomActivity)
     fun inject(activity: ReviewTermsActivity)
     fun inject(activity: WidgetActivity)
+    fun inject(activity: VectorCallActivity)
 
     /* ==========================================================================================
      * BottomSheets
@@ -146,6 +149,7 @@ interface ScreenComponent {
     fun inject(bottomSheet: BootstrapBottomSheet)
     fun inject(bottomSheet: RoomWidgetPermissionBottomSheet)
     fun inject(bottomSheet: RoomWidgetsBottomSheet)
+    fun inject(bottomSheet: CallControlsBottomSheet)
 
     /* ==========================================================================================
      * Others

vector/src/main/java/im/vector/riotx/core/di/VectorComponent.kt

@@ -31,6 +31,7 @@ import im.vector.riotx.core.error.ErrorFormatter
 import im.vector.riotx.core.pushers.PushersManager
 import im.vector.riotx.core.utils.AssetReader
 import im.vector.riotx.core.utils.DimensionConverter
+import im.vector.riotx.features.call.WebRtcPeerConnectionManager
 import im.vector.riotx.features.configuration.VectorConfiguration
 import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
 import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
@@ -134,6 +135,8 @@ interface VectorComponent {
 
     fun reAuthHelper(): ReAuthHelper
 
+    fun webRtcPeerConnectionManager(): WebRtcPeerConnectionManager
+
     @Component.Factory
     interface Factory {
         fun create(@BindsInstance context: Context): VectorComponent

vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt

@@ -22,6 +22,7 @@ import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
 import im.vector.riotx.core.platform.ConfigurationViewModel
+import im.vector.riotx.features.call.SharedActiveCallViewModel
 import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromKeyViewModel
 import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromPassphraseViewModel
 import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
@@ -85,6 +86,11 @@ interface ViewModelModule {
     @ViewModelKey(ConfigurationViewModel::class)
     fun bindConfigurationViewModel(viewModel: ConfigurationViewModel): ViewModel
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(SharedActiveCallViewModel::class)
+    fun bindSharedActiveCallViewModel(viewModel: SharedActiveCallViewModel): ViewModel
+
     @Binds
     @IntoMap
     @ViewModelKey(UserDirectorySharedActionViewModel::class)

vector/src/main/java/im/vector/riotx/core/epoxy/DividerItem.kt

@@ -20,7 +20,7 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.riotx.R
 
 /**
- * Default background color is for the bottom sheets (R.attr.vctr_list_bottom_sheet_divider_color).
+ * Default background color is for the bottom sheets (R.attr.riotx_list_bottom_sheet_divider_color).
  * To use in fragment, set color using R.attr.vctr_list_divider_color
  */
 @EpoxyModelClass(layout = R.layout.item_divider)

vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetActionItem.kt

@@ -31,6 +31,7 @@ import com.airbnb.epoxy.EpoxyModelClass
 import im.vector.riotx.R
 import im.vector.riotx.core.epoxy.VectorEpoxyHolder
 import im.vector.riotx.core.epoxy.VectorEpoxyModel
+import im.vector.riotx.core.platform.CheckableImageView
 import im.vector.riotx.features.themes.ThemeUtils
 
 /**
@@ -42,18 +43,28 @@ abstract class BottomSheetActionItem : VectorEpoxyModel<BottomSheetActionItem.Ho
     @EpoxyAttribute
     @DrawableRes
     var iconRes: Int = 0
+
     @EpoxyAttribute
     var textRes: Int = 0
+
     @EpoxyAttribute
     var showExpand = false
+
     @EpoxyAttribute
     var expanded = false
+
+    @EpoxyAttribute
+    var showSelected = false
+
     @EpoxyAttribute
     var selected = false
+
     @EpoxyAttribute
     var subMenuItem = false
+
     @EpoxyAttribute
     var destructive = false
+
     @EpoxyAttribute
     lateinit var listener: View.OnClickListener
 
@@ -62,16 +73,21 @@ abstract class BottomSheetActionItem : VectorEpoxyModel<BottomSheetActionItem.Ho
             listener.onClick(it)
         }
         holder.startSpace.isVisible = subMenuItem
-        val tintColor = if (destructive) {
-            ContextCompat.getColor(holder.view.context, R.color.riotx_notice)
-        } else {
-            ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
+        val tintColor = when {
+            destructive -> ContextCompat.getColor(holder.view.context, R.color.riotx_notice)
+            selected    -> ContextCompat.getColor(holder.view.context, R.color.riotx_accent)
+            else        -> ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_primary)
+        }
+        val iconTintColor = when {
+            destructive || selected -> tintColor
+            else                    -> ThemeUtils.getColor(holder.view.context, R.attr.riotx_icon_color)
         }
         holder.icon.setImageResource(iconRes)
-        ImageViewCompat.setImageTintList(holder.icon, ColorStateList.valueOf(tintColor))
+        ImageViewCompat.setImageTintList(holder.icon, ColorStateList.valueOf(iconTintColor))
         holder.text.setText(textRes)
         holder.text.setTextColor(tintColor)
-        holder.selected.isInvisible = !selected
+        holder.selected.isInvisible = !showSelected
+        holder.selected.isChecked = selected
         if (showExpand) {
             val expandDrawable = if (expanded) {
                 ContextCompat.getDrawable(holder.view.context, R.drawable.ic_material_expand_less_black)
@@ -91,6 +107,6 @@ abstract class BottomSheetActionItem : VectorEpoxyModel<BottomSheetActionItem.Ho
         val startSpace by bind<View>(R.id.actionStartSpace)
         val icon by bind<ImageView>(R.id.actionIcon)
         val text by bind<TextView>(R.id.actionTitle)
-        val selected by bind<ImageView>(R.id.actionSelected)
+        val selected by bind<CheckableImageView>(R.id.actionSelected)
     }
 }

vector/src/main/java/im/vector/riotx/core/extensions/FragmentManager.kt

@@ -17,9 +17,14 @@
 package im.vector.riotx.core.extensions
 
 import androidx.fragment.app.FragmentTransaction
+import im.vector.matrix.android.api.extensions.tryThis
 
 inline fun androidx.fragment.app.FragmentManager.commitTransactionNow(func: FragmentTransaction.() -> FragmentTransaction) {
-    beginTransaction().func().commitNow()
+    // Could throw and make the app crash
+    // e.g sharedActionViewModel.observe()
+    tryThis("Failed to commitTransactionNow") {
+        beginTransaction().func().commitNow()
+    }
 }
 
 inline fun androidx.fragment.app.FragmentManager.commitTransaction(func: FragmentTransaction.() -> FragmentTransaction) {

vector/src/main/java/im/vector/riotx/core/extensions/Session.kt

@@ -38,10 +38,6 @@ fun Session.configureAndStart(context: Context,
     startSyncing(context)
     refreshPushers()
     pushRuleTriggerListener.startWithSession(this)
-
-    // TODO P1 From HomeActivity
-    // @Inject lateinit var incomingVerificationRequestHandler: IncomingVerificationRequestHandler
-    // @Inject lateinit var keyRequestHandler: KeyRequestHandler
 }
 
 fun Session.startSyncing(context: Context) {

vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt

@@ -165,6 +165,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        Timber.i("onCreate Activity ${this.javaClass.simpleName}")
         val vectorComponent = getVectorComponent()
         screenComponent = DaggerScreenComponent.factory().create(vectorComponent, this)
         val timeForInjection = measureTimeMillis {
@@ -252,6 +253,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
     override fun onDestroy() {
         super.onDestroy()
+        Timber.i("onDestroy Activity ${this.javaClass.simpleName}")
         unBinder?.unbind()
         unBinder = null
 
@@ -279,6 +281,7 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
 
     override fun onPause() {
         super.onPause()
+        Timber.i("onPause Activity ${this.javaClass.simpleName}")
 
         rageShake.stop()
 

vector/src/main/java/im/vector/riotx/core/platform/VectorBaseBottomSheetDialogFragment.kt

@@ -34,6 +34,7 @@ import com.airbnb.mvrx.MvRxViewId
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.jakewharton.rxbinding3.view.clicks
 import im.vector.riotx.core.di.DaggerScreenComponent
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.utils.DimensionConverter
@@ -41,6 +42,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import timber.log.Timber
+import java.util.concurrent.TimeUnit
 
 /**
  * Add MvRx capabilities to bottomsheetdialog (like BaseMvRxFragment)
@@ -169,6 +171,18 @@ abstract class VectorBaseBottomSheetDialogFragment : BottomSheetDialogFragment()
         return this
     }
 
+    /* ==========================================================================================
+     * Views
+     * ========================================================================================== */
+
+    protected fun View.debouncedClicks(onClicked: () -> Unit) {
+        clicks()
+                .throttleFirst(300, TimeUnit.MILLISECONDS)
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe { onClicked() }
+                .disposeOnDestroyView()
+    }
+
     /* ==========================================================================================
      * ViewEvents
      * ========================================================================================== */

vector/src/main/java/im/vector/riotx/core/services/BluetoothHeadsetReceiver.kt

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotx.core.services
+
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothClass
+import android.bluetooth.BluetoothDevice
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import java.lang.ref.WeakReference
+
+class BluetoothHeadsetReceiver : BroadcastReceiver() {
+
+    interface EventListener {
+        fun onBTHeadsetEvent(event: BTHeadsetPlugEvent)
+    }
+
+    var delegate: WeakReference<EventListener>? = null
+
+    data class BTHeadsetPlugEvent(
+            val plugged: Boolean,
+            val headsetName: String?,
+            /**
+             * BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE
+             * BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO
+             * AUDIO_VIDEO_WEARABLE_HEADSET
+             */
+            val deviceClass: Int
+    )
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        // This intent will have 3 extras:
+        //  EXTRA_CONNECTION_STATE - The current connection state
+        //  EXTRA_PREVIOUS_CONNECTION_STATE}- The previous connection state.
+        //  BluetoothDevice#EXTRA_DEVICE - The remote device.
+        // EXTRA_CONNECTION_STATE  or EXTRA_PREVIOUS_CONNECTION_STATE can be any of
+        // STATE_DISCONNECTED}, STATE_CONNECTING, STATE_CONNECTED, STATE_DISCONNECTING
+
+        val headsetConnected = when (intent?.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE, -1)) {
+            BluetoothAdapter.STATE_CONNECTED    -> true
+            BluetoothAdapter.STATE_DISCONNECTED -> false
+            else                                -> return // ignore intermediate states
+        }
+
+        val device = intent.getParcelableExtra<BluetoothDevice>(BluetoothDevice.EXTRA_DEVICE)
+        val deviceName = device?.name
+        when (device?.bluetoothClass?.deviceClass) {
+            BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE,
+            BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO,
+            BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET -> {
+                // filter only device that we care about for
+                delegate?.get()?.onBTHeadsetEvent(
+                        BTHeadsetPlugEvent(
+                                plugged = headsetConnected,
+                                headsetName = deviceName,
+                                deviceClass = device.bluetoothClass.deviceClass
+                        )
+                )
+            }
+            else                                               -> return
+        }
+    }
+
+    companion object {
+        fun createAndRegister(context: Context, listener: EventListener): BluetoothHeadsetReceiver {
+            val receiver = BluetoothHeadsetReceiver()
+            receiver.delegate = WeakReference(listener)
+            context.registerReceiver(receiver, IntentFilter(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED))
+            return receiver
+        }
+
+        fun unRegister(context: Context, receiver: BluetoothHeadsetReceiver) {
+            context.unregisterReceiver(receiver)
+        }
+    }
+}

vector/src/main/java/im/vector/riotx/core/services/CallRingPlayer.kt

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotx.core.services
+
+import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioManager
+import android.media.MediaPlayer
+import android.os.Build
+import im.vector.riotx.R
+import timber.log.Timber
+
+class CallRingPlayer(
+        context: Context
+) {
+
+    private val applicationContext = context.applicationContext
+
+    private var player: MediaPlayer? = null
+
+    fun start() {
+        val audioManager: AudioManager = applicationContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+        player?.release()
+        player = createPlayer()
+
+        // Check if sound is enabled
+        val ringerMode = audioManager.ringerMode
+        if (player != null && ringerMode == AudioManager.RINGER_MODE_NORMAL) {
+            try {
+                if (player?.isPlaying == false) {
+                    player?.start()
+                    Timber.v("## VOIP Starting ringing")
+                } else {
+                    Timber.v("## VOIP already playing")
+                }
+            } catch (failure: Throwable) {
+                Timber.e(failure, "## VOIP Failed to start ringing")
+                player = null
+            }
+        } else {
+            Timber.v("## VOIP Can't play $player ode $ringerMode")
+        }
+    }
+
+    fun stop() {
+        player?.release()
+        player = null
+    }
+
+    private fun createPlayer(): MediaPlayer? {
+        try {
+            val mediaPlayer = MediaPlayer.create(applicationContext, R.raw.ring)
+
+            mediaPlayer.setOnErrorListener(MediaPlayerErrorListener())
+            mediaPlayer.isLooping = true
+            if (Build.VERSION.SDK_INT <= 21) {
+                @Suppress("DEPRECATION")
+                mediaPlayer.setAudioStreamType(AudioManager.STREAM_RING)
+            } else {
+                mediaPlayer.setAudioAttributes(AudioAttributes.Builder()
+                        .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
+                        .setUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING)
+                        .build())
+            }
+            return mediaPlayer
+        } catch (failure: Throwable) {
+            Timber.e(failure, "Failed to create Call ring player")
+            return null
+        }
+    }
+
+    inner class MediaPlayerErrorListener : MediaPlayer.OnErrorListener {
+        override fun onError(mp: MediaPlayer, what: Int, extra: Int): Boolean {
+            Timber.w("onError($mp, $what, $extra")
+            player = null
+            return false
+        }
+    }
+}

vector/src/main/java/im/vector/riotx/core/services/CallService.kt

@@ -1,5 +1,6 @@
 /*
  * Copyright 2019 New Vector Ltd
+ * Copyright 2020 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,53 +15,119 @@
  * limitations under the License.
  */
 
-@file:Suppress("UNUSED_PARAMETER")
-
 package im.vector.riotx.core.services
 
 import android.content.Context
 import android.content.Intent
+import android.os.Binder
+import android.support.v4.media.session.MediaSessionCompat
+import android.view.KeyEvent
 import androidx.core.content.ContextCompat
+import androidx.media.session.MediaButtonReceiver
 import im.vector.riotx.core.extensions.vectorComponent
+import im.vector.riotx.features.call.WebRtcPeerConnectionManager
+import im.vector.riotx.features.call.telecom.CallConnection
 import im.vector.riotx.features.notifications.NotificationUtils
 import timber.log.Timber
 
 /**
  * Foreground service to manage calls
  */
-class CallService : VectorService() {
+class CallService : VectorService(), WiredHeadsetStateReceiver.HeadsetEventListener, BluetoothHeadsetReceiver.EventListener {
 
-    /**
-     * call in progress (foreground notification)
-     */
-    private var mCallIdInProgress: String? = null
+    private val connections = mutableMapOf<String, CallConnection>()
 
     private lateinit var notificationUtils: NotificationUtils
+    private lateinit var webRtcPeerConnectionManager: WebRtcPeerConnectionManager
 
-    /**
-     * incoming (foreground notification)
-     */
-    private var mIncomingCallId: String? = null
+    private var callRingPlayer: CallRingPlayer? = null
+
+    private var wiredHeadsetStateReceiver: WiredHeadsetStateReceiver? = null
+    private var bluetoothHeadsetStateReceiver: BluetoothHeadsetReceiver? = null
+
+    // A media button receiver receives and helps translate hardware media playback buttons,
+    // such as those found on wired and wireless headsets, into the appropriate callbacks in your app
+    private var mediaSession: MediaSessionCompat? = null
+    private val mediaSessionButtonCallback = object : MediaSessionCompat.Callback() {
+        override fun onMediaButtonEvent(mediaButtonEvent: Intent?): Boolean {
+            val keyEvent = mediaButtonEvent?.getParcelableExtra<KeyEvent>(Intent.EXTRA_KEY_EVENT) ?: return false
+            if (keyEvent.keyCode == KeyEvent.KEYCODE_HEADSETHOOK) {
+                webRtcPeerConnectionManager.headSetButtonTapped()
+                return true
+            }
+            return false
+        }
+    }
 
     override fun onCreate() {
         super.onCreate()
         notificationUtils = vectorComponent().notificationUtils()
+        webRtcPeerConnectionManager = vectorComponent().webRtcPeerConnectionManager()
+        callRingPlayer = CallRingPlayer(applicationContext)
+        wiredHeadsetStateReceiver = WiredHeadsetStateReceiver.createAndRegister(this, this)
+        bluetoothHeadsetStateReceiver = BluetoothHeadsetReceiver.createAndRegister(this, this)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        callRingPlayer?.stop()
+        wiredHeadsetStateReceiver?.let { WiredHeadsetStateReceiver.unRegister(this, it) }
+        wiredHeadsetStateReceiver = null
+        bluetoothHeadsetStateReceiver?.let { BluetoothHeadsetReceiver.unRegister(this, it) }
+        bluetoothHeadsetStateReceiver = null
+        mediaSession?.release()
+        mediaSession = null
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        Timber.v("## VOIP onStartCommand $intent")
+        if (mediaSession == null) {
+            mediaSession = MediaSessionCompat(applicationContext, CallService::class.java.name).apply {
+                setCallback(mediaSessionButtonCallback)
+            }
+        }
         if (intent == null) {
             // Service started again by the system.
             // TODO What do we do here?
             return START_STICKY
         }
+        mediaSession?.let {
+            // This ensures that the correct callbacks to MediaSessionCompat.Callback
+            // will be triggered based on the incoming KeyEvent.
+            MediaButtonReceiver.handleIntent(it, intent)
+        }
 
         when (intent.action) {
-            ACTION_INCOMING_CALL -> displayIncomingCallNotification(intent)
-            ACTION_PENDING_CALL -> displayCallInProgressNotification(intent)
-            ACTION_NO_ACTIVE_CALL -> hideCallNotifications()
-            else ->
+            ACTION_INCOMING_RINGING_CALL -> {
+                mediaSession?.isActive = true
+                callRingPlayer?.start()
+                displayIncomingCallNotification(intent)
+            }
+            ACTION_OUTGOING_RINGING_CALL -> {
+                mediaSession?.isActive = true
+                callRingPlayer?.start()
+                displayOutgoingRingingCallNotification(intent)
+            }
+            ACTION_ONGOING_CALL          -> {
+                callRingPlayer?.stop()
+                displayCallInProgressNotification(intent)
+            }
+            ACTION_NO_ACTIVE_CALL        -> hideCallNotifications()
+            ACTION_CALL_CONNECTING       -> {
+                // lower notification priority
+                displayCallInProgressNotification(intent)
+                // stop ringing
+                callRingPlayer?.stop()
+            }
+            ACTION_ONGOING_CALL_BG       -> {
+                // there is an ongoing call but call activity is in background
+                displayCallOnGoingInBackground(intent)
+            }
+            else                         -> {
                 // Should not happen
+                callRingPlayer?.stop()
                 myStopSelf()
+            }
         }
 
         // We want the system to restore the service if killed
@@ -80,54 +147,65 @@ class CallService : VectorService() {
      * @param callId   the callId
      */
     private fun displayIncomingCallNotification(intent: Intent) {
-        Timber.v("displayIncomingCallNotification")
-
-        // TODO
-        /*
+        Timber.v("## VOIP displayIncomingCallNotification $intent")
 
         // the incoming call in progress is already displayed
-        if (!TextUtils.isEmpty(mIncomingCallId)) {
-            Timber.v("displayIncomingCallNotification : the incoming call in progress is already displayed")
-        } else if (!TextUtils.isEmpty(mCallIdInProgress)) {
-            Timber.v("displayIncomingCallNotification : a 'call in progress' notification is displayed")
-        } else if (null == CallsManager.getSharedInstance().activeCall) {
-            val callId = intent.getStringExtra(EXTRA_CALL_ID)
+//        if (!TextUtils.isEmpty(mIncomingCallId)) {
+//            Timber.v("displayIncomingCallNotification : the incoming call in progress is already displayed")
+//        } else if (!TextUtils.isEmpty(mCallIdInProgress)) {
+//            Timber.v("displayIncomingCallNotification : a 'call in progress' notification is displayed")
+//        } else
+// //            if (null == webRtcPeerConnectionManager.currentCall)
+//        {
+        val callId = intent.getStringExtra(EXTRA_CALL_ID)
 
-            Timber.v("displayIncomingCallNotification : display the dedicated notification")
-            val notification = NotificationUtils.buildIncomingCallNotification(
-                    this,
-                    intent.getBooleanExtra(EXTRA_IS_VIDEO, false),
-                    intent.getStringExtra(EXTRA_ROOM_NAME),
-                    intent.getStringExtra(EXTRA_MATRIX_ID),
-                    callId)
-            startForeground(NOTIFICATION_ID, notification)
+        Timber.v("displayIncomingCallNotification : display the dedicated notification")
+        val notification = notificationUtils.buildIncomingCallNotification(
+                intent.getBooleanExtra(EXTRA_IS_VIDEO, false),
+                intent.getStringExtra(EXTRA_ROOM_NAME) ?: "",
+                intent.getStringExtra(EXTRA_ROOM_ID) ?: "",
+                callId ?: "")
+        startForeground(NOTIFICATION_ID, notification)
 
-            mIncomingCallId = callId
+//            mIncomingCallId = callId
 
-            // turn the screen on for 3 seconds
-            if (Matrix.getInstance(VectorApp.getInstance())!!.pushManager.isScreenTurnedOn) {
-                try {
-                    val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
-                    val wl = pm.newWakeLock(
-                            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or PowerManager.ACQUIRE_CAUSES_WAKEUP,
-                            CallService::class.java.simpleName)
-                    wl.acquire(3000)
-                    wl.release()
-                } catch (re: RuntimeException) {
-                    Timber.e(re, "displayIncomingCallNotification : failed to turn screen on ")
-                }
+        // turn the screen on for 3 seconds
+//            if (Matrix.getInstance(VectorApp.getInstance())!!.pushManager.isScreenTurnedOn) {
+//                try {
+//                    val pm = getSystemService(Context.POWER_SERVICE) as PowerManager
+//                    val wl = pm.newWakeLock(
+//                            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or PowerManager.ACQUIRE_CAUSES_WAKEUP,
+//                            CallService::class.java.simpleName)
+//                    wl.acquire(3000)
+//                    wl.release()
+//                } catch (re: RuntimeException) {
+//                    Timber.e(re, "displayIncomingCallNotification : failed to turn screen on ")
+//                }
+//
+//            }
+//        }
+//        else {
+//            Timber.i("displayIncomingCallNotification : do not display the incoming call notification because there is a pending call")
+//        }
+    }
 
-            }
-        } else {
-            Timber.i("displayIncomingCallNotification : do not display the incoming call notification because there is a pending call")
-        }// test if there is no active call
-        */
+    private fun displayOutgoingRingingCallNotification(intent: Intent) {
+        val callId = intent.getStringExtra(EXTRA_CALL_ID)
+
+        Timber.v("displayOutgoingCallNotification : display the dedicated notification")
+        val notification = notificationUtils.buildOutgoingRingingCallNotification(
+                intent.getBooleanExtra(EXTRA_IS_VIDEO, false),
+                intent.getStringExtra(EXTRA_ROOM_NAME) ?: "",
+                intent.getStringExtra(EXTRA_ROOM_ID) ?: "",
+                callId ?: "")
+        startForeground(NOTIFICATION_ID, notification)
     }
 
     /**
      * Display a call in progress notification.
      */
     private fun displayCallInProgressNotification(intent: Intent) {
+        Timber.v("## VOIP displayCallInProgressNotification")
         val callId = intent.getStringExtra(EXTRA_CALL_ID) ?: ""
 
         val notification = notificationUtils.buildPendingCallNotification(
@@ -139,7 +217,27 @@ class CallService : VectorService() {
 
         startForeground(NOTIFICATION_ID, notification)
 
-        mCallIdInProgress = callId
+        // mCallIdInProgress = callId
+    }
+
+    /**
+     * Display a call in progress notification.
+     */
+    private fun displayCallOnGoingInBackground(intent: Intent) {
+        Timber.v("## VOIP displayCallInProgressNotification")
+        val callId = intent.getStringExtra(EXTRA_CALL_ID) ?: ""
+
+        val notification = notificationUtils.buildPendingCallNotification(
+                isVideo = intent.getBooleanExtra(EXTRA_IS_VIDEO, false),
+                roomName = intent.getStringExtra(EXTRA_ROOM_NAME) ?: "",
+                roomId = intent.getStringExtra(EXTRA_ROOM_ID) ?: "",
+                matrixId = intent.getStringExtra(EXTRA_MATRIX_ID) ?: "",
+                callId = callId,
+                fromBg = true)
+
+        startForeground(NOTIFICATION_ID, notification)
+
+        // mCallIdInProgress = callId
     }
 
     /**
@@ -148,18 +246,28 @@ class CallService : VectorService() {
     private fun hideCallNotifications() {
         val notification = notificationUtils.buildCallEndedNotification()
 
+        mediaSession?.isActive = false
         // It's mandatory to startForeground to avoid crash
         startForeground(NOTIFICATION_ID, notification)
 
         myStopSelf()
     }
 
+    fun addConnection(callConnection: CallConnection) {
+        connections[callConnection.callId] = callConnection
+    }
+
     companion object {
         private const val NOTIFICATION_ID = 6480
 
-        private const val ACTION_INCOMING_CALL = "im.vector.riotx.core.services.CallService.INCOMING_CALL"
-        private const val ACTION_PENDING_CALL = "im.vector.riotx.core.services.CallService.PENDING_CALL"
+        private const val ACTION_INCOMING_RINGING_CALL = "im.vector.riotx.core.services.CallService.ACTION_INCOMING_RINGING_CALL"
+        private const val ACTION_OUTGOING_RINGING_CALL = "im.vector.riotx.core.services.CallService.ACTION_OUTGOING_RINGING_CALL"
+        private const val ACTION_CALL_CONNECTING = "im.vector.riotx.core.services.CallService.ACTION_CALL_CONNECTING"
+        private const val ACTION_ONGOING_CALL = "im.vector.riotx.core.services.CallService.ACTION_ONGOING_CALL"
+        private const val ACTION_ONGOING_CALL_BG = "im.vector.riotx.core.services.CallService.ACTION_ONGOING_CALL_BG"
         private const val ACTION_NO_ACTIVE_CALL = "im.vector.riotx.core.services.CallService.NO_ACTIVE_CALL"
+//        private const val ACTION_ACTIVITY_VISIBLE = "im.vector.riotx.core.services.CallService.ACTION_ACTIVITY_VISIBLE"
+//        private const val ACTION_STOP_RINGING = "im.vector.riotx.core.services.CallService.ACTION_STOP_RINGING"
 
         private const val EXTRA_IS_VIDEO = "EXTRA_IS_VIDEO"
         private const val EXTRA_ROOM_NAME = "EXTRA_ROOM_NAME"
@@ -167,15 +275,53 @@ class CallService : VectorService() {
         private const val EXTRA_MATRIX_ID = "EXTRA_MATRIX_ID"
         private const val EXTRA_CALL_ID = "EXTRA_CALL_ID"
 
-        fun onIncomingCall(context: Context,
-                           isVideo: Boolean,
-                           roomName: String,
-                           roomId: String,
-                           matrixId: String,
-                           callId: String) {
+        fun onIncomingCallRinging(context: Context,
+                                  isVideo: Boolean,
+                                  roomName: String,
+                                  roomId: String,
+                                  matrixId: String,
+                                  callId: String) {
             val intent = Intent(context, CallService::class.java)
                     .apply {
-                        action = ACTION_INCOMING_CALL
+                        action = ACTION_INCOMING_RINGING_CALL
+                        putExtra(EXTRA_IS_VIDEO, isVideo)
+                        putExtra(EXTRA_ROOM_NAME, roomName)
+                        putExtra(EXTRA_ROOM_ID, roomId)
+                        putExtra(EXTRA_MATRIX_ID, matrixId)
+                        putExtra(EXTRA_CALL_ID, callId)
+                    }
+
+            ContextCompat.startForegroundService(context, intent)
+        }
+
+        fun onOnGoingCallBackground(context: Context,
+                                    isVideo: Boolean,
+                                    roomName: String,
+                                    roomId: String,
+                                    matrixId: String,
+                                    callId: String) {
+            val intent = Intent(context, CallService::class.java)
+                    .apply {
+                        action = ACTION_ONGOING_CALL_BG
+                        putExtra(EXTRA_IS_VIDEO, isVideo)
+                        putExtra(EXTRA_ROOM_NAME, roomName)
+                        putExtra(EXTRA_ROOM_ID, roomId)
+                        putExtra(EXTRA_MATRIX_ID, matrixId)
+                        putExtra(EXTRA_CALL_ID, callId)
+                    }
+
+            ContextCompat.startForegroundService(context, intent)
+        }
+
+        fun onOutgoingCallRinging(context: Context,
+                                  isVideo: Boolean,
+                                  roomName: String,
+                                  roomId: String,
+                                  matrixId: String,
+                                  callId: String) {
+            val intent = Intent(context, CallService::class.java)
+                    .apply {
+                        action = ACTION_OUTGOING_RINGING_CALL
                         putExtra(EXTRA_IS_VIDEO, isVideo)
                         putExtra(EXTRA_ROOM_NAME, roomName)
                         putExtra(EXTRA_ROOM_ID, roomId)
@@ -194,7 +340,7 @@ class CallService : VectorService() {
                           callId: String) {
             val intent = Intent(context, CallService::class.java)
                     .apply {
-                        action = ACTION_PENDING_CALL
+                        action = ACTION_ONGOING_CALL
                         putExtra(EXTRA_IS_VIDEO, isVideo)
                         putExtra(EXTRA_ROOM_NAME, roomName)
                         putExtra(EXTRA_ROOM_ID, roomId)
@@ -214,4 +360,20 @@ class CallService : VectorService() {
             ContextCompat.startForegroundService(context, intent)
         }
     }
+
+    inner class CallServiceBinder : Binder() {
+        fun getCallService(): CallService {
+            return this@CallService
+        }
+    }
+
+    override fun onHeadsetEvent(event: WiredHeadsetStateReceiver.HeadsetPlugEvent) {
+        Timber.v("## VOIP: onHeadsetEvent $event")
+        webRtcPeerConnectionManager.onWiredDeviceEvent(event)
+    }
+
+    override fun onBTHeadsetEvent(event: BluetoothHeadsetReceiver.BTHeadsetPlugEvent) {
+        Timber.v("## VOIP: onBTHeadsetEvent $event")
+        webRtcPeerConnectionManager.onWirelessDeviceEvent(event)
+    }
 }

vector/src/main/java/im/vector/riotx/core/services/WiredHeadsetStateReceiver.kt

@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotx.core.services
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.media.AudioManager
+import android.os.Build
+import timber.log.Timber
+import java.lang.ref.WeakReference
+
+/**
+ * Dynamic broadcast receiver to detect headset plug/unplug
+ */
+class WiredHeadsetStateReceiver : BroadcastReceiver() {
+
+    interface HeadsetEventListener {
+        fun onHeadsetEvent(event: HeadsetPlugEvent)
+    }
+
+    var delegate: WeakReference<HeadsetEventListener>? = null
+
+    data class HeadsetPlugEvent(
+            val plugged: Boolean,
+            val headsetName: String?,
+            val hasMicrophone: Boolean
+    )
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        // The intent will have the following extra values:
+        //  state  0 for unplugged, 1 for plugged
+        //  name  Headset type, human readable string
+        //  microphone 1 if headset has a microphone, 0 otherwise
+
+        val isPlugged = when (intent?.getIntExtra("state", -1)) {
+            0    -> false
+            1    -> true
+            else -> return Unit.also {
+                Timber.v("## VOIP WiredHeadsetStateReceiver invalid state")
+            }
+        }
+        val hasMicrophone = when (intent.getIntExtra("microphone", -1)) {
+            1    -> true
+            else -> false
+        }
+
+        delegate?.get()?.onHeadsetEvent(
+                HeadsetPlugEvent(plugged = isPlugged, headsetName = intent.getStringExtra("name"), hasMicrophone = hasMicrophone)
+        )
+    }
+
+    companion object {
+        fun createAndRegister(context: Context, listener: HeadsetEventListener): WiredHeadsetStateReceiver {
+            val receiver = WiredHeadsetStateReceiver()
+            receiver.delegate = WeakReference(listener)
+            val action = if (Build.VERSION.SDK_INT >= 21) {
+                AudioManager.ACTION_HEADSET_PLUG
+            } else {
+                Intent.ACTION_HEADSET_PLUG
+            }
+            context.registerReceiver(receiver, IntentFilter(action))
+            return receiver
+        }
+
+        fun unRegister(context: Context, receiver: WiredHeadsetStateReceiver) {
+            context.unregisterReceiver(receiver)
+        }
+    }
+}