From 417b7d0a6affc024a14506d958b3dce887dbfd8c Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Tue, 17 Nov 2015 14:44:38 +0100 Subject: [PATCH] Back to dialer in settings and about --- res/layout/dialer.xml | 22 +++++++++---------- res/values/digit_style.xml | 2 +- src/org/linphone/AboutFragment.java | 2 +- src/org/linphone/BootReceiver.java | 2 +- src/org/linphone/CallActivity.java | 10 +++------ src/org/linphone/ChatFragment.java | 4 ++-- src/org/linphone/ContactEditorFragment.java | 2 +- src/org/linphone/ContactsManager.java | 8 ++----- src/org/linphone/LinphoneActivity.java | 6 ++++- src/org/linphone/LinphoneUtils.java | 5 +---- .../linphone/assistant/AssistantActivity.java | 4 ++-- src/org/linphone/ui/CallButton.java | 2 +- src/org/linphone/ui/Digit.java | 4 ++-- 13 files changed, 32 insertions(+), 41 deletions(-) diff --git a/res/layout/dialer.xml b/res/layout/dialer.xml index 8c549233d..4063c8c58 100644 --- a/res/layout/dialer.xml +++ b/res/layout/dialer.xml @@ -1,8 +1,8 @@ + android:layout_height="match_parent"> + - - diff --git a/res/values/digit_style.xml b/res/values/digit_style.xml index 1fb8cd745..de1ecbe02 100644 --- a/res/values/digit_style.xml +++ b/res/values/digit_style.xml @@ -5,7 +5,7 @@ 50dp @android:color/transparent 20sp - 30dp + 25dp diff --git a/src/org/linphone/AboutFragment.java b/src/org/linphone/AboutFragment.java index 47815700b..d3d22e88f 100644 --- a/src/org/linphone/AboutFragment.java +++ b/src/org/linphone/AboutFragment.java @@ -87,7 +87,7 @@ public class AboutFragment extends Fragment implements OnClickListener { lc.resetLogCollection(); } } else if (v == cancel) { - getFragmentManager().popBackStackImmediate(); + LinphoneActivity.instance().displayDialer(); } } } diff --git a/src/org/linphone/BootReceiver.java b/src/org/linphone/BootReceiver.java index a911879bb..aa2b1082c 100644 --- a/src/org/linphone/BootReceiver.java +++ b/src/org/linphone/BootReceiver.java @@ -35,7 +35,7 @@ public class BootReceiver extends BroadcastReceiver { if (lpConfig.getBool("app", "auto_start", false)) { Intent lLinphoneServiceIntent = new Intent(Intent.ACTION_MAIN); lLinphoneServiceIntent.setClass(context, LinphoneService.class); - context.startService(lLinphoneServiceIntent);; + context.startService(lLinphoneServiceIntent); } } } diff --git a/src/org/linphone/CallActivity.java b/src/org/linphone/CallActivity.java index 525ad7991..30944f9cb 100644 --- a/src/org/linphone/CallActivity.java +++ b/src/org/linphone/CallActivity.java @@ -1524,13 +1524,9 @@ public class CallActivity extends Activity implements OnClickListener { isCallPaused = false; isInConference = false; } else { - if (isConferenceRunning && call.isInConference()) { - //callState.setImageResource(R.drawable.remove); - isInConference = true; - } else { - //callState.setImageResource(R.drawable.play); - isInConference = false; - } + //callState.setImageResource(R.drawable.remove); +//callState.setImageResource(R.drawable.play); + isInConference = isConferenceRunning && call.isInConference(); isCallPaused = false; } diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index f4cde3cb9..f2f161a5d 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -1040,7 +1040,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC sendImage.showContextMenu(); } catch (Exception e) { e.printStackTrace(); - }; + } } @Override @@ -1116,7 +1116,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC contacts.clear(); contacts = (List) results.values; notifyDataSetChanged(); - } else {; + } else { contacts.clear(); contacts = getContactsList(); notifyDataSetInvalidated(); diff --git a/src/org/linphone/ContactEditorFragment.java b/src/org/linphone/ContactEditorFragment.java index 4b8fdaa41..d336fd3aa 100644 --- a/src/org/linphone/ContactEditorFragment.java +++ b/src/org/linphone/ContactEditorFragment.java @@ -736,7 +736,7 @@ public class ContactEditorFragment extends Fragment { newNumberOrAddress = newN; } - public void save() {; + public void save() { if (newNumberOrAddress == null || newNumberOrAddress.equals(oldNumberOrAddress)) return; diff --git a/src/org/linphone/ContactsManager.java b/src/org/linphone/ContactsManager.java index 357eb3f9d..d6ec79b54 100644 --- a/src/org/linphone/ContactsManager.java +++ b/src/org/linphone/ContactsManager.java @@ -93,7 +93,7 @@ public class ContactsManager { public void initializeSyncAccount(Context context, ContentResolver contentResolver) { initializeContactManager(context,contentResolver); - AccountManager accountManager = (AccountManager) context.getSystemService(context.ACCOUNT_SERVICE); + AccountManager accountManager = (AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE); Account[] accounts = accountManager.getAccountsByType(context.getPackageName()); @@ -452,11 +452,7 @@ public class ContactsManager { public boolean isContactHasAddress(Contact contact, String address){ if(contact != null) { contact.refresh(contentResolver); - if (contact.getNumbersOrAddresses().contains(address) || contact.getNumbersOrAddresses().contains("sip:"+ address)) { - return true; - } else { - return false; - } + return contact.getNumbersOrAddresses().contains(address) || contact.getNumbersOrAddresses().contains("sip:" + address); } return false; } diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java index 9cc3353ba..5977126ce 100644 --- a/src/org/linphone/LinphoneActivity.java +++ b/src/org/linphone/LinphoneActivity.java @@ -695,7 +695,7 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null); chat_selected.setVisibility(View.VISIBLE); } else if (id == R.id.cancel){ - getFragmentManager().popBackStackImmediate(); + displayDialer(); mTopBar.setVisibility(View.GONE); } } @@ -773,6 +773,10 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta } } + public void displayDialer() { + changeCurrentFragment(FragmentsAvailable.DIALER, null); + } + public void displayAccountSettings(int accountNumber) { Bundle bundle = new Bundle(); bundle.putInt("Account", accountNumber); diff --git a/src/org/linphone/LinphoneUtils.java b/src/org/linphone/LinphoneUtils.java index 32c5b27a2..4015b1ce7 100644 --- a/src/org/linphone/LinphoneUtils.java +++ b/src/org/linphone/LinphoneUtils.java @@ -91,10 +91,7 @@ public final class LinphoneUtils { public static boolean isNumberAddress(String numberOrAddress) { LinphoneProxyConfig proxy = LinphoneManager.getLc().createProxyConfig(); - if(proxy.normalizePhoneNumber(numberOrAddress) != null){ - return true; - } - return false; + return proxy.normalizePhoneNumber(numberOrAddress) != null; } public static boolean isStrictSipAddress(String numberOrAddress) { diff --git a/src/org/linphone/assistant/AssistantActivity.java b/src/org/linphone/assistant/AssistantActivity.java index 886139da8..2c19a3351 100644 --- a/src/org/linphone/assistant/AssistantActivity.java +++ b/src/org/linphone/assistant/AssistantActivity.java @@ -108,8 +108,8 @@ public class AssistantActivity extends Activity implements OnClickListener { } }; instance = this; - }; - + } + @Override protected void onResume() { super.onResume(); diff --git a/src/org/linphone/ui/CallButton.java b/src/org/linphone/ui/CallButton.java index 1580f294c..82447ca0f 100644 --- a/src/org/linphone/ui/CallButton.java +++ b/src/org/linphone/ui/CallButton.java @@ -81,7 +81,7 @@ public class CallButton extends ImageView implements OnClickListener, AddressAwa } catch (LinphoneCoreException e) { LinphoneManager.getInstance().terminateCall(); onWrongDestinationAddress(); - }; + } } protected void onWrongDestinationAddress() { diff --git a/src/org/linphone/ui/Digit.java b/src/org/linphone/ui/Digit.java index 5146f9f9d..8eb705cf3 100644 --- a/src/org/linphone/ui/Digit.java +++ b/src/org/linphone/ui/Digit.java @@ -215,7 +215,7 @@ public class Digit extends Button implements AddressAware { } return true; } - }; - + } + }