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

Merge branch 'hotfix/v0.10.5'

Browse Source
This commit is contained in:
manuroe
2020-04-01 17:56:25 +02:00
parent f51eb42fd2 d23ae092ea
commit 622bd16fd8
11 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.rst
+9
View File
@@ -1,3 +1,12 @@
Changes in 0.10.5 (2020-04-01)
===============================================
Bug fix:
* Fix error when joining some public rooms, thanks to @chrismoos (PR #2888).
* Fix crash due to malformed widget (#2997).
* Push notifications: Avoid any automatic deactivation (vector-im/riot-ios#3017).
* Fix links breaking user out of SSO flow.
Changes in 0.10.4 (2019-12-11)
===============================================
Podfile
+1 -1
View File
@@ -7,7 +7,7 @@ use_frameworks!
# Different flavours of pods to MatrixKit
# The current MatrixKit pod version
$matrixKitVersion = '0.11.3'
$matrixKitVersion = '0.11.4'
# The develop branch version
#$matrixKitVersion = 'develop'
Podfile.lock
+8 -8
View File
@@ -49,15 +49,15 @@ PODS:
- MatomoTracker (7.2.0):
- MatomoTracker/Core (= 7.2.0)
- MatomoTracker/Core (7.2.0)
- MatrixKit (0.11.3):
- MatrixKit (0.11.4):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.11.3)
- MatrixKit/Core (= 0.11.4)
- MatrixSDK (= 0.15.2)
- SwiftUTI (~> 1.0.6)
- MatrixKit/AppExtension (0.11.3):
- MatrixKit/AppExtension (0.11.4):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- DTCoreText/Extension
@@ -65,7 +65,7 @@ PODS:
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.15.2)
- SwiftUTI (~> 1.0.6)
- MatrixKit/Core (0.11.3):
- MatrixKit/Core (0.11.4):
- cmark (~> 0.24.1)
- DTCoreText (~> 1.6.21)
- HPGrowingTextView (~> 1.1)
@@ -108,8 +108,8 @@ DEPENDENCIES:
- DGCollectionViewLeftAlignFlowLayout (~> 1.0.4)
- GBDeviceInfo (~> 6.3.0)
- MatomoTracker (~> 7.2.0)
- MatrixKit (= 0.11.3)
- MatrixKit/AppExtension (= 0.11.3)
- MatrixKit (= 0.11.4)
- MatrixKit/AppExtension (= 0.11.4)
- MatrixSDK/JingleCallStack
- MatrixSDK/SwiftSupport
- OLMKit
@@ -165,7 +165,7 @@ SPEC CHECKSUMS:
libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
MatomoTracker: 6f89e2561083685a360e223fb663e9ccd57c1d1a
MatrixKit: 5a20025b05490a70694b701e607ec75e0988af21
MatrixKit: 3db15f216e2de4d53b1405434028d44f42d4af22
MatrixSDK: f83bd3c5519c1cb9ac3998f6423574cf528f0250
OLMKit: 4ee0159d63feeb86d836fdcfefe418e163511639
Realm: 5a1d9d47bfc101dd597668b1a8af4288a2557f6d
@@ -175,6 +175,6 @@ SPEC CHECKSUMS:
SwiftUTI: 917993c124f8eac25e88ced0202fc58d7eb50fa8
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
PODFILE CHECKSUM: 881048fb17d68dd834b18e23929482600daca7f3
PODFILE CHECKSUM: c7b37d248a316ae786328d88148e3155fea6bee3
COCOAPODS: 1.8.4
Riot/AppDelegate.m
+6 -2
View File
@@ -2069,9 +2069,13 @@ NSString *const AppDelegateDidValidateEmailNotificationClientSecretKey = @"AppDe
{
NSLog(@"[AppDelegate][Push] clearPushNotificationToken: Clear existing token");
// XXX: The following code has been commented to avoid automatic deactivation of push notifications
// There may be a race condition here where the clear happens after the update of the new push token.
// We have no evidence of this. This is a safety measure.
// Clear existing token
MXKAccountManager* accountManager = [MXKAccountManager sharedManager];
[accountManager setPushDeviceToken:nil withPushOptions:nil];
//MXKAccountManager* accountManager = [MXKAccountManager sharedManager];
//[accountManager setPushDeviceToken:nil withPushOptions:nil];
}
// Remove delivred notifications for a given room id except call notifications
Riot/Managers/Widgets/WidgetManager.m
+5
View File
@@ -391,6 +391,11 @@ NSString *const WidgetManagerErrorDomain = @"WidgetManagerErrorDomain";
{
// stateKey = widgetId
NSString *widgetId = event.stateKey;
if (!widgetId)
{
NSLog(@"[WidgetManager] Error: New widget detected with no id in %@: %@", event.roomId, event.JSONDictionary);
return;
}
NSLog(@"[WidgetManager] New widget detected: %@ in %@", widgetId, event.roomId);
Riot/Model/Room/RoomPreviewData.m
+9 -2
View File
@@ -51,12 +51,17 @@
if (self)
{
// Report public room data
_roomName = publicRoom.name;
_roomName = publicRoom.displayname;
_roomAvatarUrl = publicRoom.avatarUrl;
_roomTopic = publicRoom.topic;
_roomAliases = publicRoom.aliases;
_numJoinedMembers = publicRoom.numJoinedMembers;
// First try to fallback to the name if displayname isn't present
if (!_roomName.length) {
_roomName = publicRoom.name;
}
if (!_roomName.length)
{
// Consider the room aliases to define a default room name.
@@ -109,7 +114,9 @@
} failure:^(NSError *error) {
MXStrongifyAndReturnIfNil(self);
self->_roomName = self->_roomId;
if(self->_roomName == nil || self->_roomName.length == 0) {
self->_roomName = self->_roomId;
}
completion(NO);
}];
}
Riot/Modules/Home/Fallback/AuthFallBackViewController.m
-8
View File
@@ -203,14 +203,6 @@ NSString *FallBackViewControllerJavascriptOnLogin = @"window.matrixLogin.onLogin
return;
}
if (navigationAction.navigationType == WKNavigationTypeLinkActivated)
{
// Open links outside the app
[[UIApplication sharedApplication] openURL:navigationAction.request.URL options:@{} completionHandler:nil];
decisionHandler(WKNavigationActionPolicyCancel);
return;
}
decisionHandler(WKNavigationActionPolicyAllow);
}
Riot/Modules/Rooms/RoomsViewController.m
+2 -3
View File
@@ -267,13 +267,12 @@
// Preview the public room
if (publicRoom.worldReadable)
{
RoomPreviewData *roomPreviewData = [[RoomPreviewData alloc] initWithRoomId:publicRoom.roomId andSession:recentsDataSource.publicRoomsDirectoryDataSource.mxSession];
RoomPreviewData *roomPreviewData = [[RoomPreviewData alloc] initWithPublicRoom:publicRoom andSession:recentsDataSource.publicRoomsDirectoryDataSource.mxSession];
[self startActivityIndicator];
// Try to get more information about the room before opening its preview
[roomPreviewData peekInRoom:^(BOOL succeeded) {
[self stopActivityIndicator];
[[AppDelegate theDelegate].masterTabBarController showRoomPreview:roomPreviewData];
Riot/SupportingFiles/Info.plist
+2 -2
View File
@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.10.4</string>
<string>0.10.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.10.4</string>
<string>0.10.5</string>
<key>ITSAppUsesNonExemptEncryption</key>
<true/>
<key>ITSEncryptionExportComplianceCode</key>
RiotShareExtension/SupportingFiles/Info.plist
+2 -2
View File
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>0.10.4</string>
<string>0.10.5</string>
<key>CFBundleVersion</key>
<string>0.10.4</string>
<string>0.10.5</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
SiriIntents/Info.plist
+2 -2
View File
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>0.10.4</string>
<string>0.10.5</string>
<key>CFBundleVersion</key>
<string>0.10.4</string>
<string>0.10.5</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>