Skip to content

Commit 6834ead

Browse files
antonargunovantonargunov
authored
Merge pull request #117 from antonargunov/master
version 7.0.1
2 parents 67e2b31 + de08deb commit 6834ead

File tree

8 files changed

+1710
-98
lines changed

8 files changed

+1710
-98
lines changed

‎Branch-Xamarin-Lib.iOS/ApiDefinition.cs‎

Lines changed: 93 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -301,104 +301,104 @@ interface BNCPreferenceHelper
301301
void ClearAll();
302302
}
303303

304-
// @protocol BNCNetworkOperationProtocol <NSObject>
305-
/*
306-
Check whether adding [Model] to this declaration is appropriate.
307-
[Model] is used to generate a C# class that implements this protocol,
308-
and might be useful for protocols that consumers are supposed to implement,
309-
since consumers can subclass the generated class instead of implementing
310-
the generated interface. If consumers are not supposed to implement this
311-
protocol, then [Model] is redundant and will generate code that will never
312-
be used.
313-
*/
314-
[Protocol]
315-
[BaseType(typeof(NSObject))]
316-
interface BNCNetworkOperationProtocol
317-
{
318-
// @required @property (readonly, copy) NSURLRequest * request;
319-
[Abstract]
320-
[Export("request", ArgumentSemantic.Copy)]
321-
NSUrlRequest Request { get; }
322-
323-
// @required @property (readonly, copy) NSHTTPURLResponse * response;
324-
[Abstract]
325-
[Export("response", ArgumentSemantic.Copy)]
326-
NSHttpUrlResponse Response { get; }
327-
328-
// @required @property (readonly, strong) NSData * responseData;
329-
[Abstract]
330-
[Export("responseData", ArgumentSemantic.Strong)]
331-
NSData ResponseData { get; }
332-
333-
// @required @property (readonly, copy) NSError * error;
334-
[Abstract]
335-
[Export("error", ArgumentSemantic.Copy)]
336-
NSError Error { get; }
337-
338-
// @required @property (readonly, copy) NSDate * startDate;
339-
[Abstract]
340-
[Export("startDate", ArgumentSemantic.Copy)]
341-
NSDate StartDate { get; }
342-
343-
// @required @property (readonly, copy) NSDate * timeoutDate;
344-
[Abstract]
345-
[Export("timeoutDate", ArgumentSemantic.Copy)]
346-
NSDate TimeoutDate { get; }
347-
348-
// @required @property (strong) NSDictionary * userInfo;
349-
[Abstract]
350-
[Export("userInfo", ArgumentSemantic.Strong)]
351-
NSDictionary UserInfo { get; set; }
352-
353-
// @required -(void)start;
354-
[Abstract]
355-
[Export("start")]
356-
void Start();
357-
358-
// @optional -(void)cancel;
359-
[Export("cancel")]
360-
void Cancel();
361-
}
304+
//// @protocol BNCNetworkOperationProtocol <NSObject>
305+
///*
306+
// Check whether adding [Model] to this declaration is appropriate.
307+
// [Model] is used to generate a C# class that implements this protocol,
308+
// and might be useful for protocols that consumers are supposed to implement,
309+
// since consumers can subclass the generated class instead of implementing
310+
// the generated interface. If consumers are not supposed to implement this
311+
// protocol, then [Model] is redundant and will generate code that will never
312+
// be used.
313+
//*/
314+
//[Protocol]
315+
//[BaseType(typeof(NSObject))]
316+
//interface BNCNetworkOperationProtocol
317+
//{
318+
// // @required @property (readonly, copy) NSURLRequest * request;
319+
// [Abstract]
320+
// [Export("request", ArgumentSemantic.Copy)]
321+
// NSUrlRequest Request { get; }
362322

