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 a604bb1bb1503551296de19ba59d382699131d4c..0a423dcf75ec1f199d79a183f0cd35ead3992f2c 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 0aa9c511e000f573702c2eb912e8c75232de4f92..e178269110321b459f3d7363f543ee78223a3563 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 4c052994325df3af1c34f12e7440c7c34f4899b1..30c28bf0ea785b7150457f86d5f5d4481ddb229c 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); }