Skip to content

Commit 96dd049

Browse files
ignatovvignatovv
authored
Merge pull request #4229 from anyproto/ios-5444-hotfix-0412
Ios 5444 hotfix 0412
2 parents 64f2ac7 + ab77a9a commit 96dd049

File tree

14 files changed

+194
-461
lines changed

14 files changed

+194
-461
lines changed

‎Anytype.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@
10521052
"$(inherited)",
10531053
"@executable_path/Frameworks",
10541054
);
1055-
MARKETING_VERSION = 0.41.1;
1055+
MARKETING_VERSION = 0.41.2;
10561056
OTHER_LDFLAGS = "-ObjC";
10571057
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev;
10581058
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1095,7 +1095,7 @@
10951095
"$(inherited)",
10961096
"@executable_path/Frameworks",
10971097
);
1098-
MARKETING_VERSION = 0.41.1;
1098+
MARKETING_VERSION = 0.41.2;
10991099
OTHER_LDFLAGS = "-ObjC";
11001100
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app;
11011101
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1122,7 +1122,7 @@
11221122
"@executable_path/Frameworks",
11231123
"@loader_path/Frameworks",
11241124
);
1125-
MARKETING_VERSION = 0.41.1;
1125+
MARKETING_VERSION = 0.41.2;
11261126
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
11271127
PRODUCT_NAME = "$(TARGET_NAME)";
11281128
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1147,7 +1147,7 @@
11471147
"@executable_path/Frameworks",
11481148
"@loader_path/Frameworks",
11491149
);
1150-
MARKETING_VERSION = 0.41.1;
1150+
MARKETING_VERSION = 0.41.2;
11511151
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
11521152
PRODUCT_NAME = "$(TARGET_NAME)";
11531153
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1263,7 +1263,7 @@
12631263
"$(inherited)",
12641264
"@executable_path/Frameworks",
12651265
);
1266-
MARKETING_VERSION = 0.41.1;
1266+
MARKETING_VERSION = 0.41.2;
12671267
OTHER_LDFLAGS = "-ObjC";
12681268
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev;
12691269
PRODUCT_NAME = "$(TARGET_NAME) Dev";
@@ -1290,7 +1290,7 @@
12901290
"@executable_path/Frameworks",
12911291
"@loader_path/Frameworks",
12921292
);
1293-
MARKETING_VERSION = 0.41.1;
1293+
MARKETING_VERSION = 0.41.2;
12941294
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
12951295
PRODUCT_NAME = "$(TARGET_NAME)";
12961296
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1329,7 +1329,7 @@
13291329
"@executable_path/../../Frameworks",
13301330
);
13311331
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1332-
MARKETING_VERSION = 0.41.1;
1332+
MARKETING_VERSION = 0.41.2;
13331333
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.AnytypeNotificationExtension;
13341334
PRODUCT_NAME = "$(TARGET_NAME)";
13351335
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1403,7 +1403,7 @@
14031403
"@executable_path/../../Frameworks",
14041404
);
14051405
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1406-
MARKETING_VERSION = 0.41.1;
1406+
MARKETING_VERSION = 0.41.2;
14071407
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.AnytypeNotificationExtension;
14081408
PRODUCT_NAME = "$(TARGET_NAME)";
14091409
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1479,7 +1479,7 @@
14791479
"@executable_path/../../Frameworks",
14801480
);
14811481
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1482-
MARKETING_VERSION = 0.41.1;
1482+
MARKETING_VERSION = 0.41.2;
14831483
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.AnytypeNotificationExtension;
14841484
PRODUCT_NAME = "$(TARGET_NAME)";
14851485
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1555,7 +1555,7 @@
15551555
"@executable_path/../../Frameworks",
15561556
);
15571557
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1558-
MARKETING_VERSION = 0.41.1;
1558+
MARKETING_VERSION = 0.41.2;
15591559
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.AnytypeNotificationExtension;
15601560
PRODUCT_NAME = "$(TARGET_NAME)";
15611561
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1675,7 +1675,7 @@
16751675
"$(inherited)",
16761676
"@executable_path/Frameworks",
16771677
);
1678-
MARKETING_VERSION = 0.41.1;
1678+
MARKETING_VERSION = 0.41.2;
16791679
OTHER_LDFLAGS = "-ObjC";
16801680
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app;
16811681
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1701,7 +1701,7 @@
17011701
"@executable_path/Frameworks",
17021702
"@loader_path/Frameworks",
17031703
);
1704-
MARKETING_VERSION = 0.41.1;
1704+
MARKETING_VERSION = 0.41.2;
17051705
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
17061706
PRODUCT_NAME = "$(TARGET_NAME)";
17071707
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1733,7 +1733,7 @@
17331733
"@executable_path/Frameworks",
17341734
"@executable_path/../../Frameworks",
17351735
);
1736-
MARKETING_VERSION = 0.41.1;
1736+
MARKETING_VERSION = 0.41.2;
17371737
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.homewidget;
17381738
PRODUCT_NAME = "$(TARGET_NAME)";
17391739
PROVISIONING_PROFILE_SPECIFIER = "match Development io.anytype.app.homewidget";
@@ -1764,7 +1764,7 @@
17641764
"@executable_path/Frameworks",
17651765
"@executable_path/../../Frameworks",
17661766
);
1767-
MARKETING_VERSION = 0.41.1;
1767+
MARKETING_VERSION = 0.41.2;
17681768
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.AnytypeShareExtension;
17691769
PRODUCT_NAME = "$(TARGET_NAME)";
17701770
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1838,7 +1838,7 @@
18381838
"@executable_path/../../Frameworks",
18391839
);
18401840
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
1841-
MARKETING_VERSION = 0.41.1;
1841+
MARKETING_VERSION = 0.41.2;
18421842
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.AnytypeNotificationExtension;
18431843
PRODUCT_NAME = "$(TARGET_NAME)";
18441844
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1958,7 +1958,7 @@
19581958
"$(inherited)",
19591959
"@executable_path/Frameworks",
19601960
);
1961-
MARKETING_VERSION = 0.41.1;
1961+
MARKETING_VERSION = 0.41.2;
19621962
OTHER_LDFLAGS = "-ObjC";
19631963
PRODUCT_BUNDLE_IDENTIFIER = org.any.app;
19641964
PRODUCT_NAME = Any;
@@ -1984,7 +1984,7 @@
19841984
"@executable_path/Frameworks",
19851985
"@loader_path/Frameworks",
19861986
);
1987-
MARKETING_VERSION = 0.41.1;
1987+
MARKETING_VERSION = 0.41.2;
19881988
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
19891989
PRODUCT_NAME = "$(TARGET_NAME)";
19901990
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2016,7 +2016,7 @@
20162016
"@executable_path/Frameworks",
20172017
"@executable_path/../../Frameworks",
20182018
);
2019-
MARKETING_VERSION = 0.41.1;
2019+
MARKETING_VERSION = 0.41.2;
20202020
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.homewidget;
20212021
PRODUCT_NAME = "$(TARGET_NAME)";
20222022
PROVISIONING_PROFILE_SPECIFIER = "match Development org.any.app.homewidget";
@@ -2047,7 +2047,7 @@
20472047
"@executable_path/Frameworks",
20482048
"@executable_path/../../Frameworks",
20492049
);
2050-
MARKETING_VERSION = 0.41.1;
2050+
MARKETING_VERSION = 0.41.2;
20512051
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.AnytypeShareExtension;
20522052
PRODUCT_NAME = "$(TARGET_NAME)";
20532053
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2121,7 +2121,7 @@
21212121
"@executable_path/../../Frameworks",
21222122
);
21232123
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
2124-
MARKETING_VERSION = 0.41.1;
2124+
MARKETING_VERSION = 0.41.2;
21252125
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.AnytypeNotificationExtension;
21262126
PRODUCT_NAME = "$(TARGET_NAME)";
21272127
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2239,7 +2239,7 @@
22392239
"$(inherited)",
22402240
"@executable_path/Frameworks",
22412241
);
2242-
MARKETING_VERSION = 0.41.1;
2242+
MARKETING_VERSION = 0.41.2;
22432243
OTHER_LDFLAGS = "-ObjC";
22442244
PRODUCT_BUNDLE_IDENTIFIER = org.any.app;
22452245
PRODUCT_NAME = Any;
@@ -2266,7 +2266,7 @@
22662266
"@executable_path/Frameworks",
22672267
"@loader_path/Frameworks",
22682268
);
2269-
MARKETING_VERSION = 0.41.1;
2269+
MARKETING_VERSION = 0.41.2;
22702270
PRODUCT_BUNDLE_IDENTIFIER = com.AnytypeTests;
22712271
PRODUCT_NAME = "$(TARGET_NAME)";
22722272
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2298,7 +2298,7 @@
22982298
"@executable_path/Frameworks",
22992299
"@executable_path/../../Frameworks",
23002300
);
2301-
MARKETING_VERSION = 0.41.1;
2301+
MARKETING_VERSION = 0.41.2;
23022302
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.homewidget;
23032303
PRODUCT_NAME = "$(TARGET_NAME)";
23042304
PROVISIONING_PROFILE_SPECIFIER = "match AppStore org.any.app.homewidget";
@@ -2328,7 +2328,7 @@
23282328
"@executable_path/Frameworks",
23292329
"@executable_path/../../Frameworks",
23302330
);
2331-
MARKETING_VERSION = 0.41.1;
2331+
MARKETING_VERSION = 0.41.2;
23322332
PRODUCT_BUNDLE_IDENTIFIER = org.any.app.AnytypeShareExtension;
23332333
PRODUCT_NAME = "$(TARGET_NAME)";
23342334
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2358,7 +2358,7 @@
23582358
"@executable_path/Frameworks",
23592359
"@executable_path/../../Frameworks",
23602360
);
2361-
MARKETING_VERSION = 0.41.1;
2361+
MARKETING_VERSION = 0.41.2;
23622362
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.AnytypeShareExtension;
23632363
PRODUCT_NAME = "$(TARGET_NAME)";
23642364
PROVISIONING_PROFILE_SPECIFIER = "match Development io.anytype.app.dev.AnytypeShareExtension";
@@ -2387,7 +2387,7 @@
23872387
"@executable_path/Frameworks",
23882388
"@executable_path/../../Frameworks",
23892389
);
2390-
MARKETING_VERSION = 0.41.1;
2390+
MARKETING_VERSION = 0.41.2;
23912391
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.AnytypeShareExtension;
23922392
PRODUCT_NAME = "$(TARGET_NAME)";
23932393
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2417,7 +2417,7 @@
24172417
"@executable_path/Frameworks",
24182418
"@executable_path/../../Frameworks",
24192419
);
2420-
MARKETING_VERSION = 0.41.1;
2420+
MARKETING_VERSION = 0.41.2;
24212421
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.AnytypeShareExtension;
24222422
PRODUCT_NAME = "$(TARGET_NAME)";
24232423
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2448,7 +2448,7 @@
24482448
"@executable_path/Frameworks",
24492449
"@executable_path/../../Frameworks",
24502450
);
2451-
MARKETING_VERSION = 0.41.1;
2451+
MARKETING_VERSION = 0.41.2;
24522452
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.homewidget;
24532453
PRODUCT_NAME = "$(TARGET_NAME)";
24542454
PROVISIONING_PROFILE_SPECIFIER = "match Development io.anytype.app.dev.homewidget";
@@ -2479,7 +2479,7 @@
24792479
"@executable_path/Frameworks",
24802480
"@executable_path/../../Frameworks",
24812481
);
2482-
MARKETING_VERSION = 0.41.1;
2482+
MARKETING_VERSION = 0.41.2;
24832483
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.homewidget;
24842484
PRODUCT_NAME = "$(TARGET_NAME)";
24852485
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.anytype.app.homewidget";
@@ -2510,7 +2510,7 @@
25102510
"@executable_path/Frameworks",
25112511
"@executable_path/../../Frameworks",
25122512
);
2513-
MARKETING_VERSION = 0.41.1;
2513+
MARKETING_VERSION = 0.41.2;
25142514
PRODUCT_BUNDLE_IDENTIFIER = io.anytype.app.dev.homewidget;
25152515
PRODUCT_NAME = "$(TARGET_NAME)";
25162516
PROVISIONING_PROFILE_SPECIFIER = "match AppStore io.anytype.app.dev.homewidget";

