Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-client-android
- Activity
- Members
- Labels
- Releases
- Model registry
- Incidents

Snippets Groups Projects

b8f112fa

Commit b8f112fa authored 3 years ago by Adrien Béraud Committed by Maxime Callet 3 years ago

Downloads
- Patches
- Plain Diff

Call: simplify conference logic

Change-Id: I9eec589d734ed08ee2fe96e1244a14c3cdcee487

parent 85a5a060

No related branches found

No related tags found

No related merge requests found

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

ring-android/app/src/main/java/cx/ring/adapters/ConfParticipantAdapter.kt 38 additions, 31 deletions

.../src/main/java/cx/ring/adapters/ConfParticipantAdapter.kt
ring-android/app/src/main/java/cx/ring/fragments/CallFragment.kt 133 additions, 148 deletions

...droid/app/src/main/java/cx/ring/fragments/CallFragment.kt
ring-android/app/src/main/java/cx/ring/tv/call/TVCallFragment.kt 34 additions, 76 deletions

...droid/app/src/main/java/cx/ring/tv/call/TVCallFragment.kt
ring-android/app/src/main/java/cx/ring/tv/contact/TVContactPresenter.kt 1 addition, 2 deletions

...pp/src/main/java/cx/ring/tv/contact/TVContactPresenter.kt
ring-android/app/src/main/res/layout/frag_call.xml 0 additions, 1 deletion

ring-android/app/src/main/res/layout/frag_call.xml
ring-android/app/src/main/res/layout/item_conference_participant.xml 4 additions, 3 deletions

...d/app/src/main/res/layout/item_conference_participant.xml
ring-android/libjamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt 66 additions, 138 deletions

...jamiclient/src/main/kotlin/net/jami/call/CallPresenter.kt
ring-android/libjamiclient/src/main/kotlin/net/jami/call/CallView.kt 1 addition, 4 deletions

...d/libjamiclient/src/main/kotlin/net/jami/call/CallView.kt
ring-android/libjamiclient/src/main/kotlin/net/jami/model/Conference.kt 8 additions, 8 deletions

...ibjamiclient/src/main/kotlin/net/jami/model/Conference.kt
ring-android/libjamiclient/src/main/kotlin/net/jami/services/AccountService.kt 4 additions, 1 deletion

...lient/src/main/kotlin/net/jami/services/AccountService.kt
ring-android/libjamiclient/src/main/kotlin/net/jami/services/CallService.kt 2 additions, 10 deletions

...miclient/src/main/kotlin/net/jami/services/CallService.kt

with 291 additions and 422 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment