Commit graph

48 commits

Author SHA1 Message Date
Brieuc Viel
1af500edbb Merge remote-tracking branch 'public/master' into obiane 2016-04-14 13:07:23 +02:00
Sylvain Berfini
100ab5b679 Added back contacts search filter 2016-04-14 12:10:52 +02:00
Brieuc Viel
df9ea2fa2f Merge remote-tracking branch 'public/master' into obiane 2016-04-14 12:01:30 +02:00
Sylvain Berfini
448355136b This should sort the contact list alphabetically 2016-04-14 11:58:53 +02:00
Brieuc Viel
71b9fc18e9 conflict merged and errors fixed 2016-04-13 16:47:31 +02:00
Brieuc Viel
79cac9f3cd Merge remote-tracking branch 'public/master' into obiane 2016-04-11 16:25:40 +02:00
Sylvain Berfini
7160756af2 Fixed contact lookup 2016-03-23 15:44:51 +01:00
Sylvain Berfini
8c885640fc Create friend for Android contact is it has a SIP address 2016-03-23 12:00:24 +01:00
Sylvain Berfini
c96b896f73 Fallback mode (or forced mode) using Linphone Friends seems to be working, and mixed Android contacts and Linphone friends also seems to be working 2016-03-23 12:00:24 +01:00
Sylvain Berfini
958ee4c946 Phone numbers & SIP addresses can be edited 2016-03-23 12:00:24 +01:00
Sylvain Berfini
6b5b2b9075 Added back sip contacts filter 2016-03-23 12:00:24 +01:00
Sylvain Berfini
4956bed080 Create contact works 2016-03-23 12:00:24 +01:00
Sylvain Berfini
8eadbbb52d Contact editor allows name and photo changes 2016-03-23 12:00:24 +01:00
Sylvain Berfini
2a4a003780 Started to rework contact editor 2016-03-23 12:00:24 +01:00
Sylvain Berfini
4d976609bf Improved multiple contacts deletion + fixed list update 2016-03-23 12:00:24 +01:00
Sylvain Berfini
1d879f2bf2 Contact deletion ok 2016-03-23 12:00:24 +01:00
Sylvain Berfini
1bbc54da96 Actually previous changes weren't all required... 2016-03-23 12:00:24 +01:00
Sylvain Berfini
da2214936a Added observer to refresh contacts on changes 2016-03-23 12:00:24 +01:00
Sylvain Berfini
4193cefa60 Do not refresh contacts when not required 2016-03-23 12:00:24 +01:00
Sylvain Berfini
8d65fab06c Fixed contact lookup for history & chat 2016-03-23 12:00:24 +01:00
Sylvain Berfini
a75da820ed Started rework of contacts 2016-03-23 12:00:24 +01:00
Margaux Clerc
55311ac4c6 Fix crash with android permission for Contacts and Echo canceller in the assistant 2016-03-23 11:59:52 +01:00
Margaux Clerc
1b207c8dc1 Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
	AndroidManifest.xml
	res/drawable-xhdpi/topbar_avatar.png
	res/drawable/assistant_button.xml
	res/layout-land/call.xml
	res/layout-land/call_incoming.xml
	res/layout-land/call_outgoing.xml
	res/layout-land/chatlist_cell.xml
	res/layout-land/main.xml
	res/layout/about.xml
	res/layout/assistant_account_creation.xml
	res/layout/assistant_linphone_login.xml
	res/layout/assistant_remote_provisioning_login.xml
	res/layout/assistant_topbar.xml
	res/layout/call.xml
	res/layout/call_incoming.xml
	res/layout/call_outgoing.xml
	res/layout/chat.xml
	res/layout/chatlist.xml
	res/layout/chatlist_cell.xml
	res/layout/conference_paused_row.xml
	res/layout/contact.xml
	res/layout/contact_edit.xml
	res/layout/contacts_list.xml
	res/layout/dialog.xml
	res/layout/edit_list.xml
	res/layout/history.xml
	res/layout/history_detail.xml
	res/layout/main.xml
	res/layout/side_menu_account_cell.xml
	res/mipmap-hdpi/ic_launcher.png
	res/mipmap-mdpi/ic_launcher.png
	res/mipmap-xhdpi/ic_launcher.png
	res/mipmap-xxhdpi/ic_launcher.png
	res/mipmap-xxxhdpi/ic_launcher.png
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fr/custom.xml
	res/values-fr/strings.xml
	res/values-he/strings.xml
	res/values-ja/strings.xml
	res/values-nl/strings.xml
	res/values-ru/strings.xml
	res/values-tr/strings.xml
	res/values/custom.xml
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	res/values/styles.xml
	src/org/linphone/CallActivity.java
	src/org/linphone/ChatFragment.java
	src/org/linphone/ChatListFragment.java
	src/org/linphone/ContactDetailsFragment.java
	src/org/linphone/ContactsListFragment.java
	src/org/linphone/HistoryDetailFragment.java
	src/org/linphone/HistoryListFragment.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphoneManager.java
	src/org/linphone/LinphoneService.java
	src/org/linphone/assistant/RemoteProvisioningActivity.java