363-
// @protocol BNCNetworkServiceProtocol <NSObject>
364-
/*
365-
Check whether adding [Model] to this declaration is appropriate.
366-
[Model] is used to generate a C# class that implements this protocol,
367-
and might be useful for protocols that consumers are supposed to implement,
368-
since consumers can subclass the generated class instead of implementing
369-
the generated interface. If consumers are not supposed to implement this
370-
protocol, then [Model] is redundant and will generate code that will never
371-
be used.
372-
*/
373-
[Protocol]
374-
[BaseType(typeof(NSObject))]
375-
interface BNCNetworkServiceProtocol
376-
{
377-
// @required +(id<BNCNetworkServiceProtocol>)new;
378-
[Static, Abstract]
379-
[Export("new")]
380-
//[Verify(MethodToProperty)]
381-
BNCNetworkServiceProtocol New { get; }
323+
// // @required @property (readonly, copy) NSHTTPURLResponse * response;
324+
// [Abstract]
325+
// [Export("response", ArgumentSemantic.Copy)]
326+
// NSHttpUrlResponse Response { get; }
382327

383-
// @optional -(void)cancelAllOperations;
384-
[Export("cancelAllOperations")]
385-
void CancelAllOperations();
328+
// // @required @property (readonly, strong) NSData * responseData;
329+
// [Abstract]
330+
// [Export("responseData", ArgumentSemantic.Strong)]
331+
// NSData ResponseData { get; }
386332

387-
// @required -(id<BNCNetworkOperationProtocol>)networkOperationWithURLRequest:(NSMutableURLRequest *)request completion:(void (^)(id<BNCNetworkOperationProtocol>))completion;
388-
[Abstract]
389-
[Export("networkOperationWithURLRequest:completion:")]
390-
BNCNetworkOperationProtocol NetworkOperationWithURLRequest(NSMutableUrlRequest request, Action<BNCNetworkOperationProtocol> completion);
333+
// // @required @property (readonly, copy) NSError * error;
334+
// [Abstract]
335+
// [Export("error", ArgumentSemantic.Copy)]
336+
// NSError Error { get; }
391337

392-
// @required @property (strong) NSDictionary * userInfo;
393-
[Abstract]
394-
[Export("userInfo", ArgumentSemantic.Strong)]
395-
NSDictionary UserInfo { get; set; }
338+
// // @required @property (readonly, copy) NSDate * startDate;
339+
// [Abstract]
340+
// [Export("startDate", ArgumentSemantic.Copy)]
341+
// NSDate StartDate { get; }
396342

397-
// @optional -(NSError *)pinSessionToPublicSecKeyRefs:(NSArray *)publicKeys;
398-
[Export("pinSessionToPublicSecKeyRefs:")]
399-
//[Verify(StronglyTypedNSArray)]
400-
NSError PinSessionToPublicSecKeyRefs(NSObject[] publicKeys);
401-
}
343+
// // @required @property (readonly, copy) NSDate * timeoutDate;
344+
// [Abstract]
345+
// [Export("timeoutDate", ArgumentSemantic.Copy)]
346+
// NSDate TimeoutDate { get; }
347+
348+
// // @required @property (strong) NSDictionary * userInfo;
349+
// [Abstract]
350+
// [Export("userInfo", ArgumentSemantic.Strong)]
351+
// NSDictionary UserInfo { get; set; }
352+
353+
// // @required -(void)start;
354+
// [Abstract]
355+
// [Export("start")]
356+
// void Start();
357+
358+
// // @optional -(void)cancel;
359+
// [Export("cancel")]
360+
// void Cancel();
361+
//}
362+
363+
//// @protocol BNCNetworkServiceProtocol <NSObject>
364+
///*
365+
// Check whether adding [Model] to this declaration is appropriate.
366+
// [Model] is used to generate a C# class that implements this protocol,
367+
// and might be useful for protocols that consumers are supposed to implement,
368+
// since consumers can subclass the generated class instead of implementing
369+
// the generated interface. If consumers are not supposed to implement this
370+
// protocol, then [Model] is redundant and will generate code that will never
371+
// be used.
372+
//*/
373+
//[Protocol]
374+
//[BaseType(typeof(NSObject))]
375+
//interface BNCNetworkServiceProtocol
376+
//{
377+
// // @required +(id<BNCNetworkServiceProtocol>)new;
378+
// [Static, Abstract]
379+
// [Export("new")]
380+
// //[Verify(MethodToProperty)]
381+
// BNCNetworkServiceProtocol New { get; }
382+
383+
// // @optional -(void)cancelAllOperations;
384+
// [Export("cancelAllOperations")]
385+
// void CancelAllOperations();
386+
387+
// // @required -(id<BNCNetworkOperationProtocol>)networkOperationWithURLRequest:(NSMutableURLRequest *)request completion:(void (^)(id<BNCNetworkOperationProtocol>))completion;
388+
// [Abstract]
389+
// [Export("networkOperationWithURLRequest:completion:")]
390+
// BNCNetworkOperationProtocol NetworkOperationWithURLRequest(NSMutableUrlRequest request, Action<BNCNetworkOperationProtocol> completion);
391+
392+
// // @required @property (strong) NSDictionary * userInfo;
393+
// [Abstract]
394+
// [Export("userInfo", ArgumentSemantic.Strong)]
395+
// NSDictionary UserInfo { get; set; }
396+
397+
// // @optional -(NSError *)pinSessionToPublicSecKeyRefs:(NSArray *)publicKeys;
398+
// [Export("pinSessionToPublicSecKeyRefs:")]
399+
// //[Verify(StronglyTypedNSArray)]
400+
// NSError PinSessionToPublicSecKeyRefs(NSObject[] publicKeys);
401+
//}
402402

403403
// typedef void (^BNCServerCallback)(BNCServerResponse *, NSError *);
404404
delegate void BNCServerCallback(BNCServerResponse arg0, NSError arg1);

‎Branch-Xamarin-SDK.Droid/BranchAndroid.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private AndroidNativeBranch NativeBranch {
4747

4848
public static void GetAutoInstance(Context appContext) {
4949
BranchUtil.SetPluginType(BranchUtil.PluginType.Xamarin);
50-
BranchUtil.PluginVersion = "7.0.0";
50+
BranchUtil.PluginVersion = "7.0.1";
5151

5252
AndroidNativeBranch.GetAutoInstance(appContext);
5353
AndroidNativeBranch.DisableInstantDeepLinking(true);

‎Branch-Xamarin-SDK.iOS/BranchIOS.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchSes
5252
Branch.branchInstance = instance;
5353
instance.branchKey = branchKey;
5454

55-
instance.NativeBranch.RegisterPluginName("xamarin.ios", "7.0.0");
55+
instance.NativeBranch.RegisterPluginName("Xamarin", "7.0.1");
5656
//IOSNativeBranch.RegisterPluginName();
5757

5858
if (launchOptions != null) {
@@ -85,7 +85,7 @@ public static void Init(String branchKey, NSDictionary launchOptions, IBranchBUO
8585
Branch.branchInstance = instance;
8686
instance.branchKey = branchKey;
8787

88-
instance.NativeBranch.RegisterPluginName("xamarin.ios", "7.0.0");
88+
instance.NativeBranch.RegisterPluginName("Xamarin", "7.0.1");
8989

9090
if (launchOptions != null) {
9191
instance.launchOptions = new NSDictionary (launchOptions);

0 commit comments

Comments
 (0)