Skip to content

Commit 1fa5197

Browse files
authored
Merge pull request #32 from BranchMetrics/staging
2 parents d82fdd8 + 8b554e4 commit 1fa5197

File tree

8 files changed

+55
-235
lines changed

8 files changed

+55
-235
lines changed

Branch/BNCLocalization.m

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@ + (NSDictionary*_Nonnull) en_localized {
143143
@"The underlying network service does not conform to the BNCNetworkOperationProtocol.":
144144
@"The underlying network service does not conform to the BNCNetworkOperationProtocol.",
145145

146-
// BNCInvalidNetworkPublicKeyError
147-
@"Public key is not an SecKeyRef type.":
148-
@"Public key is not an SecKeyRef type.",
149-
150146
// BNCContentIdentifierError
151147
@"A canonical identifier or title are required to uniquely identify content.":
152148
@"A canonical identifier or title are required to uniquely identify content.",
@@ -235,10 +231,6 @@ + (NSDictionary*_Nonnull) ru_localized {
235231
@"The underlying network service does not conform to the BNCNetworkOperationProtocol.":
236232
@"Используемый сетевой сервис не соблюдает протокол BNCNetworkOperationProtocol.",
237233

238-
// BNCInvalidNetworkPublicKeyError
239-
@"Public key is not an SecKeyRef type.":
240-
@"Публичный ключ неверного типа. Ожидаемый тип: SecKeyRef.",
241-
242234
// BNCContentIdentifierError
243235
@"A canonical identifier or title are required to uniquely identify content.":
244236
@"Канонический идентификатор или название необходимы для идентификации контента.",

Branch/BNCNetworkAPIService.m

Lines changed: 0 additions & 209 deletions
Original file line numberDiff line numberDiff line change
@@ -300,215 +300,6 @@ - (void) clearNetworkQueue {
300300
}
301301
}
302302

303-
#pragma mark - Certificates
304-
305-
+ (SecKeyRef) publicSecKeyFromPKCS12CertChainData:(NSData*)keyData {
306-
OSStatus status = errSecSuccess;
307-
NSArray *items = nil;
308-
SecKeyRef secKey = NULL;
309-
SecTrustResultType trustType = kSecTrustResultInvalid;
310-
311-
// Release these
312-
CFArrayRef itemsRef = NULL;
313-
314-
NSDictionary *options = @{
315-
(id)kSecImportExportPassphrase: @"pass", // Mac requires a kSecImportExportPassphrase.
316-
};
317-
if (!keyData) {
318-
goto exit;
319-
}
320-
status = SecPKCS12Import((CFDataRef) keyData, (CFDictionaryRef)options, &itemsRef);
321-
if (status != errSecSuccess || !itemsRef || CFArrayGetCount(itemsRef) == 0) goto exit;
322-
323-
items = (__bridge NSArray*) itemsRef;
324-
SecTrustRef trust = (__bridge SecTrustRef)(items[0][(id)kSecImportItemTrust]);
325-
if (!trust) goto exit;
326-
327-
status = SecTrustEvaluate(trust, &trustType);
328-
if (trustType != kSecTrustResultInvalid) {
329-
secKey = SecTrustCopyPublicKey(trust);
330-
} else {
331-
status = errSecDecode;
332-
}
333-
334-
exit:
335-
if (secKey == NULL && status == errSecSuccess) {
336-
status = errSecItemNotFound;
337-
}
338-
if (status != errSecSuccess) {
339-
NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:status userInfo:nil];
340-
BNCLogError(@"Can't import public key from pkcs12 data: %@.", error);
341-
}
342-
if (itemsRef) CFRelease(itemsRef);
343-
return secKey;
344-
}
345-
346-
+ (NSArray/**<SecKeyRef>*/*) publicSecKeyRefs {
347-
348-
#pragma clang diagnostic push
349-
#pragma clang diagnostic ignored "-Wobjc-string-concatenation"
350-
351-
NSArray *hexKeys = @[
352-
353-
// star_branch_io.pub.p12
354-
@"30820b6102010330820b2706092a864886f70d010701a0820b1804820b1430820b10308205c70609"
355-
"2a864886f70d010706a08205b8308205b4020100308205ad06092a864886f70d010701301c060a2a"
356-
"864886f70d010c0106300e0408b2f4b4812a761cc402020800808205808cf564b6883d5fab3ca5e5"
357-
"87bcfcc3ca2694fd545b9d7941ca52638c25c922739ffc00d0e13476599c101d22bf29b545e2bd27"
358-
"59031249d19e8d1e16fc96fcc460e65450f178614052d45cffbf6ecb4bfe4ea26733d7f9f43492fa"
359-
"c9e35aa7d5a50aa91f6d0c2ef6cc3f14a38b4c83646a653018f0c36031f4dc461a22a6fcfc139c1e"
360-
"d060ae714cb3c6ecabd6b074004d5d2874ea92612591edfc6761e36f0488b90c7013f5d773bcdbc6"
361-
"ddbdade18198a6add9f01c0d7dbf8bf8724dd8e2f55088a9745dc74bc79a499225b08c1240dff655"
362-
"298e6ec97b74b91d70a65cf6c55c4f0b128051a45ab8c1c98b368e0162953ca4cac9372eb5a59719"
363-
"eac0781daaac26ce5b9e30522e75124c5e69ab21777c39c7c7d14a362d13f7991ee21d97af7d76b3"
364-
"b8271ddb022e81a165b6e98408b601f68660d9aa7bc1f48a6b76ffcdf7e66b976af31229b89daff2"
365-
"36e26dc60fcaeb512c6c437f99b1934e871228632ec1fcd13736f9544dcc5bb0388bde0b5e142029"
366-
"413d8de139830ac6b323db2fc2086d41208979eff8faaf74654f7370f5fd21a465a66832daff27ad"
367-
"bc3ce4b419df01b6f77a5f54faf34dd0676b2a5de525a8a1749756949a779573640c94b96c37fd12"
368-
"f0814560a52742742b5973b203c5eed93d6384ecc63474556bc169c34a762135708cf81e10b00bbf"
369-
"a551ddffa17b78bbfae0188b95aa3c9fd2923528170e8f930d72a0dc8875322b9ceb9afd8569dc14"
370-
"ee647757756868bcb4951ea5e022d096fead31e8ba6e254fe063f9627b40ed2649bdefb0e4a6c258"
371-
"6a6c58dbd894e1a4326d514d39b5eaac06550f7128c73ef039ae0247898cb98680cc575702463614"
372-
"84f8268ce5bf366579f0d0a9f1dfd90fcd972a65f8d95589214ed19369727d3c9ffc4e3088a7db55"
373-
"53e0b199de54e32e747aeab6f8624572bb5cd6efe7d5a27f26b3ffefed4830abdb434fe471ece6f8"
374-
"91b3404d1a5167a481d85377548a70f5f39c37b3e1a725c7f6f3f02bc500dbc8d3326f45b4d6c4ee"
375-
"39a1b9922496b413499254fd77bc4c5b5a8579a8cfb1a472b017baf3e13a769eedf2b20754ab2929"
376-
"f811d6a6a2fdd17cbdc1baca88d760f167a9321d956431c0300f4a63a831ba6430fc34d122a810e1"
377-
"d1b11b56ef35979386e222cd91643d4efc70e236c0efa8faf1895ed698dcc010d20bfa274e123f91"
378-
"61552b19574fe373d4d16d45d6048c4d1d935a58d2cdba5bd78330c5387799e3b31758ca593ab4ea"
379-
"1a101d997d5e0ea6bba9dfc814c8a7fd447c6612808c35ddb59a0145eda50e2fa6a5113eb4f5ef4e"
380-
"20e8769c204461f286d5257a74e591ef3b408b0a889a6cd3c8fd8011c4afcf05a17e36b503d78dba"
381-
"f019c51f851c11249467d6a226653546358622ed487238aa5fa91acb8a9603074bd56fa9aa797e8c"
382-
"b719c2e25c18c05c62f4b9646434217b890307a482ea0e074e3f4f354499495baac89f660d496585"
383-
"d655005e22070922f238cc8ec3b74762936df5913d3680a3cf2ccc83550a1b9d9ddcab8bc3b7f761"
384-
"a4762934c4b3992461978483396e867acc778254f1bd14989c0b46631e6f47548eb5e7cab400f299"
385-
"357b1a133413cf33a3deec3de244226ce9d60cb778f0545d761f3129e64d72b3ba9c4dc6dec40e92"
386-
"26a2ff72c38a6fcedda2173817c7bb523a3a7feae20126e5a7cd33ab0b844c21a58b096e40a121b1"
387-
"d5d70ea92b3f61417374ccff8935a0073197da9242ad419326dcaa9301331d5df3459f82614bfebf"
388-
"6a74a75c18c12abb8794b7badd623636a39b101bef78966369d33b3104c68a2979a107b79167519b"
389-
"9cb3dbabf8fd7a25b53aabff4e79d1f475b99306cc9c2f7849c79e2a37cb354ffd203fd673839aae"
390-
"0602c9d3ce4cdc695cd06fa3dec16b5740d35c04e3645d24682962a4f09e7f340ea2f0287a70b145"
391-
"c8c083ddbda493e880d9eeb6454e82e6814679bc8e477c75ea8aa5ec3ed389a4cce52bacd7308205"
392-
"4106092a864886f70d010701a08205320482052e3082052a30820526060b2a864886f70d010c0a01"
393-
"02a08204ee308204ea301c060a2a864886f70d010c0103300e04082d73660391f709240202080004"
394-
"8204c87691f8c778bea26c01a6a5a656b9b6546253ae94126ed43d5e4a3b31b3b3a9069ea09d11ea"
395-
"426465eead081da3b595cbd95aca497cf1d98fcb73d28684f565ae7b152cf0a826a553a274714b5c"
396-
"fb0d02d452b248e0ec8b7703181d00210aa60f4cfc0d83072d3d10e962e70bca7feef48433144323"
397-
"d1cb35dd4eba06288d624e0113ae8ea33076615eea97e24cd91b454b45578cf09f8905a64012aedf"
398-
"82e41516a90858cae0694449746526f79e76c3a44edcb7ba517d212c2fa6e831aa9a4df96343c8f7"
399-
"a630ab26f47b41aaf1c362f843914b5300bcfc37c1faf4ffce9acb12c78a704c495c1da0cfd96f35"
400-
"646e40e7501685fab143997005781cbce1c08279182c9712435f049870813a11094caaaf71a099a6"
401-
"4a279f9f1d8b365a512f6abac813bd190273973d44f10c7cfd12d9758d624fdc09bb451143aeb430"
402-
"9e01fe5ad409d1994e6b33cc31bd354a45ba68827705a345615087e1777ec0536301410fbde6e7f6"
403-
"863844f01f43c629db7f8ed76c3fcfac518c5ab824112b6eece6eca2701dc23abbd66c0d4b9a9892"
404-
"c885adfb92620a2783be4a09bd8abfd5e7bb612340f96f592d34d04c9c81c5d6e3141417fddc255f"
405-
"2e469202a33735aef02dbfc8b19a82b3fea8237ef5eaa041b217bb057a20f7d90aa1fbb50288d825"
406-
"042ecef4de1bc6eb21aa33acc6f987da79ec46bf91f88eafd167b89f294735cd55ac6af775be2226"
407-
"a5e958e6e31717b000da01bd0f8800f725a9f37490ae20687a8051d0b2389df783a18390393eb7e2"
408-
"d5b74e3cc47055b05d8def510fe8e08efbc770aa0fb0125c0ee9ca8c0fbf3dd3e5e60cbffb0d74e0"
409-
"ff15836bba27fdbce7d9bb4b204e7527b39fa192deba42863c23a710c62b0960dbada2de3594c2af"
410-
"1c7c61a02b67fbef7219f2efe9b36feabac2c8f8d34ff318fc5fc9843165b68204e6137664cdd9d2"
411-
"9738c88a49c5ea9f0ca84481e797956d821717fb80ab02eca785fc4fac53f36275e6833e063ea29c"
412-
"16391bf5840b6d5d45529f72012c8c22c5cd5a8518c9ddca6a73ea7c20008618b824d208626b102e"
413-
"2b20cbd34d394778b8cfcccc8d250f05371723dc3875b3a7ad03f0934b108d06131d1b178edb3a68"
414-
"f787216c16cea9e2f468f5cf602c172fab5c921de2e6fa9b47e81c61f4f79029a37b75894e979c20"
415-
"b3067f7d2eeddaa0bc0adad0f9b17ad37a338442aa3486da4272e7d58045873c73d1fe128138e06c"
416-
"c790d207fbd95e9acc6f052ee22b33389a142ba9447f9bceefb3fb7c1c2e13e98e27b46b3b738e20"
417-
"b96ea9e041852e99a73e95eae14189756bbfad2c0dcd55f61abd9687fbc302c5a5cc173f1bdf0422"
418-
"4c2ea60c129cc07a2edcf98fa4179e55fb95be0bbbe9eff9c41bc43f5f404afd28ec7f99e2e831d2"
419-
"a827b63bb7be5f23e815d724f2f44dc575727362d010bdfead4fe3ca2a02864de1901914dea214e7"
420-
"70b14f4665dd8d4424f1d84713e233665c8b522182c9329ed3bf0dea0f54a0533eb7d83b4adbac47"
421-
"9b1ec09e17283aaa535436063de8354f540ba22dd33636b7c9c2b7eebc551e6d38362a18b810b24b"
422-
"a760d09bbde49b8bcdfbfec029c401a789ebcab0d34b8a05821413d313afe78f78027d8741edcd13"
423-
"2c8541d10a75766ab82c5e82058102ceb46959c00916a5f90135098f23f089dadf60808269a5031d"
424-
"b941ecd48abfcdf24235f136daabfdee36a36ed26b3d995f51835d3125302306092a864886f70d01"
425-
"09153116041433d43dfd9efcdf7b8d8708b8cee57e9d59896bb830313021300906052b0e03021a05"
426-
"000414ea1ab3f87d18c4b624c3446e0173d2052e71a8150408c32f83c754ec517e02020800",
427-
428-
// backup.pub.p12
429-
@"30820a31020103308209f706092a864886f70d010701a08209e8048209e4308209e0308204970609"
430-
"2a864886f70d010706a0820488308204840201003082047d06092a864886f70d010701301c060a2a"
431-
"864886f70d010c0106300e04087317d07edab3645f02020800808204507290c6b815b98265350c80"
432-
"cf7a1376919081ae32c31f24ef1bb67e4a77d37016c65bb7f4acad23692238c3ddc729504219fa71"
433-
"a93318054390ca8a253358164494ace9861701c6fb58adbdf4fa6e8509df7e043464134bc284d7be"
434-
"5cd2729d50c8170555e7e98f0e7f5062c634babd1d4490ace2ae485d1fb024c85d0b2fd3deaddf88"
435-
"3fc35ed76db3c40e063accba1ae7386ea8087377ae765f4bbab8337f44d83ef4db3ce4361e1804cc"
436-
"4ee395ffca3231202303b54f1d5a9d9329f077a2737e2f1fb52cc6111724d89f80e16243f1d3cac5"
437-
"44312362fb2254498ca384a803400f4afa141a0c2bc0deba1c3e24ccfe9abaf45b008953c19f9d6e"
438-
"550d612dc3bd600cd8fecc8cd7a3e4ab5846470bfa0c2ee7f31c5b39f9859fdea82ed5310d068ca8"
439-
"6a761c9faee7ae472445aec10b08bf66ce6e0574e9d930e398d8b6b526fd2d6109f50ae24f7d21a7"
440-
"9ecc0f36cf58c50beb0f6ea360a34058893f039269d13e6c3710649f08e3c621a6d0bd901053cfd2"
441-
"a0742484e01e2df76c5f4e1286a38a792d06c2279731299c1d1aa1e2f7a283691c84ae3f85876344"
442-
"167cf6b13cb7ff0a8e23ee35fc3573e43df141b0ae4ba71b927039c830133ab1dff1fa1ac95e143a"
443-
"b306a0c59d3ec07c91b3c7659cd4d11713fdb15d0b05ad624ba6435dbeb52cede0a5852d708124f2"
444-
"044a51dabfdf7911b1c5bd88a83c0b03c6c2f984d0e5b00e231f6d4c3a2f1c8327671ecb311ea978"
445-
"4055426de3db02605d2a5e3b09bff7faf6f81a8ef816eebf672abc3bcf733fc9fce405ab65dea25d"
446-
"baa4dbcc8e8b263db4fbe02295dd619ee3d53a87a7dd4a79129ab1aa72faaa253118ea464212123b"
447-
"0dea5428d7fa6907394792f7d9a74219237cd5a759e5b0cf21473dcc6a1648eb3a377e94cfab5ec0"
448-
"f546c459a052cee0d79ddf1a44ae2dd97dcc0cc1a5b45e3fbd1ae24506c06724f2fc2c14be2ca965"
449-
"7c569702ceb94256ac146b2583e2a4a22cadb6ace82dcb00b4b4044cb38476ef056091d731ff2410"
450-
"9bddfd67d7b7c715ccd90f7acc6ecb9462db2174b0f3b08593a5b08f58d0f0fa256f214218090d78"
451-
"05494c26dd448bc92a647c61fe3fbd8a95f142e8eb1bbc080038a7f47b1e4574c6ec8423539b0181"
452-
"aabe071015dda4a521c5361d88bb1be6f0d23971072de03c0b4de364ef7697ddd5f989bdc3a3eaca"
453-
"0a1f8958896ca7650175bde212b4c9d400d99c10056266d1708d15bb47c20a143d06f7e934aba7a5"
454-
"18f6344e04dbb12e4b26e3be978e7e26fd32da60432e1ed06571b94dbbf04febc55d4babea733c89"
455-
"3185dc80e34e1677fbf706bd6d9b97934fbfa2aab5ad67354122a880a2a52e86c65776d43d5a5962"
456-
"b4c1d550f845bc61b7979c0a8808bbe36b061aba4b48a479bfcd308ed40c34f9690168344b9a9dd3"
457-
"1ce70c6e89baeda6a1e720e2bb26adab841d5e2f0934d5d92316574bbe99ffea8fe7419e3cd1a2d3"
458-
"31ee7efbe5cb1e02e67197b6c2e28f7a13729964b5426113c8122aa450e861d62ba829f506829fce"
459-
"9411d767cc9eb7da4560a4664e3082054106092a864886f70d010701a08205320482052e3082052a"
460-
"30820526060b2a864886f70d010c0a0102a08204ee308204ea301c060a2a864886f70d010c010330"
461-
"0e0408c8321002f801e42f02020800048204c8743bfdc5f0633c349ed9516d1b5c0fcfc5acdceac1"
462-
"3a77a3ab2efd91ceddfe21ac86e2da3a36d0c7cdfe1f6beddc359623be4fa5026a088caaaf5dae43"
463-
"99b1dacae8f0847ef597e918a1328c2424af5987e37f45e48d4e1153652a17d838aa50ba44a4b265"
464-
"cbe41e3d36f46294a7a71adcb858f0ef4bbdb560d555e8f4af9a061ca0aa591bde0c4d5d5ae6d227"
465-
"a91a895a00080b46513cb107ec088add31fa38cdd8f072ef93d6ea8377cbba857d5b76ddaad53fd5"
466-
"7747cf262939b76534bb670c52bc1b7bb197a0f985f9d38f66f92cc0eef3bede7a99ffffb258c755"
467-
"801dbbb768da1a5bb8aa9ef0a064c531e6eb88f2ed115bea05d1f8ce8ad59f736b90ed38f32c9d97"
468-
"ae62a19e0051f036b08b4c908787ec8143a1d87842eee0ee4bee6ef784c199d6527d49b7c9ba52ed"
469-
"648a39c0dd16b5f1fd815ffc6648bb1891e9d91917a751e35716b0019bed69e39a15ae0ed6b62cbb"
470-
"3af3fb977643df88b7a19820657657d0828dfd1c87402a93a992a7c8a6ddc024d4f13b90fb26ab5e"
471-
"0f29b05cc877fdd010bffcf1410bd8fece7a823d768187fddad1bb125feefde42bc030d7a3ddf334"
472-
"349f2414594ae39dadb0df3bb56b03a2b81ba7c16c4045ffdf1e6374d46af515849de593eed00a45"
473-
"14784063516fe8f43c326e8d3756df7e516da6a0f13be11b368010177e4e8bc9e1182043f0e244d2"
474-
"3f0af9dd21c3b0dc3f9f3e1a36d553cfa3d9efc2dfdf5ea0adf722d62e2e39672dd24d192e94e555"
475-
"2b3120112b419707d78ef683a21c3de056680b6d5dabd9e91f20da0a03ea0ce584ed85628bc44ec4"
476-
"3f1c9f23ee60131e28b95376ee1ff6e7b985035548d515a354a8a91d325821d5b65f74fab56cba28"
477-
"db473580e8d5492dd141622efa95dc473582de85ad522dbad33e473aec7d4b2712a4f4373a8f08c0"
478-
"bc71cb765e67ddd2132b7da6219971640954444100d3665f83cf7d3e4195c2b5859f078661a579f2"
479-
"cad13d1c97c989b82f93878e8c273157825b4fb6ac5fd035cd02db093c6d7c1bf24692a455a77546"
480-
"ea1490c1e846a194dd65f76bf28b21fb70718276c14f8aa855c38a7f4e24c408a6fb6e3698cebc77"
481-
"ae6186e1ccc5f54987b03221b65f18765d8b2285b59f25a2512d4be3b5e4a1292b141cd21b33e5a3"
482-
"b27aa5908c7d2f56bc82fb1ce14fc1fa344786179ac67db788cb508f11e72923714d5d4cce792a9b"
483-
"7525b8fabc8741a9b74303d88a345f79949f00620ecae07b80538d4c1814733cc748122864b00417"
484-
"1053daf2ba7f50e4e069b08ae7c114bed73a7f2f1b056da33d19e957ca06e7ab7289bbed1466c4d2"
485-
"79285d8fead0c1ddaad30d06cb212ee77e945289b4f9f2f0a00a705b68b52f172013ee962a9881d5"
486-
"f51be22b9520798344d7444700ffb3c7332ee9a08100db47c0017a08b207137f3984af74cc5c1fe6"
487-
"03e38b085b25df52d3a3821fcbe3bb077c90cbdc2470793143602f7d95dec38408e1980e6b009518"
488-
"abd97a95d7bea0bd188df7a338e9e112078531fd86327e82cb7bc14e767c2b7330b8c90b9172cb61"
489-
"8f3badae58af31b0efd5d0526b0b0623514b2f740f58cfa4c786d6c50e34032b5876d58a70992205"
490-
"9b6b1320b43abb8a10bd087dad0cbd81ced47a26436ad8dd1a12a51a2a4db9e76754e1796fc931db"
491-
"0bfdfba6577d53c42ee22aec2b72731efdd8912951ebe3d13a36e8c6b859eeb4b3334083f012e9d1"
492-
"1600d73125302306092a864886f70d010915311604142942010915a821745e3f65fd1a7b0e1daaf6"
493-
"d56930313021300906052b0e03021a05000414af689a53fc5fc774b1020bfa4e294bef4c9d29ea04"
494-
"08dbe20565b30b976b02020800"
495-
];
496-
497-
#pragma clang diagnostic pop
498-
499-
NSMutableArray *array = [NSMutableArray array];
500-
for (NSString* hexKey in hexKeys) {
501-
NSData *data = [NSData bnc_dataWithHexString:hexKey];
502-
if (data) {
503-
SecKeyRef secKey = [self publicSecKeyFromPKCS12CertChainData:data];
504-
if (secKey) [array addObject:(__bridge_transfer id)secKey];
505-
} else {
506-
BNCLogError(@"Can't read data for public key.");
507-
}
508-
}
509-
return array;
510-
}
511-
512303
@end
513304

