From 49b5ec88711aa81d51bc485d27a392500694b854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 21 Oct 2015 15:24:46 -0400
Subject: [PATCH] model: add missing apis
Issue: #78218
Change-Id: Ia3b7d7cb94e313b115a14afb3d74b3fff08cf8aa
---
.../app/src/main/java/cx/ring/model/Conference.java | 8 ++++++++
ring-android/app/src/main/java/cx/ring/model/SipCall.java | 4 ++++
.../app/src/main/java/cx/ring/model/account/Account.java | 8 ++++++++
3 files changed, 20 insertions(+)
diff --git a/ring-android/app/src/main/java/cx/ring/model/Conference.java b/ring-android/app/src/main/java/cx/ring/model/Conference.java
index a604bb1bb..0a423dcf7 100644
--- a/ring-android/app/src/main/java/cx/ring/model/Conference.java
+++ b/ring-android/app/src/main/java/cx/ring/model/Conference.java
@@ -86,6 +86,14 @@ public class Conference implements Parcelable {
}
}
+ public int getCallState(String callID) {
+ if(id.contentEquals(callID))
+ return mConfState;
+ else {
+ return getCallById(callID).getCallState();
+ }
+ }
+
public void setCallState(String confID, String newState) {
if (newState.equals("ACTIVE_ATTACHED")) {
setCallState(confID, state.ACTIVE_ATTACHED);
diff --git a/ring-android/app/src/main/java/cx/ring/model/SipCall.java b/ring-android/app/src/main/java/cx/ring/model/SipCall.java
index 0aa9c511e..e17826911 100644
--- a/ring-android/app/src/main/java/cx/ring/model/SipCall.java
+++ b/ring-android/app/src/main/java/cx/ring/model/SipCall.java
@@ -123,6 +123,10 @@ public class SipCall implements Parcelable {
return args;
}
+ public int getCallState() {
+ return mCallState;
+ }
+
public interface Direction {
int INCOMING = 1;
int OUTGOING = 2;
diff --git a/ring-android/app/src/main/java/cx/ring/model/account/Account.java b/ring-android/app/src/main/java/cx/ring/model/account/Account.java
index 4c0529943..30c28bf0e 100644
--- a/ring-android/app/src/main/java/cx/ring/model/account/Account.java
+++ b/ring-android/app/src/main/java/cx/ring/model/account/Account.java
@@ -83,6 +83,14 @@ public class Account extends java.util.Observable implements Parcelable {
basicDetails.setDetailString(AccountDetailBasic.CONFIG_ACCOUNT_HOSTNAME, host);
}
+ public String getProxy() {
+ return basicDetails.getDetailString(AccountDetailBasic.CONFIG_ACCOUNT_ROUTESET);
+ }
+
+ public void setProxy(String proxy) {
+ basicDetails.setDetailString(AccountDetailBasic.CONFIG_ACCOUNT_ROUTESET, proxy);
+ }
+
public String getRegistered_state() {
return volatileDetails.getDetailString(AccountDetailVolatile.CONFIG_ACCOUNT_REGISTRATION_STATUS);
}
--
GitLab