Skip to content
Snippets Groups Projects
Commit 5f1502e3 authored by Alexandre Lision's avatar Alexandre Lision
Browse files

log: reduce log

parent 950e9d62
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,6 @@ public class AccountCredentials implements AccountDetail { ...@@ -36,7 +36,6 @@ public class AccountCredentials implements AccountDetail {
for (AccountDetail.PreferenceEntry p : privateArray) { for (AccountDetail.PreferenceEntry p : privateArray) {
p.mValue = pref.get(p.mKey); p.mValue = pref.get(p.mKey);
Log.i(TAG, "Creating "+pref.get(p.mKey));
} }
...@@ -64,7 +63,6 @@ public class AccountCredentials implements AccountDetail { ...@@ -64,7 +63,6 @@ public class AccountCredentials implements AccountDetail {
ArrayList<String> valueList = new ArrayList<String>(); ArrayList<String> valueList = new ArrayList<String>();
for (AccountDetail.PreferenceEntry p : privateArray) { for (AccountDetail.PreferenceEntry p : privateArray) {
Log.i(TAG, "" + p.mValue);
valueList.add(p.mValue); valueList.add(p.mValue);
} }
......
...@@ -43,8 +43,7 @@ public class AccountDetailSrtp implements AccountDetail{ ...@@ -43,8 +43,7 @@ public class AccountDetailSrtp implements AccountDetail{
private ArrayList<AccountDetail.PreferenceEntry> privateArray; 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>(); ArrayList<AccountDetail.PreferenceEntry> preference = new ArrayList<AccountDetail.PreferenceEntry>();
preference.add(new PreferenceEntry(CONFIG_SRTP_ENABLE, R.string.account_srtp_enabled_label, true)); preference.add(new PreferenceEntry(CONFIG_SRTP_ENABLE, R.string.account_srtp_enabled_label, true));
...@@ -59,29 +58,23 @@ public class AccountDetailSrtp implements AccountDetail{ ...@@ -59,29 +58,23 @@ public class AccountDetailSrtp implements AccountDetail{
return preference; return preference;
} }
public AccountDetailSrtp() public AccountDetailSrtp() {
{
privateArray = getPreferenceEntries(); privateArray = getPreferenceEntries();
} }
public AccountDetailSrtp(HashMap<String, String> pref) public AccountDetailSrtp(HashMap<String, String> pref) {
{
privateArray = getPreferenceEntries(); privateArray = getPreferenceEntries();
for (AccountDetail.PreferenceEntry p : privateArray) { for (AccountDetail.PreferenceEntry p : privateArray) {
p.mValue = pref.get(p.mKey); 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(); privateArray = getPreferenceEntries();
if (pref.size() != privateArray.size()) { if (pref.size() != privateArray.size()) {
Log.i(TAG, "Error list are not of equal size"); Log.i(TAG, "Error list are not of equal size");
} } else {
else {
int index = 0; int index = 0;
for (String s : pref) { for (String s : pref) {
privateArray.get(index).mValue = s; privateArray.get(index).mValue = s;
...@@ -90,13 +83,11 @@ public class AccountDetailSrtp implements AccountDetail{ ...@@ -90,13 +83,11 @@ public class AccountDetailSrtp implements AccountDetail{
} }
} }
public ArrayList<AccountDetail.PreferenceEntry> getDetailValues() public ArrayList<AccountDetail.PreferenceEntry> getDetailValues() {
{
return privateArray; return privateArray;
} }
public ArrayList<String> getValuesOnly() public ArrayList<String> getValuesOnly() {
{
ArrayList<String> valueList = new ArrayList<String>(); ArrayList<String> valueList = new ArrayList<String>();
for (AccountDetail.PreferenceEntry p : privateArray) { for (AccountDetail.PreferenceEntry p : privateArray) {
...@@ -106,8 +97,7 @@ public class AccountDetailSrtp implements AccountDetail{ ...@@ -106,8 +97,7 @@ public class AccountDetailSrtp implements AccountDetail{
return valueList; return valueList;
} }
public HashMap<String, String> getDetailsHashMap() public HashMap<String, String> getDetailsHashMap() {
{
HashMap<String, String> map = new HashMap<String, String>(); HashMap<String, String> map = new HashMap<String, String>();
for (AccountDetail.PreferenceEntry p : privateArray) { for (AccountDetail.PreferenceEntry p : privateArray) {
...@@ -121,8 +111,7 @@ public class AccountDetailSrtp implements AccountDetail{ ...@@ -121,8 +111,7 @@ public class AccountDetailSrtp implements AccountDetail{
return map; return map;
} }
public String getDetailString(String key) public String getDetailString(String key) {
{
String value = ""; String value = "";
for (AccountDetail.PreferenceEntry p : privateArray) { for (AccountDetail.PreferenceEntry p : privateArray) {
...@@ -135,8 +124,7 @@ public class AccountDetailSrtp implements AccountDetail{ ...@@ -135,8 +124,7 @@ public class AccountDetailSrtp implements AccountDetail{
return value; return value;
} }
public void setDetailString(String key, String newValue) public void setDetailString(String key, String newValue) {
{
for (int i = 0; i < privateArray.size(); ++i) { for (int i = 0; i < privateArray.size(); ++i) {
PreferenceEntry p = privateArray.get(i); PreferenceEntry p = privateArray.get(i);
if (p.mKey.equals(key)) { if (p.mKey.equals(key)) {
......
...@@ -79,9 +79,7 @@ public class AccountDetailTls implements AccountDetail { ...@@ -79,9 +79,7 @@ public class AccountDetailTls implements AccountDetail {
privateArray = getPreferenceEntries(); privateArray = getPreferenceEntries();
for (AccountDetail.PreferenceEntry p : privateArray) { for (AccountDetail.PreferenceEntry p : privateArray) {
p.mValue = pref.get(p.mKey); p.mValue = pref.get(p.mKey);
Log.i(TAG, p.mKey + " =" + p.mValue);
} }
} }
......
...@@ -58,8 +58,6 @@ public class Account extends java.util.Observable implements Parcelable { ...@@ -58,8 +58,6 @@ public class Account extends java.util.Observable implements Parcelable {
accountID = bAccountID; accountID = bAccountID;
basicDetails = new AccountDetailBasic(details); basicDetails = new AccountDetailBasic(details);
advancedDetails = new AccountDetailAdvanced(details); advancedDetails = new AccountDetailAdvanced(details);
Log.e("Account","details.get(AccountDetailSrtp.CONFIG_SRTP_ENABLE) "+details.get(AccountDetailSrtp.CONFIG_SRTP_ENABLE));
srtpDetails = new AccountDetailSrtp(details); srtpDetails = new AccountDetailSrtp(details);
tlsDetails = new AccountDetailTls(details); tlsDetails = new AccountDetailTls(details);
credentialsDetails = new ArrayList<AccountCredentials>(); credentialsDetails = new ArrayList<AccountCredentials>();
......
...@@ -34,7 +34,6 @@ import java.util.Map.Entry; ...@@ -34,7 +34,6 @@ import java.util.Map.Entry;
import java.util.Random; import java.util.Random;
import org.sflphone.R; import org.sflphone.R;
import org.sflphone.account.AccountCredentials;
import org.sflphone.account.AccountDetailsHandler; import org.sflphone.account.AccountDetailsHandler;
import org.sflphone.account.CallDetailsHandler; import org.sflphone.account.CallDetailsHandler;
import org.sflphone.account.HistoryHandler; import org.sflphone.account.HistoryHandler;
...@@ -231,9 +230,7 @@ public class SipService extends Service { ...@@ -231,9 +230,7 @@ public class SipService extends Service {
System.loadLibrary("ccgnu2"); System.loadLibrary("ccgnu2");
System.loadLibrary("crypto"); System.loadLibrary("crypto");
System.loadLibrary("ssl"); System.loadLibrary("ssl");
System.loadLibrary("sndfile");
System.loadLibrary("ccrtp1"); System.loadLibrary("ccrtp1");
System.loadLibrary("pcre");
System.loadLibrary("samplerate"); System.loadLibrary("samplerate");
System.loadLibrary("speexresampler"); System.loadLibrary("speexresampler");
System.loadLibrary("sflphone"); System.loadLibrary("sflphone");
...@@ -1287,12 +1284,6 @@ public class SipService extends Service { ...@@ -1287,12 +1284,6 @@ public class SipService extends Service {
Log.i(TAG, "SipService.getCredentials() thread running..."); Log.i(TAG, "SipService.getCredentials() thread running...");
VectMap map = configurationManagerJNI.getCredentials(accountID); VectMap map = configurationManagerJNI.getCredentials(accountID);
ArrayList<HashMap<String, String>> result = AccountDetailsHandler.convertCredentialsToNative(map); 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; return result;
} }
} }
...@@ -1310,13 +1301,7 @@ public class SipService extends Service { ...@@ -1310,13 +1301,7 @@ public class SipService extends Service {
@Override @Override
protected void doRun() throws SameThreadException, RemoteException { protected void doRun() throws SameThreadException, RemoteException {
Log.i(TAG, "SipService.setCredentials() thread running..."); Log.i(TAG, "SipService.setCredentials() thread running...");
Log.i("CREDS","----------------- GET CREDENTIALS:");
ArrayList<HashMap<String, String>> list = (ArrayList<HashMap<String, String>>) creds; 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));; configurationManagerJNI.setCredentials(accountID, AccountDetailsHandler.convertCredentialsToSwig(creds));;
} }
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment