Skip to content

Commit 67e2b31

Browse files
antonargunovantonargunov
authored
Merge pull request #115 from antonargunov/master
version 7.0.0
2 parents 3798498 + 9986390 commit 67e2b31

File tree

11 files changed

+33
-1625
lines changed

11 files changed

+33
-1625
lines changed

‎Branch-Xamarin-Lib.Droid/Branch-Xamarin-Lib.Droid.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<TransformFile Include="Transforms\EnumMethods.xml" />
5555
</ItemGroup>
5656
<ItemGroup>
57-
<EmbeddedJar Include="Jars\Branch-4.2.1_core.jar" />
57+
<EmbeddedJar Include="Jars\Branch-4.3.2_core.jar" />
5858
</ItemGroup>
5959
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
6060
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Branch-Xamarin-Lib.Droid/Jars/Branch-4.2.1_core.jar renamed to Branch-Xamarin-Lib.Droid/Jars/Branch-4.3.2_core.jar

322 KB
Binary file not shown.

‎Branch-Xamarin-Lib.Droid/Transforms/Metadata.xml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<metadata>
22

3-
<attr path="/api/package[@name='io.branch.referral']/class[@name='BranchUrlBuilder']" name="visibility">public</attr>
4-
<!-- <attr path="/api/package[@name='io.branch.referral']/class[@name='RemoteInterface']" name="visibility">public</attr>-->
5-
<attr path="/api/package[@name='io.branch.referral']/class[@name='BranchLinkData']" name="visibility">public</attr>
6-
<attr path="/api/package[@name='io.branch.referral']/class[@name='SystemObserver']" name="visibility">public</attr>
7-
<attr path="/api/package[@name='io.branch.referral']/interface[@name='NetworkCallback']" name="visibility">public</attr>
8-
<attr path="/api/package[@name='io.branch.referral']/class[@name='ServerRequest']/method[@name='getRequestPath']" name="managedName">getRequestPath</attr>
9-
<attr path="/api/package[@name='io.branch.referral']/class[@name='Branch']" name="managedName">AndroidNativeBranch</attr>
10-
<remove-node path="/api/package[@name='io.branch.referral.validators']/class[@name='IntegrationValidator']/implements[@name='io.branch.referral.validators.ServerRequestGetAppConfig.IGetAppConfigEvents']" />
11-
<remove-node path="/api/package[@name='io.branch.referral']/class[@name='GAdsPrefetchTask']"/>
12-
<remove-node path="/api/package[@name='io.branch.referral']/class[@name='GAdsPrefetchTask.1']"/>
3+
<attr path="/api/package[@name='io.branch.referral']/class[@name='BranchUrlBuilder']" name="visibility">public</attr>
4+
<!-- <attr path="/api/package[@name='io.branch.referral']/class[@name='RemoteInterface']" name="visibility">public</attr>-->
5+
<attr path="/api/package[@name='io.branch.referral']/class[@name='BranchLinkData']" name="visibility">public</attr>
6+
<attr path="/api/package[@name='io.branch.referral']/class[@name='SystemObserver']" name="visibility">public</attr>
7+
<attr path="/api/package[@name='io.branch.referral']/interface[@name='NetworkCallback']" name="visibility">public</attr>
8+
<attr path="/api/package[@name='io.branch.referral']/class[@name='ServerRequest']/method[@name='getRequestPath']" name="managedName">getRequestPath</attr>
9+
<attr path="/api/package[@name='io.branch.referral']/class[@name='Branch']" name="managedName">AndroidNativeBranch</attr>
10+
<remove-node path="/api/package[@name='io.branch.referral.validators']/class[@name='IntegrationValidator']/implements[@name='io.branch.referral.validators.ServerRequestGetAppConfig.IGetAppConfigEvents']" />
11+
<remove-node path="/api/package[@name='io.branch.referral']/class[@name='Branch']/implements[@name='io.branch.referral.GooglePlayStoreAttribution.IInstallReferrerEvents']" />
12+
<remove-node path="/api/package[@name='io.branch.referral']/class[@name='GAdsPrefetchTask']"/>
13+
<remove-node path="/api/package[@name='io.branch.referral']/class[@name='GAdsPrefetchTask.1']"/>
1314
</metadata>

‎Branch-Xamarin-Lib.iOS/Branch.a‎

-34.3 KB
Binary file not shown.

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,11 @@ private AndroidNativeBranch NativeBranch {
4646
public Activity CurrActivity { get; set; }
4747

4848
public static void GetAutoInstance(Context appContext) {
49-
AndroidNativeBranch.GetAutoInstance(appContext);
50-
//AndroidNativeBranch.DisableInstantDeepLinking(true);
49+
BranchUtil.SetPluginType(BranchUtil.PluginType.Xamarin);
50+
BranchUtil.PluginVersion = "7.0.0";
51+
52+
AndroidNativeBranch.GetAutoInstance(appContext);
53+
AndroidNativeBranch.DisableInstantDeepLinking(true);
5154
}
5255

5356
public static void Init(Context context, String branchKey, IBranchSessionInterface callback) {
@@ -75,6 +78,7 @@ public static void Init(Application app, String branchKey, IBranchSessionInterfa
7578
instance.appContext = app.ApplicationContext;
7679
instance.branchKey = branchKey;
7780

81+
7882
if (Debug) {
7983
instance.SetDebug ();
8084
}
@@ -128,17 +132,17 @@ public override void InitSession(IBranchSessionInterface callback) {
128132
BranchSessionListener obj = new BranchSessionListener (callback);
129133
callbacksList.Add (obj as Object);
130134

131-
//NativeBranch.InitSession (obj);
132-
NativeBranch.ReInitSession(CurrActivity, obj);
135+
NativeBranch.InitSession(obj);
136+
//NativeBranch.ReInitSession(CurrActivity, obj);
133137
}
134138

135139
public override void InitSession (IBranchBUOSessionInterface callback) {
136140
base.InitSession (callback);
137141
BranchBUOSessionListener obj = new BranchBUOSessionListener (callback);
138142
callbacksList.Add (obj as Object);
139143

140-
//NativeBranch.InitSession (obj);
141-
NativeBranch.ReInitSession(CurrActivity, obj);
144+
NativeBranch.InitSession(obj);
145+
//NativeBranch.ReInitSession(CurrActivity, obj);
142146
}
143147

144148
public override Dictionary<String, object> GetLastReferringParams () {

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

Lines changed: 3 additions & 1 deletion
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", "6.0.1");
55+
instance.NativeBranch.RegisterPluginName("xamarin.ios", "7.0.0");
5656
//IOSNativeBranch.RegisterPluginName();
5757

5858
if (launchOptions != null) {
@@ -85,6 +85,8 @@ 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");
89+
8890
if (launchOptions != null) {
8991
instance.launchOptions = new NSDictionary (launchOptions);
9092
} else {

‎Branch-Xamarin-Testbed.Droid/MainActivity.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ protected override void OnCreate(Bundle savedInstanceState)
5858

5959
protected override void OnNewIntent(Intent intent)
6060
{
61+
base.OnNewIntent(intent);
62+
intent.PutExtra("branch_force_new_session", true);
6163
this.Intent = intent;
6264
}
6365

0 commit comments

Comments
 (0)