‎Anytype/Sources/PresentationLayer/Modules/SpaceNotificationsSettings/SpaceNotificationsSettingsMode.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ extension SpacePushNotificationsMode {
5151
switch self {
5252
case .all: return .allActiviy
5353
case .mentions: return .mentions
54-
case .nothing, .custom, .UNRECOGNIZED(_): return .disabled
54+
case .nothing, .UNRECOGNIZED(_): return .disabled
5555
}
5656
}
5757

@@ -64,7 +64,6 @@ extension SpacePushNotificationsMode {
6464
case .all: return "All"
6565
case .mentions: return "Mentions"
6666
case .nothing: return "Nothing"
67-
case .custom: return "Custom"
6867
case .UNRECOGNIZED(_): return ""
6968
}
7069
}

‎Libraryfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
MIDDLE_VERSION=v0.45.0-rc02
1+
MIDDLE_VERSION=v0.45.0-rc03

‎Modules/ProtobufMessages/Sources/Generated/CommandsInvocation/invocation-adoption.generated.swift‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,23 +1355,18 @@ extension Anytype_Rpc.Publishing.ResolveUri.Response.Error: ResponseError {
13551355
public var isNull: Bool { code == .null && description_p.isEmpty }
13561356
}
13571357

1358-
extension Anytype_Rpc.PushNotification.AddAllIds.Response: ResultWithError {}
1359-
extension Anytype_Rpc.PushNotification.AddAllIds.Response.Error: ResponseError {
1360-
public var isNull: Bool { code == .null && description_p.isEmpty }
1361-
}
1362-
1363-
extension Anytype_Rpc.PushNotification.AddMentionIds.Response: ResultWithError {}
1364-
extension Anytype_Rpc.PushNotification.AddMentionIds.Response.Error: ResponseError {
1358+
extension Anytype_Rpc.PushNotification.RegisterToken.Response: ResultWithError {}
1359+
extension Anytype_Rpc.PushNotification.RegisterToken.Response.Error: ResponseError {
13651360
public var isNull: Bool { code == .null && description_p.isEmpty }
13661361
}
13671362

1368-
extension Anytype_Rpc.PushNotification.AddMuteIds.Response: ResultWithError {}
1369-
extension Anytype_Rpc.PushNotification.AddMuteIds.Response.Error: ResponseError {
1363+
extension Anytype_Rpc.PushNotification.ResetIds.Response: ResultWithError {}
1364+
extension Anytype_Rpc.PushNotification.ResetIds.Response.Error: ResponseError {
13701365
public var isNull: Bool { code == .null && description_p.isEmpty }
13711366
}
13721367

1373-
extension Anytype_Rpc.PushNotification.RegisterToken.Response: ResultWithError {}
1374-
extension Anytype_Rpc.PushNotification.RegisterToken.Response.Error: ResponseError {
1368+
extension Anytype_Rpc.PushNotification.SetForceModeIds.Response: ResultWithError {}
1369+
extension Anytype_Rpc.PushNotification.SetForceModeIds.Response.Error: ResponseError {
13751370
public var isNull: Bool { code == .null && description_p.isEmpty }
13761371
}
13771372

‎Modules/ProtobufMessages/Sources/Generated/service+invocation.swift‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,33 +3054,23 @@ public struct ClientCommands {
30543054
}
30553055
}
30563056

3057-
public static func pushNotificationAddMuteIds(
3058-
_ request: Anytype_Rpc.PushNotification.AddMuteIds.Request = .init()
3059-
) -> Invocation<Anytype_Rpc.PushNotification.AddMuteIds.Request, Anytype_Rpc.PushNotification.AddMuteIds.Response> {
3060-
return Invocation(messageName: "PushNotificationAddMuteIds", request: request) { request in
3057+
public static func pushNotificationSetForceModeIds(
3058+
_ request: Anytype_Rpc.PushNotification.SetForceModeIds.Request = .init()
3059+
) -> Invocation<Anytype_Rpc.PushNotification.SetForceModeIds.Request, Anytype_Rpc.PushNotification.SetForceModeIds.Response> {
3060+
return Invocation(messageName: "PushNotificationSetForceModeIds", request: request) { request in
30613061
let requestData = try request.serializedData()
3062-
let responseData = Lib.ServicePushNotificationAddMuteIds(requestData) ?? Data()
3063-
return try Anytype_Rpc.PushNotification.AddMuteIds.Response(serializedBytes: responseData)
3062+
let responseData = Lib.ServicePushNotificationSetForceModeIds(requestData) ?? Data()
3063+
return try Anytype_Rpc.PushNotification.SetForceModeIds.Response(serializedBytes: responseData)
30643064
}
30653065
}
30663066

3067-
public static func pushNotificationAddMentionIds(
3068-
_ request: Anytype_Rpc.PushNotification.AddMentionIds.Request = .init()
3069-
) -> Invocation<Anytype_Rpc.PushNotification.AddMentionIds.Request, Anytype_Rpc.PushNotification.AddMentionIds.Response> {
3070-
return Invocation(messageName: "PushNotificationAddMentionIds", request: request) { request in
3067+
public static func pushNotificationResetIds(
3068+
_ request: Anytype_Rpc.PushNotification.ResetIds.Request = .init()
3069+
) -> Invocation<Anytype_Rpc.PushNotification.ResetIds.Request, Anytype_Rpc.PushNotification.ResetIds.Response> {
3070+
return Invocation(messageName: "PushNotificationResetIds", request: request) { request in
30713071
let requestData = try request.serializedData()
3072-
let responseData = Lib.ServicePushNotificationAddMentionIds(requestData) ?? Data()
3073-
return try Anytype_Rpc.PushNotification.AddMentionIds.Response(serializedBytes: responseData)
3074-
}
3075-
}
3076-
3077-
public static func pushNotificationAddAllIds(
3078-
_ request: Anytype_Rpc.PushNotification.AddAllIds.Request = .init()
3079-
) -> Invocation<Anytype_Rpc.PushNotification.AddAllIds.Request, Anytype_Rpc.PushNotification.AddAllIds.Response> {
3080-
return Invocation(messageName: "PushNotificationAddAllIds", request: request) { request in
3081-
let requestData = try request.serializedData()
3082-
let responseData = Lib.ServicePushNotificationAddAllIds(requestData) ?? Data()
3083-
return try Anytype_Rpc.PushNotification.AddAllIds.Response(serializedBytes: responseData)
3072+
let responseData = Lib.ServicePushNotificationResetIds(requestData) ?? Data()
3073+
return try Anytype_Rpc.PushNotification.ResetIds.Response(serializedBytes: responseData)
30843074
}
30853075
}
30863076

0 commit comments

Comments
 (0)