drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 13:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] Change how authorization check after editing is handled

Browse Source 
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2025-07-31 10:10:31 +02:00
parent 0b8bd42cb0
commit 327d302aae
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
iphone/Maps/Classes/MapViewController.mm
View File

@@ -382,7 +382,10 @@ NSString *const kAboutSegue = @"Map2About";
[self updateStatusBarStyle]; [self updateStatusBarStyle];
GetFramework().SetRenderingEnabled(); GetFramework().SetRenderingEnabled();
GetFramework().InvalidateRendering(); GetFramework().InvalidateRendering();
[self checkAuthorization]; [self showViralAlertIfNeeded];
if (Profile.needsReauthorization) {
[self checkAuthorization];
}
[MWMRouter updateRoute]; [MWMRouter updateRoute];
} }
@@ -542,6 +545,12 @@ NSString *const kAboutSegue = @"Map2About";
[[MWMBookmarksManager sharedManager] addObserver:self]; [[MWMBookmarksManager sharedManager] addObserver:self];
[[MWMBookmarksManager sharedManager] loadBookmarks]; [[MWMBookmarksManager sharedManager] loadBookmarks];
[MWMFrameworkListener addObserver:self]; [MWMFrameworkListener addObserver:self];
[NSNotificationCenter.defaultCenter addObserverForName:@"EditingFinishedNotififcation" object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) {
if (!Profile.isExisting || Profile.needsReauthorization) {
[self checkAuthorization];
}
}];
} }
- (void)dealloc { - (void)dealloc {
@@ -631,13 +640,9 @@ NSString *const kAboutSegue = @"Map2About";
#pragma mark - Authorization #pragma mark - Authorization
- (void)checkAuthorization { - (void)checkAuthorization {
BOOL const isAfterEditing = Profile.needsReauthorization && !Profile.isExisting; if (!Platform::IsConnected())
if (isAfterEditing) { return;
[Profile requestReauthorizationWithShouldReauthorize:NO]; [self presentViewController:BridgeControllers.profileAsAlert animated:YES completion:nil];
if (!Platform::IsConnected())
return;
[self presentViewController:BridgeControllers.profileAsAlert animated:YES completion:nil];
}
} }
#pragma mark - 3d touch #pragma mark - 3d touch

7
iphone/Maps/Model/Profile.swift
View File

@@ -123,13 +123,6 @@ import OSMEditor
} }
/// Request reauthorization of the OpenStreetMap profile
/// - Parameter shouldReauthorize: If the profile should be reauthorized
@objc static func requestReauthorization(shouldReauthorize: Bool = true) {
UserDefaults.standard.set(shouldReauthorize, forKey: userDefaultsNeedsReauthorization)
}
/// Reload the OpenStreetMap profile data /// Reload the OpenStreetMap profile data
/// - Returns: Optional profile data /// - Returns: Optional profile data
static private func reloadUserPreferences() async -> osm.UserPreferences? { static private func reloadUserPreferences() async -> osm.UserPreferences? {

2
iphone/Maps/UI/Editor/MWMEditorViewController.mm
View File

@@ -243,7 +243,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
[self showNotesQueuedToast]; [self showNotesQueuedToast];
break; break;
case osm::Editor::SaveResult::SavedSuccessfully: case osm::Editor::SaveResult::SavedSuccessfully:
[Profile requestReauthorizationWithShouldReauthorize:YES]; [NSNotificationCenter.defaultCenter postNotificationName:@"EditingFinishedNotififcation" object:nil];
f.UpdatePlacePageInfoForCurrentSelection(); f.UpdatePlacePageInfoForCurrentSelection();
[self.navigationController popToRootViewControllerAnimated:YES]; [self.navigationController popToRootViewControllerAnimated:YES];
break; break;