From 2becb86ab9a55f9b101759ab9dc61678c20ccd16 Mon Sep 17 00:00:00 2001 From: QuentinArguillere Date: Wed, 30 Jun 2021 16:31:53 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20bug=20where=20the=20=E2=80=9Cprevious?= =?UTF-8?q?=E2=80=9D=20button=20in=20the=20contact=20details=20would=20alw?= =?UTF-8?q?ays=20return=20to=20the=20contacts=20list,=20even=20though=20we?= =?UTF-8?q?=20could=20have=20come=20from=20the=20call=20history=20details?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Classes/ContactDetailsView.m | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Classes/ContactDetailsView.m b/Classes/ContactDetailsView.m index be1f6a24f..8036b7180 100644 --- a/Classes/ContactDetailsView.m +++ b/Classes/ContactDetailsView.m @@ -501,9 +501,15 @@ static UICompositeViewDescription *compositeDescription = nil; if ([ContactSelection getSelectionMode] == ContactSelectionModeEdit) { [ContactSelection setSelectionMode:ContactSelectionModeNone]; } - - ContactsListView *view = VIEW(ContactsListView); - [PhoneMainView.instance popToView:view.compositeViewDescription]; + + NSString* previous = [PhoneMainView.instance getPreviousViewName]; + if ([previous isEqualToString:@"ContactsListView"]) { + ContactsListView *view = VIEW(ContactsListView); + [PhoneMainView.instance popToView:view.compositeViewDescription]; + } else { + HistoryDetailsView *view = VIEW(HistoryDetailsView); + [PhoneMainView.instance popToView:view.compositeViewDescription]; + } } - (IBAction)onEditClick:(id)event {