diff --git a/src/org/sflphone/account/AccountCredentials.java b/src/org/sflphone/account/AccountCredentials.java
index caca987f0322190873631041eb9f1ac156fe7e5a..0f13e506bb438c263dba4db8686285e04614290e 100644
--- a/src/org/sflphone/account/AccountCredentials.java
+++ b/src/org/sflphone/account/AccountCredentials.java
@@ -36,7 +36,6 @@ public class AccountCredentials implements AccountDetail {
for (AccountDetail.PreferenceEntry p : privateArray) {
p.mValue = pref.get(p.mKey);
- Log.i(TAG, "Creating "+pref.get(p.mKey));
}
@@ -64,7 +63,6 @@ public class AccountCredentials implements AccountDetail {
ArrayList<String> valueList = new ArrayList<String>();
for (AccountDetail.PreferenceEntry p : privateArray) {
- Log.i(TAG, "" + p.mValue);
valueList.add(p.mValue);
}
diff --git a/src/org/sflphone/account/AccountDetailSrtp.java b/src/org/sflphone/account/AccountDetailSrtp.java
index 016e7133c6f1bf0867f3c18093cc67739166b77e..7f0cc752b022a8b8aeb8723fb2daa0eb56581435 100644
--- a/src/org/sflphone/account/AccountDetailSrtp.java
+++ b/src/org/sflphone/account/AccountDetailSrtp.java
@@ -28,13 +28,13 @@ import org.sflphone.R;
import android.util.Log;
-public class AccountDetailSrtp implements AccountDetail{
+public class AccountDetailSrtp implements AccountDetail {
private static final String TAG = "AccountDetailSrtp";
-
+
public static final String CONFIG_SRTP_ENABLE = "SRTP.enable";
public static final String CONFIG_SRTP_KEY_EXCHANGE = "SRTP.keyExchange";
- public static final String CONFIG_SRTP_ENCRYPTION_ALGO = "SRTP.encryptionAlgorithm"; // Provided by ccRTP,0=NULL,1=AESCM,2=AESF8
+ public static final String CONFIG_SRTP_ENCRYPTION_ALGO = "SRTP.encryptionAlgorithm"; // Provided by ccRTP,0=NULL,1=AESCM,2=AESF8
public static final String CONFIG_SRTP_RTP_FALLBACK = "SRTP.rtpFallback";
public static final String CONFIG_ZRTP_HELLO_HASH = "ZRTP.helloHashEnable";
public static final String CONFIG_ZRTP_DISPLAY_SAS = "ZRTP.displaySAS";
@@ -43,8 +43,7 @@ public class AccountDetailSrtp implements AccountDetail{
private ArrayList<AccountDetail.PreferenceEntry> privateArray;
- public static ArrayList<AccountDetail.PreferenceEntry> getPreferenceEntries()
- {
+ public static ArrayList<AccountDetail.PreferenceEntry> getPreferenceEntries() {
ArrayList<AccountDetail.PreferenceEntry> preference = new ArrayList<AccountDetail.PreferenceEntry>();
preference.add(new PreferenceEntry(CONFIG_SRTP_ENABLE, R.string.account_srtp_enabled_label, true));
@@ -56,62 +55,53 @@ public class AccountDetailSrtp implements AccountDetail{
preference.add(new PreferenceEntry(CONFIG_ZRTP_NOT_SUPP_WARNING, R.string.account_not_supported_warning_label, true));
preference.add(new PreferenceEntry(CONFIG_ZRTP_DISPLAY_SAS_ONCE, R.string.account_display_sas_once_label, true));
- return preference;
+ return preference;
}
- public AccountDetailSrtp()
- {
+ public AccountDetailSrtp() {
privateArray = getPreferenceEntries();
}
- public AccountDetailSrtp(HashMap<String, String> pref)
- {
+ public AccountDetailSrtp(HashMap<String, String> pref) {
privateArray = getPreferenceEntries();
- for(AccountDetail.PreferenceEntry p : privateArray) {
-
+ for (AccountDetail.PreferenceEntry p : privateArray) {
p.mValue = pref.get(p.mKey);
- Log.i(TAG,p.mKey+" : "+p.mValue);
}
}
- public AccountDetailSrtp(ArrayList<String> pref)
- {
+ public AccountDetailSrtp(ArrayList<String> pref) {
privateArray = getPreferenceEntries();
- if(pref.size() != privateArray.size()) {
+ if (pref.size() != privateArray.size()) {
Log.i(TAG, "Error list are not of equal size");
- }
- else {
+ } else {
int index = 0;
- for(String s : pref) {
+ for (String s : pref) {
privateArray.get(index).mValue = s;
index++;
}
}
}
- public ArrayList<AccountDetail.PreferenceEntry> getDetailValues()
- {
+ public ArrayList<AccountDetail.PreferenceEntry> getDetailValues() {
return privateArray;
}
- public ArrayList<String> getValuesOnly()
- {
+ public ArrayList<String> getValuesOnly() {
ArrayList<String> valueList = new ArrayList<String>();
- for(AccountDetail.PreferenceEntry p : privateArray) {
+ for (AccountDetail.PreferenceEntry p : privateArray) {
valueList.add(p.mValue);
}
return valueList;
}
- public HashMap<String, String> getDetailsHashMap()
- {
+ public HashMap<String, String> getDetailsHashMap() {
HashMap<String, String> map = new HashMap<String, String>();
- for(AccountDetail.PreferenceEntry p : privateArray) {
- if(p.mValue == null){
+ for (AccountDetail.PreferenceEntry p : privateArray) {
+ if (p.mValue == null) {
map.put(p.mKey, "");
} else {
map.put(p.mKey, p.mValue);
@@ -121,12 +111,11 @@ public class AccountDetailSrtp implements AccountDetail{
return map;
}
- public String getDetailString(String key)
- {
+ public String getDetailString(String key) {
String value = "";
- for(AccountDetail.PreferenceEntry p : privateArray) {
- if(p.mKey.equals(key)) {
+ for (AccountDetail.PreferenceEntry p : privateArray) {
+ if (p.mKey.equals(key)) {
value = p.mValue;
return value;
}
@@ -135,20 +124,19 @@ public class AccountDetailSrtp implements AccountDetail{
return value;
}
- public void setDetailString(String key, String newValue)
- {
- for(int i = 0 ; i < privateArray.size() ; ++i) {
+ public void setDetailString(String key, String newValue) {
+ for (int i = 0; i < privateArray.size(); ++i) {
PreferenceEntry p = privateArray.get(i);
- if(p.mKey.equals(key)) {
+ if (p.mKey.equals(key)) {
privateArray.get(i).mValue = newValue;
}
}
-
+
}
public boolean getDetailBoolean(String srtpParam) {
- for(AccountDetail.PreferenceEntry p : privateArray) {
- if(p.mKey.equals(srtpParam)) {
+ for (AccountDetail.PreferenceEntry p : privateArray) {
+ if (p.mKey.equals(srtpParam)) {
return p.mValue.contentEquals("true");
}
}
diff --git a/src/org/sflphone/account/AccountDetailTls.java b/src/org/sflphone/account/AccountDetailTls.java
index d08dbfa36c29020588590ee791a606f3f3a41aed..3c45b9e132c02fb766396508bc8b440a7007a099 100644
--- a/src/org/sflphone/account/AccountDetailTls.java
+++ b/src/org/sflphone/account/AccountDetailTls.java
@@ -79,9 +79,7 @@ public class AccountDetailTls implements AccountDetail {
privateArray = getPreferenceEntries();
for (AccountDetail.PreferenceEntry p : privateArray) {
-
p.mValue = pref.get(p.mKey);
- Log.i(TAG, p.mKey + " =" + p.mValue);
}
}
diff --git a/src/org/sflphone/model/Account.java b/src/org/sflphone/model/Account.java
index 36a1d1ecf819f3be87d056bb5fac942224101c6c..e668cebb6875ddaf4bcbd7f5dfcbac9b95ea3344 100644
--- a/src/org/sflphone/model/Account.java
+++ b/src/org/sflphone/model/Account.java
@@ -58,8 +58,6 @@ public class Account extends java.util.Observable implements Parcelable {
accountID = bAccountID;
basicDetails = new AccountDetailBasic(details);
advancedDetails = new AccountDetailAdvanced(details);
-
- Log.e("Account","details.get(AccountDetailSrtp.CONFIG_SRTP_ENABLE) "+details.get(AccountDetailSrtp.CONFIG_SRTP_ENABLE));
srtpDetails = new AccountDetailSrtp(details);
tlsDetails = new AccountDetailTls(details);
credentialsDetails = new ArrayList<AccountCredentials>();
diff --git a/src/org/sflphone/service/SipService.java b/src/org/sflphone/service/SipService.java
index 0ff4350ed6511ef5e5c42d59ef298639619b1814..3ebab129361eeca8df533fc7abe0609bed468016 100644
--- a/src/org/sflphone/service/SipService.java
+++ b/src/org/sflphone/service/SipService.java
@@ -34,7 +34,6 @@ import java.util.Map.Entry;
import java.util.Random;
import org.sflphone.R;
-import org.sflphone.account.AccountCredentials;
import org.sflphone.account.AccountDetailsHandler;
import org.sflphone.account.CallDetailsHandler;
import org.sflphone.account.HistoryHandler;
@@ -231,9 +230,7 @@ public class SipService extends Service {
System.loadLibrary("ccgnu2");
System.loadLibrary("crypto");
System.loadLibrary("ssl");
- System.loadLibrary("sndfile");
System.loadLibrary("ccrtp1");
- System.loadLibrary("pcre");
System.loadLibrary("samplerate");
System.loadLibrary("speexresampler");
System.loadLibrary("sflphone");
@@ -1287,12 +1284,6 @@ public class SipService extends Service {
Log.i(TAG, "SipService.getCredentials() thread running...");
VectMap map = configurationManagerJNI.getCredentials(accountID);
ArrayList<HashMap<String, String>> result = AccountDetailsHandler.convertCredentialsToNative(map);
- Log.i("CREDS","----------------- GET CREDENTIALS:");
- for (HashMap<String, String> test : result) {
- Log.i("CREDS","CONFIG_ACCOUNT_USERNAME:"+ test.get(AccountCredentials.CONFIG_ACCOUNT_USERNAME));
- Log.i("CREDS","CONFIG_ACCOUNT_PASSWORD:"+ test.get(AccountCredentials.CONFIG_ACCOUNT_PASSWORD));
- Log.i("CREDS","CONFIG_ACCOUNT_REALM:"+ test.get(AccountCredentials.CONFIG_ACCOUNT_REALM));
- }
return result;
}
}
@@ -1310,13 +1301,7 @@ public class SipService extends Service {
@Override
protected void doRun() throws SameThreadException, RemoteException {
Log.i(TAG, "SipService.setCredentials() thread running...");
- Log.i("CREDS","----------------- GET CREDENTIALS:");
ArrayList<HashMap<String, String>> list = (ArrayList<HashMap<String, String>>) creds;
- for (HashMap<String, String> test : list) {
- Log.i("CREDS","CONFIG_ACCOUNT_USERNAME:"+ test.get(AccountCredentials.CONFIG_ACCOUNT_USERNAME));
- Log.i("CREDS","CONFIG_ACCOUNT_PASSWORD:"+ test.get(AccountCredentials.CONFIG_ACCOUNT_PASSWORD));
- Log.i("CREDS","CONFIG_ACCOUNT_REALM:"+ test.get(AccountCredentials.CONFIG_ACCOUNT_REALM));
- }
configurationManagerJNI.setCredentials(accountID, AccountDetailsHandler.convertCredentialsToSwig(creds));;
}
});