Merge pull request #309 from BranchMetrics/fix-android-only

Fix android only
BranchMetrics · Mar 30, 2017 · 717c87f · 717c87f
2 parents 5ad804a + a4a5682
commit 717c87f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "www/branch.js",
-  "version": "2.5.12",
+  "version": "2.5.13",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
     "changelog": "node ./src/scripts/npm/updateChangeLog -reset=true",
     "commitmsg": "validate-commit-msg",
     "precommit": "gulp prod",
-    "prepush": "semantic-release pre --verifyRelease='./src/scripts/npm/updateNpmVersion' || true",
+    "postcommit": "semantic-release pre --verifyRelease='./src/scripts/npm/updateNpmVersion' || true",
     "prerelease": "gulp prod",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },

diff --git a/plugin.template.xml b/plugin.template.xml
@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="2.5.12">
+  version="2.5.13">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 

diff --git a/plugin.xml b/plugin.xml
@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="2.5.12">
+  version="2.5.13">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 

diff --git a/src/scripts/android/updateAndroidManifest.js b/src/scripts/android/updateAndroidManifest.js
@@ -197,8 +197,8 @@
         intentFilterData.push(getAppLinkIntentFilterDictionary(alternate))
       } else if (linkDomain.indexOf('bnc.lt') !== -1) {
         // bnc.lt
-        if (preferences.androidPrefix == null) {
-          throw new Error('BRANCH SDK: Missing "android-prefix" in <branch-config> in your config.xml. Docs https://goo.gl/GijGKP')
+        if (preferences.androidPrefix === null) {
+          throw new Error('BRANCH SDK: Invalid "android-prefix" in <branch-config> in your config.xml. Docs https://goo.gl/GijGKP')
         }
         intentFilterData.push(getAppLinkIntentFilterDictionary(linkDomain, preferences.androidPrefix))
       } else {

diff --git a/src/scripts/ios/updateDevelopmentTeam.js b/src/scripts/ios/updateDevelopmentTeam.js
@@ -85,6 +85,10 @@
     var release = preferences.iosTeamRelease
     var debug = (preferences.iosTeamDebug) ? preferences.iosTeamDebug : preferences.iosTeamRelease
 
+    if (release === null) {
+      throw new Error('BRANCH SDK: Invalid "ios-team-release" in <branch-config> in your config.xml. Docs https://goo.gl/GijGKP')
+    }
+
     content.ios.release.developmentTeam = release
     content.ios.debug.developmentTeam = debug
   }

diff --git a/src/scripts/npm/processConfigXml.js b/src/scripts/npm/processConfigXml.js
@@ -54,7 +54,7 @@
       'uriScheme': getBranchValue(branchXml, 'uri-scheme'),
       'iosBundleId': getBundleId(configXml, 'ios'),
       'iosProjectModule': getProjectModule(context),
-      'iosTeamRelease': getBranchValue(branchXml, 'ios-team-release'),
+      'iosTeamRelease': getBranchValue(branchXml, 'ios-team-release'), // optional
       'iosTeamDebug': getBranchValue(branchXml, 'ios-team-debug'), // optional
       'androidBundleId': getBundleId(configXml, 'android'), // optional
       'androidPrefix': getBranchValue(branchXml, 'android-prefix'), // optional
@@ -136,7 +136,7 @@
     if (preferences.iosBundleId === null || !/^[a-zA-Z0-9.]*$/.test(preferences.iosBundleId)) {
       throw new Error('BRANCH SDK: Invalid "id" or "ios-CFBundleIdentifier" in <widget> in your config.xml. Docs https://goo.gl/GijGKP')
     }
-    if (preferences.iosTeamRelease === null || !/^[a-zA-Z0-9]{10}$/.test(preferences.iosTeamRelease)) {
+    if (preferences.iosTeamRelease !== null && !/^[a-zA-Z0-9]{10}$/.test(preferences.iosTeamRelease)) {
       throw new Error('BRANCH SDK: Invalid "ios-team-release" in <branch-config> in your config.xml. Docs https://goo.gl/GijGKP')
     }
     if (preferences.iosTeamDebug !== null && !/^[a-zA-Z0-9]{10}$/.test(preferences.iosTeamDebug)) {

diff --git a/testbed/www/css/index.css b/testbed/www/css/index.css
@@ -10,6 +10,7 @@ body {
 button, input {
   padding: 0.5em;
   border: 3px solid #F5F5F5;
+  width: 100%;
 }
 button {
   background-color: #F5F5F5;