diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings index 3949af8a0..1b4e0bddb 100644 --- a/Riot/Assets/de.lproj/Vector.strings +++ b/Riot/Assets/de.lproj/Vector.strings @@ -114,7 +114,6 @@ "contacts_address_book_matrix_users_toggle" = "Nur Matrix-Nutzer"; "contacts_address_book_no_contact" = "Keine lokalen Kontakte"; "contacts_address_book_permission_required" = "Berechtigungen benötigt um auf lokale Kontakte zuzugreifen"; -"contacts_matrix_users_section" = "BEKANNTE KONTAKTE"; // Chat participants "room_participants_title" = "Teilnehmer"; "room_participants_add_participant" = "Teilnehmer hinzufügen"; diff --git a/Riot/Assets/fr.lproj/Vector.strings b/Riot/Assets/fr.lproj/Vector.strings index 5cd7f3e57..4197f2a64 100644 --- a/Riot/Assets/fr.lproj/Vector.strings +++ b/Riot/Assets/fr.lproj/Vector.strings @@ -131,7 +131,6 @@ "contacts_address_book_no_contact" = "Aucun contact local"; "contacts_address_book_permission_required" = "Permissions requises pour accéder aux contacts locaux"; "contacts_address_book_permission_denied" = "Vous n'avez pas autorisé Riot à accéder à vos contacts locaux"; -"contacts_matrix_users_section" = "CONTACTS CONNUS"; // Chat participants "room_participants_title" = "Membres"; "room_participants_add_participant" = "Ajouter un membre"; diff --git a/Riot/Assets/nl.lproj/Vector.strings b/Riot/Assets/nl.lproj/Vector.strings index 3f6001a41..06c777f1f 100644 --- a/Riot/Assets/nl.lproj/Vector.strings +++ b/Riot/Assets/nl.lproj/Vector.strings @@ -161,7 +161,6 @@ "contacts_address_book_no_contact" = "Geen lokale contacten"; "contacts_address_book_permission_required" = "Permissie vereist voor toegang tot de lokale contacten"; "contacts_address_book_permission_denied" = "Je hebt Riot geen toegang tot je lokale contacten toegestaan"; -"contacts_matrix_users_section" = "BEKENDE CONTACTEN"; // Chat participants "room_participants_title" = "Deelnemers"; diff --git a/Riot/Model/Contact/ContactsDataSource.m b/Riot/Model/Contact/ContactsDataSource.m index bab141466..a870a440b 100644 --- a/Riot/Model/Contact/ContactsDataSource.m +++ b/Riot/Model/Contact/ContactsDataSource.m @@ -20,7 +20,7 @@ #import "RiotDesignValues.h" #define CONTACTSDATASOURCE_LOCALCONTACTS_BITWISE 0x01 -#define CONTACTSDATASOURCE_KNOWNCONTACTS_BITWISE 0x02 +#define CONTACTSDATASOURCE_USERDIRECTORY_BITWISE 0x02 #define CONTACTSDATASOURCE_DEFAULT_SECTION_HEADER_HEIGHT 30.0 #define CONTACTSDATASOURCE_LOCALCONTACTS_SECTION_HEADER_HEIGHT 65.0 @@ -501,7 +501,7 @@ // Display a default cell when no local contacts is available. count = filteredLocalContacts.count ? filteredLocalContacts.count : 1; } - else if (section == filteredMatrixContactsSection && !(shrinkedSectionsBitMask & CONTACTSDATASOURCE_KNOWNCONTACTS_BITWISE)) + else if (section == filteredMatrixContactsSection && !(shrinkedSectionsBitMask & CONTACTSDATASOURCE_USERDIRECTORY_BITWISE)) { // Display a default cell when no contacts is available. count = filteredMatrixContacts.count ? filteredMatrixContacts.count : 1; @@ -781,7 +781,7 @@ // This section is collapsable only if it is not empty if (filteredMatrixContacts.count) { - sectionBitwise = CONTACTSDATASOURCE_KNOWNCONTACTS_BITWISE; + sectionBitwise = CONTACTSDATASOURCE_USERDIRECTORY_BITWISE; } } } @@ -1004,7 +1004,7 @@ { // Return the section header used when the section is shrinked NSInteger savedShrinkedSectionsBitMask = shrinkedSectionsBitMask; - shrinkedSectionsBitMask = CONTACTSDATASOURCE_LOCALCONTACTS_BITWISE | CONTACTSDATASOURCE_KNOWNCONTACTS_BITWISE; + shrinkedSectionsBitMask = CONTACTSDATASOURCE_LOCALCONTACTS_BITWISE | CONTACTSDATASOURCE_USERDIRECTORY_BITWISE; UIView *stickyHeader = [self viewForHeaderInSection:section withFrame:frame]; diff --git a/Riot/ViewController/ContactsTableViewController.m b/Riot/ViewController/ContactsTableViewController.m index 921094c8e..352f83ac9 100644 --- a/Riot/ViewController/ContactsTableViewController.m +++ b/Riot/ViewController/ContactsTableViewController.m @@ -22,7 +22,7 @@ #import "AppDelegate.h" #define CONTACTS_TABLEVC_LOCALCONTACTS_BITWISE 0x01 -#define CONTACTS_TABLEVC_KNOWNCONTACTS_BITWISE 0x02 +#define CONTACTS_TABLEVC_USERDIRECTORY_BITWISE 0x02 #define CONTACTS_TABLEVC_DEFAULT_SECTION_HEADER_HEIGHT 30.0 #define CONTACTS_TABLEVC_LOCALCONTACTS_SECTION_HEADER_HEIGHT 65.0