514305
#pragma mark - BNCNetworkAPIOperation

Branch/BNCSettings.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,10 @@ - (void) clearUserIdentifyingInformation {
214214
self.randomizedBundleToken = nil;
215215
self.installParams = nil;
216216
*/
217+
218+
self.userIdentityForDeveloper = nil;
217219
self.sessionID = nil;
218220
self.requestMetadataDictionary = nil;
219-
self.userIdentityForDeveloper = nil;
220221
[self setNeedsSave];
221222
}
222223
}

Branch/BranchError.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ typedef NS_ENUM(NSInteger, BNCErrorCode) {
2929
BNCNilLogError = 1005, //!< Not used at the moment.
3030
BNCVersionError = 1006, //!< Not used at the moment.
3131
BNCNetworkServiceInterfaceError = 1007,
32-
BNCInvalidNetworkPublicKeyError = 1008,
33-
BNCContentIdentifierError = 1009,
34-
BNCSpotlightNotAvailableError = 1010,
35-
BNCSpotlightTitleError = 1011,
36-
BNCRedeemZeroCreditsError = 1012,
37-
BNCSpotlightIdentifierError = 1013,
38-
BNCSpotlightPublicIndexError = 1014,
39-
BNCTrackingDisabledError = 1015,
32+
BNCContentIdentifierError = 1008,
33+
BNCSpotlightNotAvailableError = 1009,
34+
BNCSpotlightTitleError = 1010,
35+
BNCRedeemZeroCreditsError = 1011,
36+
BNCSpotlightIdentifierError = 1012,
37+
BNCSpotlightPublicIndexError = 1013,
38+
BNCTrackingDisabledError = 1014,
4039
BNCHighestError,
4140
};
4241

