Author: bklaas
Date: Fri Jun 25 09:12:46 2010
New Revision: 8908
URL: http://svn.slimdevices.com/jive?rev=8908&view=rev
Log:
Bug: n/a
Description: first pass at pulling out mysb.com registration during setup flow
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua?rev=8908&r1=8907&r2=8908&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeApplet.lua
Fri Jun 25 09:12:46 2010
@@ -71,7 +71,7 @@
function startRegister(self)
- step7(self)
+ _startRegister(self)
end
@@ -205,11 +205,30 @@
end, 'setuptitle')
end
+function step7(self)
+ log:info("step7")
+
+ if UPGRADE_FROM_SCS_ENABLED then
+ local squeezenetwork = self:_getSqueezenetwork()
+ _squeezenetworkWait(self, squeezenetwork)
+ end
+
+ _setupComplete(self, false)
+ _setupDone(self, true, true)
+
+ self.locked = true -- free applet
+ jnt:unsubscribe(self)
+
+ jiveMain:goHome()
+
+end
+
-- we are connected when we have a pin and upgrade url
function _squeezenetworkConnected(self, squeezenetwork)
return squeezenetwork:getPin() ~= nil and
squeezenetwork:getUpgradeUrl() and squeezenetwork:isConnected()
end
+
function _anySqueezeCenterWithUpgradeFound(self)
local anyFound = false
@@ -224,19 +243,19 @@
return anyFound
end
-function step7(self)
- log:info("step7")
-
- -- Once here, network setup is complete
- self:_setupDone(true, false)
+
+function _startRegister(self)
+ log:info("_startRegister")
+
+ local settings = self:getSettings()
+ if settings.registerDone then
+ log:info("SqueezeNetwork registration complete")
+ return
+ end
-- Bug 12786: Selecting a Network, then backing out
-- and re-selecting will cause network errors
self.registerRequest = false
-
- --might be coming into this from a restart, so re-disable
- self:_disableNormalEscapeMechanisms()
- self:_addReturnToSetupToHomeMenu()
-- Find squeezenetwork server
local squeezenetwork = false
@@ -248,27 +267,11 @@
if not squeezenetwork then
log:error("no SqueezeNetwork instance")
- self:_setupComplete(true)
- return
- end
-
- local settings = self:getSettings()
- if settings.registerDone then
- log:error("SqueezeNetwork registration complete")
-
- local player = appletManager:callService("getCurrentPlayer")
- log:info("connecting ", player, " to ", squeezenetwork)
- player:connectToServer(squeezenetwork)
-
- self:_setupComplete(true)
- return
- end
-
- if UPGRADE_FROM_SCS_ENABLED then
- _squeezenetworkWait(self, squeezenetwork)
- else
- self:_registerRequest(squeezenetwork)
- end
+ return
+ end
+
+ self:_registerRequest(squeezenetwork)
+
end
@@ -290,12 +293,12 @@
popup:addTimer(1000, function()
-- wait until we know if the player is linked
if _squeezenetworkConnected(self, squeezenetwork) then
- step8(self, squeezenetwork)
+ _firmwareUpgrade(self, squeezenetwork)
else
log:info("SN not available, Waited: ", timeout + 1)
--allow 10 seconds to go by before doing SC check to
allow SCs to be discovered
if timeout >= 9 and
_anySqueezeCenterWithUpgradeFound(self) then
- step8(self, squeezenetwork)
+ _firmwareUpgrade(self, squeezenetwork)
else
log:info("Looking for compatible SCs with an
upgrade, Waited: ", timeout + 1)
end
@@ -392,13 +395,6 @@
window:addWidget(menu)
menu:setHeaderWidget(Textarea("help_text", self:string(message)))
- -- back goes back to network selection
- -- note add listener to menu, as it has the focus
- menu:addActionListener("back", self, function()
- Framework:playSound("WINDOWHIDE")
- self:step3(Window.transitionPushRight)
- end)
-
-- help shows diagnostics
window:setButtonAction("rbutton", "help")
window:addActionListener("help", self, function()
@@ -413,7 +409,7 @@
window:addTimer(1000, function()
-- wait until we know if the player is linked
if _squeezenetworkConnected(self, squeezenetwork) then
- step8(self, squeezenetwork)
+ _firmwareUpgrade(self, squeezenetwork)
window:hide()
end
end)
@@ -422,8 +418,8 @@
end
-function step8(self, squeezenetwork)
- log:info("step8")
+function _firmwareUpgrade(self, squeezenetwork)
+ log:info("_firmwareUpgrade")
if not squeezenetwork:isConnected() then
log:info("get SC from one of discovered SCs")
appletManager:callService("firmwareUpgrade", nil)
@@ -438,8 +434,6 @@
if force then
log:info("firmware upgrade from SN")
appletManager:callService("firmwareUpgrade", squeezenetwork)
- else
- self:_registerRequest(squeezenetwork)
end
end
@@ -464,20 +458,9 @@
end
-function step9(self)
- log:info("step9")
-
- _setupComplete(self, false)
- _setupDone(self, true, true)
-
- self.locked = true -- free applet
- jnt:unsubscribe(self)
-
- jiveMain:goHome()
-
-end
-
-
+
+--[[ XXX: Don't think we need this any more, as mysb.com registration is not
in setup
+if that's the case, this whole playerCurrent method can go byebye
--finish setup if connected server is SC
function notify_playerCurrent(self, player)
if not player then
@@ -494,11 +477,11 @@
return
end
- log:info("Calling step9. server: ", server)
-
- step9(self)
-end
-
+ log:info("Calling step7. server: ", server)
+
+ step7(self)
+end
+--]]
function notify_serverLinked(self, server, wasAlreadyLinked)
@@ -522,18 +505,23 @@
-- for testing connect the player tosqueezenetwork
local player = appletManager:callService("getCurrentPlayer")
- local squeezenetwork = false
- for name, server in slimServer:iterate() do
- if server:isSqueezeNetwork() then
- squeezenetwork = server
- end
- end
-
+ local squeezenetwork = self:_getSqueezenetwork()
log:info("connecting ", player, " to ", squeezenetwork)
player:connectToServer(squeezenetwork)
- self:step9()
- end
+ self:step7()
+ end
+end
+
+
+function _getSqueezenetwork(self)
+ local squeezenetwork = false
+ for name, server in slimServer:iterate() do
+ if server:isSqueezeNetwork() then
+ squeezenetwork = server
+ end
+ end
+ return squeezenetwork
end
@@ -543,7 +531,6 @@
local settings = self:getSettings()
settings.setupDone = setupDone
- settings.registerDone = registerDone
self:storeSettings()
-- FIXME: workaround until filesystem write issue resolved
@@ -554,6 +541,7 @@
function _jumpToDemo(self)
appletManager:callService("jumpToInStoreDemo")
end
+
function setupWelcomeShow(self, setupNext)
local window = Window("help_list", self:string("WELCOME"),
welcomeTitleStyle)
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua?rev=8908&r1=8907&r2=8908&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_baby/share/applets/SetupWelcome/SetupWelcomeMeta.lua
Fri Jun 25 09:12:46 2010
@@ -63,15 +63,19 @@
appletManager:callService("startSetup")
end
+ --[[
if not settings.registerDone then
hackMeta = meta
jnt:subscribe(meta)
end
+ --]]
end
function notify_serverNew(meta, server)
local settings = meta:getSettings()
+
+ --[[ This bit of code would prompt for mysb.com during setup when
connected to mysb.com for the first time during setup
if settings.setupDone and server:isSqueezeNetwork() then
appletManager:callService("startRegister")
@@ -79,6 +83,8 @@
jnt:unsubscribe(meta)
hackMeta = nil
end
+
+ --]]
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
