felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-13 03:09:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/4742_fix_permalink_info_when_room_not_available' into 'develop'

Browse Source 
MESSENGER-4742 fix permalink info when room is not available

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!146
This commit is contained in:
Frank Rotermund
2023-06-20 11:33:37 +00:00
parent 6aa6ce981f 4abaab4061
commit 62e840e30b
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/de.lproj/Bwi.strings
+2
View File
@@ -597,6 +597,8 @@
// MARK: - Permalink
"settings_permalink_prefix_picker_title" = "Permalink Prefix";
"bwi_error_room_not_available_title" = "Link ungültig";
"bwi_error_room_not_available_message" = "Der Raum wurde bereits geschlossen, daher kannst Du nicht mehr beitreten.";
// MARK: - Notification Settings
"settings_notify_me_for" = "Benachrichtige mich für";
Riot/Assets/en.lproj/Bwi.strings
+2
View File
@@ -507,6 +507,8 @@
// MARK: - Permalink
"settings_permalink_prefix_picker_title" = "Permalink Prefix";
"bwi_error_room_not_available_title" = "Link invalid";
"bwi_error_room_not_available_message" = "The room has already been closed, you can no longer join.";
// MARK: - Notification Settings
"settings_notify_me_for" = "Notify me for";
Riot/Generated/BWIStrings.swift
+8
View File
@@ -215,6 +215,14 @@ public class BWIL10n: NSObject {
public static var bwiErrorLogoutOffline: String {
return BWIL10n.tr("Bwi", "bwi_error_logout_offline")
}
/// Der Raum wurde bereits geschlossen, daher kannst Du nicht mehr beitreten.
public static var bwiErrorRoomNotAvailableMessage: String {
return BWIL10n.tr("Bwi", "bwi_error_room_not_available_message")
}
/// Link ungültig
public static var bwiErrorRoomNotAvailableTitle: String {
return BWIL10n.tr("Bwi", "bwi_error_room_not_available_title")
}
/// Du kannst jetzt aktive und vergangene Umfragen gesammelt in den Raumdetails einsehen (erreichbar unter Raumdetails, im Bereich "Umfrageverlauf").
public static var bwiFeatureBannerAdvertisementText: String {
return BWIL10n.tr("Bwi", "bwi_feature_banner_advertisement_text")
Riot/Modules/Application/LegacyAppDelegate.m
+7 -1
View File
@@ -1672,7 +1672,13 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[self peekInRoomWithNavigationParameters:roomPreviewNavigationParameters pathParams:pathParams];
}
} failure:^(NSError *error) {
[self peekInRoomWithNavigationParameters:roomPreviewNavigationParameters pathParams:pathParams];
// bwi #4742: check if the room is still available
NSHTTPURLResponse *response = error.userInfo[@"httpResponse"];
if (response.statusCode == 404) {
[self showAlertWithTitle:BWIL10n.bwiErrorRoomNotAvailableTitle message:BWIL10n.bwiErrorRoomNotAvailableMessage];
} else {
[self peekInRoomWithNavigationParameters:roomPreviewNavigationParameters pathParams:pathParams];
}
}];
}