From 163d269eef310617a23b6b8be8270b44794dd723 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 24 Nov 2017 17:44:00 +0100 Subject: deep linking working --- .../ios/Stone Island.xcarchive/Info.plist | 2 +- .../Applications/Stone Island.app/Assets.car | Bin 844136 -> 844136 bytes .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 2285 -> 2282 bytes .../UIViewController-01J-lp-oVM.nib | Bin 832 -> 832 bytes .../Stone Island.app/MainViewController.nib | Bin 943 -> 943 bytes .../Applications/Stone Island.app/Stone Island | Bin 2224144 -> 2224144 bytes .../Stone Island.app/_CodeSignature/CodeResources | 24 ++++++++++----------- .../UserInterfaceState.xcuserstate | Bin 65859 -> 99601 bytes StoneIsland/platforms/ios/www/js/index.js | 1 + .../ios/www/js/lib/account/AccountView.js | 1 + StoneIsland/www/js/index.js | 1 + StoneIsland/www/js/lib/account/AccountView.js | 1 + 12 files changed, 17 insertions(+), 13 deletions(-) diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 1fad075a..93b9b844 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist @@ -18,7 +18,7 @@ ArchiveVersion 2 CreationDate - 2017-11-24T00:23:16Z + 2017-11-24T00:24:36Z Name Stone Island SchemeName diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car index b28e7af4..b48b5463 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Assets.car differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib index e4ec30c1..1bcaa74a 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib index af704106..d5551eeb 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib index 330be74e..2c66a363 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/MainViewController.nib differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island index 9c5d630d..bd28f42b 100755 Binary files a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island and b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/Stone Island differ diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources index 6621da07..b5c3ed2b 100644 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/_CodeSignature/CodeResources @@ -94,11 +94,11 @@ Assets.car - mU3+fFB1l6DUPqTW9VycEL3pEcw= + /Qnxj3RbFIKFHnnqBCjvII0MaPM= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - P2Sos4goGvsG6ZfcA2e2ItlTQtY= + zrGvhNy2G3ukIlizgyHirVRpcTc= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - 9KcWXvKLwM0ZVmwGJjpF4eREemE= + RMTu40kyT4csaSiWzUaDnv29cpc= CDVNotification.bundle/beep.wav @@ -118,7 +118,7 @@ MainViewController.nib - bHrDUfunLdxx8iwLnMAIGKwockg= + 7aHxq3bQbEcUPlt3KDvkLiJc4mo= PkgInfo @@ -937,22 +937,22 @@ hash - mU3+fFB1l6DUPqTW9VycEL3pEcw= + /Qnxj3RbFIKFHnnqBCjvII0MaPM= hash2 - 2jDzAlkFqWknrOaInuiqw6/7o09Ix89HcUCLi7rLBEg= + 0PSwR5iuvNevwaETo97WZuZnGNbV84xXj/4BrBOUOLg= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - P2Sos4goGvsG6ZfcA2e2ItlTQtY= + zrGvhNy2G3ukIlizgyHirVRpcTc= hash2 - 4BZMYuC44Q5dxXT8b1fnZXOa1dIBU1L4mPjWlAMLM5g= + TD8MMJbubFYBrlAgtFn/3deJvOGDdKVXkqOmLQY+tjs= CDVLaunchScreen.storyboardc/Info.plist @@ -970,11 +970,11 @@ hash - 9KcWXvKLwM0ZVmwGJjpF4eREemE= + RMTu40kyT4csaSiWzUaDnv29cpc= hash2 - 8jqKYpqyWlKi8L2nWHWsb9DL+jddLwGoiyjLU+BJqfk= + sTv1pmeHPsoGu1Cs8q4O3gTZY0oubcU4Lo996XEW3JE= CDVNotification.bundle/beep.wav @@ -992,11 +992,11 @@ hash - bHrDUfunLdxx8iwLnMAIGKwockg= + 7aHxq3bQbEcUPlt3KDvkLiJc4mo= hash2 - CfD2qcwX4cWIMUzzjFmgEP791Y+KEwryKaKmMVzyp4Q= + OrPil0acrFjh/PzokwEAxNuRn7/6cj7PaMrdPMztDXY= archived-expanded-entitlements.xcent diff --git a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate index fc19cd9e..dbfbfbc5 100644 Binary files a/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate and b/StoneIsland/platforms/ios/Stone Island.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js index 72584894..4cae2f24 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -105,6 +105,7 @@ var app = (function(){ if (navigator.onLine) { app.account.connect(app.deepLinkRoute || '/intro') app.blog.fetch(function(){ + console.log("navigating to deep link route after fetch") app.router.initial_route = app.deepLinkRoute || "/intro" app.router.launch() }) diff --git a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js index 04dfa828..4a6ff9e0 100755 --- a/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js +++ b/StoneIsland/platforms/ios/www/js/lib/account/AccountView.js @@ -128,6 +128,7 @@ var AccountView = View.extend({ } else { if (initialLoginPath) { + console.log("navigating to deep link route from logged_in") app.router.go(initialLoginPath) } else { diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index 72584894..4cae2f24 100755 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -105,6 +105,7 @@ var app = (function(){ if (navigator.onLine) { app.account.connect(app.deepLinkRoute || '/intro') app.blog.fetch(function(){ + console.log("navigating to deep link route after fetch") app.router.initial_route = app.deepLinkRoute || "/intro" app.router.launch() }) diff --git a/StoneIsland/www/js/lib/account/AccountView.js b/StoneIsland/www/js/lib/account/AccountView.js index 04dfa828..4a6ff9e0 100755 --- a/StoneIsland/www/js/lib/account/AccountView.js +++ b/StoneIsland/www/js/lib/account/AccountView.js @@ -128,6 +128,7 @@ var AccountView = View.extend({ } else { if (initialLoginPath) { + console.log("navigating to deep link route from logged_in") app.router.go(initialLoginPath) } else { -- cgit v1.2.3-70-g09d2