From 2ed50ad9ea7844afcd8aa2a63bf0844460e24d37 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 24 Nov 2017 17:58:49 +0100 Subject: really fix deep linking --- .../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 2282 -> 2285 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 | 42 ++++++++++----------- .../Applications/Stone Island.app/www/js/index.js | 8 +++- .../www/js/lib/account/AccountView.js | 1 + .../Stone Island.app/www/js/lib/etc/deeplink.js | 4 +- .../UserInterfaceState.xcuserstate | Bin 99601 -> 111874 bytes StoneIsland/platforms/ios/www/js/index.js | 7 +++- .../platforms/ios/www/js/lib/etc/deeplink.js | 4 +- StoneIsland/www/js/index.js | 7 +++- StoneIsland/www/js/lib/etc/deeplink.js | 4 +- 15 files changed, 45 insertions(+), 34 deletions(-) diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist b/StoneIsland/platforms/ios/Stone Island.xcarchive/Info.plist index 93b9b844..585097f5 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:24:36Z + 2017-11-24T16:58:04Z 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 b48b5463..970736c0 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 1bcaa74a..0f71bc55 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 d5551eeb..615d8527 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 2c66a363..1b87f5e0 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 bd28f42b..cfcd27da 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 b5c3ed2b..b2314b25 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 - /Qnxj3RbFIKFHnnqBCjvII0MaPM= + g/shlZXXT+5YqMmZSYPmC64TQK0= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib - zrGvhNy2G3ukIlizgyHirVRpcTc= + XKRpTIL+5+qWUTNCfMrloqXol+o= CDVLaunchScreen.storyboardc/Info.plist @@ -106,7 +106,7 @@ CDVLaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib - RMTu40kyT4csaSiWzUaDnv29cpc= + MFJLtjYuQtDJx/38DlBSTD+pBf8= CDVNotification.bundle/beep.wav @@ -118,7 +118,7 @@ MainViewController.nib - 7aHxq3bQbEcUPlt3KDvkLiJc4mo= + WPhCUF01tBcP0CKRq9fFQt/+T2Q= PkgInfo @@ -354,7 +354,7 @@ www/js/index.js - NJmDFFvqR27okTny9pkYSJjb3UI= + XgJhs0VV6cJQmVhMxypE070GJsU= www/js/lib/_router.js @@ -362,7 +362,7 @@ www/js/lib/account/AccountView.js - p7ebS62KPkR8FJlihLEuRBm12Kw= + 1IB9e7i4hutrfSxVEZ2fy8G06AE= www/js/lib/account/OrdersView.js @@ -450,7 +450,7 @@ www/js/lib/etc/deeplink.js - ZaK0TX/YBC60SRkcsVWgeiWUpNY= + Hz8iJCB2rav1z51mh2bp5fnQwbs= www/js/lib/etc/geo.js @@ -937,22 +937,22 @@ hash - /Qnxj3RbFIKFHnnqBCjvII0MaPM= + g/shlZXXT+5YqMmZSYPmC64TQK0= hash2 - 0PSwR5iuvNevwaETo97WZuZnGNbV84xXj/4BrBOUOLg= + JnNHKritXF3c9xz7oU5A9kgMvDRsGDByjuDTjr4NGrI= CDVLaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib hash - zrGvhNy2G3ukIlizgyHirVRpcTc= + XKRpTIL+5+qWUTNCfMrloqXol+o= hash2 - TD8MMJbubFYBrlAgtFn/3deJvOGDdKVXkqOmLQY+tjs= + bBdqkQNpiqV6vnraDiYfFiYK2a9/CzqPEIXcLAyfh28= CDVLaunchScreen.storyboardc/Info.plist @@ -970,11 +970,11 @@ hash - RMTu40kyT4csaSiWzUaDnv29cpc= + MFJLtjYuQtDJx/38DlBSTD+pBf8= hash2 - sTv1pmeHPsoGu1Cs8q4O3gTZY0oubcU4Lo996XEW3JE= + ltZ05E70S7J1bZd2eKH259Zgsxr2TxcV856f7LLg4C4= CDVNotification.bundle/beep.wav @@ -992,11 +992,11 @@ hash - 7aHxq3bQbEcUPlt3KDvkLiJc4mo= + WPhCUF01tBcP0CKRq9fFQt/+T2Q= hash2 - OrPil0acrFjh/PzokwEAxNuRn7/6cj7PaMrdPMztDXY= + G+OjKp457/9c9jlWaSDoE0JsxdCIVdb/7pTnv3Nm5K0= archived-expanded-entitlements.xcent @@ -1630,11 +1630,11 @@ hash - NJmDFFvqR27okTny9pkYSJjb3UI= + XgJhs0VV6cJQmVhMxypE070GJsU= hash2 - G2W5NCVZ1jLjYGv9nUevGrmzmR91h3K4OOOdMsu22bU= + n1pWw6MNDrVQW6cXPmMapfIrKZ1W1RJY3PRmwT/UvdE= www/js/lib/_router.js @@ -1652,11 +1652,11 @@ hash - p7ebS62KPkR8FJlihLEuRBm12Kw= + 1IB9e7i4hutrfSxVEZ2fy8G06AE= hash2 - tg0eztCkKLdRjSLIzxppW7iHt9Lu2ZXnHOwsN5sUTcc= + e4ehiZ+tIfSc/UKQO/NQffM4xs4qEPPoXG4gw7Bo6nc= www/js/lib/account/OrdersView.js @@ -1894,11 +1894,11 @@ hash - ZaK0TX/YBC60SRkcsVWgeiWUpNY= + Hz8iJCB2rav1z51mh2bp5fnQwbs= hash2 - mX5AssMNwLdaBGropRT6esU7NcOn8qQvogwqHvaZ2BA= + tNwo1x6uGh01AKZD6QN09Bk65P1LrEhZKZ3g5fow+5c= www/js/lib/etc/geo.js diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js index 72584894..164d98cc 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/index.js @@ -103,9 +103,10 @@ var app = (function(){ // } if (navigator.onLine) { - app.account.connect(app.deepLinkRoute || '/intro') + app.account.connect(window.deepLinkRoute || '/intro') app.blog.fetch(function(){ - app.router.initial_route = app.deepLinkRoute || "/intro" + console.log("navigating to deep link route after fetch") + app.router.initial_route = window.deepLinkRoute || "/intro" app.router.launch() }) } @@ -123,6 +124,9 @@ var app = (function(){ if (window.cordova) { navigator.splashscreen.hide() } + if (window.deepLinkRoute) { + app.router.go(window.deepLinkRoute) + } $("body").removeClass("loading") } diff --git a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js index 04dfa828..4a6ff9e0 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/account/AccountView.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/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/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/deeplink.js b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/deeplink.js index fc3b52a9..252a94c9 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/deeplink.js +++ b/StoneIsland/platforms/ios/Stone Island.xcarchive/Products/Applications/Stone Island.app/www/js/lib/etc/deeplink.js @@ -1,6 +1,6 @@ function handleOpenURL (url) { console.log("DEEP LINKING DETECTED", url) url = url.replace("stoneisland:/", "") - app.router.parseRoute( url ) - app.deepLinkRoute = url + app.router && app.router.parseRoute( url ) + window.deepLinkRoute = url } \ No newline at end of file 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 dbfbfbc5..2633e608 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 4cae2f24..164d98cc 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -103,10 +103,10 @@ var app = (function(){ // } if (navigator.onLine) { - app.account.connect(app.deepLinkRoute || '/intro') + app.account.connect(window.deepLinkRoute || '/intro') app.blog.fetch(function(){ console.log("navigating to deep link route after fetch") - app.router.initial_route = app.deepLinkRoute || "/intro" + app.router.initial_route = window.deepLinkRoute || "/intro" app.router.launch() }) } @@ -124,6 +124,9 @@ var app = (function(){ if (window.cordova) { navigator.splashscreen.hide() } + if (window.deepLinkRoute) { + app.router.go(window.deepLinkRoute) + } $("body").removeClass("loading") } diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js b/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js index fc3b52a9..252a94c9 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/deeplink.js @@ -1,6 +1,6 @@ function handleOpenURL (url) { console.log("DEEP LINKING DETECTED", url) url = url.replace("stoneisland:/", "") - app.router.parseRoute( url ) - app.deepLinkRoute = url + app.router && app.router.parseRoute( url ) + window.deepLinkRoute = url } \ No newline at end of file diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index 4cae2f24..164d98cc 100755 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -103,10 +103,10 @@ var app = (function(){ // } if (navigator.onLine) { - app.account.connect(app.deepLinkRoute || '/intro') + app.account.connect(window.deepLinkRoute || '/intro') app.blog.fetch(function(){ console.log("navigating to deep link route after fetch") - app.router.initial_route = app.deepLinkRoute || "/intro" + app.router.initial_route = window.deepLinkRoute || "/intro" app.router.launch() }) } @@ -124,6 +124,9 @@ var app = (function(){ if (window.cordova) { navigator.splashscreen.hide() } + if (window.deepLinkRoute) { + app.router.go(window.deepLinkRoute) + } $("body").removeClass("loading") } diff --git a/StoneIsland/www/js/lib/etc/deeplink.js b/StoneIsland/www/js/lib/etc/deeplink.js index fc3b52a9..252a94c9 100755 --- a/StoneIsland/www/js/lib/etc/deeplink.js +++ b/StoneIsland/www/js/lib/etc/deeplink.js @@ -1,6 +1,6 @@ function handleOpenURL (url) { console.log("DEEP LINKING DETECTED", url) url = url.replace("stoneisland:/", "") - app.router.parseRoute( url ) - app.deepLinkRoute = url + app.router && app.router.parseRoute( url ) + window.deepLinkRoute = url } \ No newline at end of file -- cgit v1.2.3-70-g09d2