2016-02-18 15:56:50 +01:00
Sylvain Berfini
9204c83c0b Updated procedure for change package name + fixed crash when contacts sync account creation failed 2016-01-29 10:58:37 +01:00
Margaux Clerc
0b867f947f Fix call errors and add portrait support for tablet 2016-01-21 17:08:01 +01:00
Margaux Clerc
71926ccd16 Fix UI problems and linphone friend display name 2015-12-08 17:14:24 +01:00
Margaux Clerc
8793a506e3 Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
	res/drawable-xhdpi/checkbox_checked.png
	res/drawable-xhdpi/checkbox_unchecked.png
	res/drawable-xhdpi/resizable_textfield.9.png
	res/drawable/avatar_mask_chat.xml
	res/layout/about.xml
	res/layout/call.xml
	res/layout/call_inactive_row.xml
	res/layout/chat.xml
	res/layout/chat_bubble_incoming.xml
	res/layout/chat_bubble_outgoing.xml
	res/layout/chatlist.xml
	res/layout/contact.xml
	res/layout/contacts_list.xml
	res/layout/dialer.xml
	res/layout/history.xml
	res/layout/history_detail.xml
	res/layout/main.xml
	res/layout/search_contact_cell.xml
	res/layout/side_menu_account_cell.xml
	res/layout/side_menu_item_cell.xml
	res/layout/side_menu_main_account.xml
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	res/values/styles.xml
	src/org/linphone/ChatFragment.java
	src/org/linphone/ContactsListFragment.java
	src/org/linphone/DialerFragment.java
	src/org/linphone/HistoryDetailFragment.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphoneService.java
2015-11-30 14:29:14 +01:00
Margaux Clerc
417b7d0a6a Back to dialer in settings and about 2015-11-17 17:27:09 +01:00
Margaux Clerc
a5c39de505 Fix contact with linphone friend 2015-11-09 14:33:47 +01:00
Margaux Clerc
ffb1eccb24 Interface update 2015-11-05 16:23:59 +01:00
Margaux Clerc
d724d20d3c Update contact for linphoen friend 2015-11-03 18:43:05 +01:00
Margaux Clerc
c3dc710337 Merge remote-tracking branch 'linphone/master' into 3.0.X
Conflicts:
	AndroidManifest.xml
	res/layout/chat_bubble_alt_incoming.xml
	res/layout/chat_bubble_alt_outgoing.xml
	res/layout/chat_bubble_incoming.xml
	res/layout/chat_bubble_outgoing.xml
	res/values/strings.xml
	src/org/linphone/ContactsManager.java
	src/org/linphone/compatibility/ApiFivePlus.java
	src/org/linphone/ui/BubbleChat.java
2015-09-10 18:58:01 +02:00
Margaux Clerc
3eca96e3c5 Rework Incall view/Chat view/Edit Contact view 2015-08-25 17:23:07 +02:00
Margaux Clerc
97a077900f Fix crash with download picture and sync account 2015-08-25 11:32:03 +02:00
Margaux Clerc
6870dec8b1 Add relativeLayout for left menu 2015-08-14 11:26:22 +02:00
Margaux Clerc
7d7b7b7139 Fix crash text received
Change echo calibration wizard
2015-08-12 17:55:55 +02:00
Margaux Clerc
4c92aa2ed6 Fix setup crash with sip: 2015-05-20 09:25:05 +02:00
Margaux Clerc
8bf79e4e13 Fix bugs crash nullPointer 2015-05-11 15:19:47 +02:00
Margaux Clerc
1586eed0e9 Delete sip address fixed 2015-04-23 14:28:57 +02:00
Margaux Clerc
14c8510398 Fix contact picture 2015-04-23 14:28:57 +02:00
Margaux Clerc
2262c2e90a Fix friends and parse error 2015-04-21 12:33:15 +02:00
Margaux Clerc
82173a8985 Fix find contact again 2015-04-20 18:15:25 +02:00
Margaux Clerc
b2893a4d20 Fix find contacts 2015-04-20 16:22:39 +02:00
Margaux Clerc
688dcebe42 Add parameter for linphone tag and fix chat dispaly 2015-04-15 16:38:55 +02:00
Margaux Clerc
8bfcafa9a3 add default proxy config domain to contact if domain is not specified 2015-04-15 15:43:44 +02:00
Margaux Clerc
69950b81ef Fix about button
Fix create new contact
2015-04-15 14:59:10 +02:00
Margaux Clerc
3706b6ebe2 Fix problems in contacts and remove linphone tag 2015-04-14 17:07:34 +02:00
Margaux Clerc
bd0c2df61e Add linphone friend management 2015-04-13 19:07:01 +02:00