Branch/BranchError.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ + (NSString*) messageForCode:(BNCErrorCode)code {
4949
// BNCNetworkServiceInterfaceError
5050
@"The underlying network service does not conform to the BNCNetworkOperationProtocol.",
5151

52-
// BNCInvalidNetworkPublicKeyError
53-
@"Public key is not an SecKeyRef type.",
54-
5552
// BNCContentIdentifierError
5653
@"A canonical identifier or title are required to uniquely identify content.",
5754

BranchTests/BNCTestNetworkService.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ NS_ASSUME_NONNULL_BEGIN
3535
- (id<BNCNetworkOperationProtocol>) networkOperationWithURLRequest:(NSMutableURLRequest*)request
3636
completion:(void (^)(id<BNCNetworkOperationProtocol>operation))completion;
3737

38-
- (NSError*_Nullable) pinSessionToPublicSecKeyRefs:(NSArray/**<SecKeyRef>*/*_Nullable)publicKeys;
39-
4038
//@property (atomic, strong) NSDictionary*_Nullable userInfo;
4139

4240
// Properties and methods for mocking tests:

BranchTests/BNCTestNetworkService.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ + (NSMutableDictionary*) mutableDictionaryFromRequest:(NSURLRequest*)request {
8585
return operation;
8686
}
8787

88-
- (NSError*_Nullable) pinSessionToPublicSecKeyRefs:(NSArray/**<SecKeyRef>*/*_Nullable)publicKeys {
89-
return nil;
90-
}
91-
9288
- (void) startOperation:(BNCTestNetworkOperation*)operation {
9389
operation.networkService = self;
9490
// operation.startDate = [NSDate date];

0 commit comments

Comments
 (0)