Apps/MobileApp
2
1
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Fix bug where account switching failed to actually switch accounts

Browse Source
This commit is contained in:
Skylar Ittner 2018-12-22 12:28:19 -07:00
parent 07614c76f6
commit d006684147
4 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
nbproject/build.xml
View File

@ -46,7 +46,7 @@ made subject to such option by the copyright holder.
<!-- <!--
Generated file; DO NOT EDIT. Generated file; DO NOT EDIT.
--> -->
<project name="BusinessMobile" basedir=".."> <project name="NetsymsMobile" basedir="..">
<property file="nbproject/configs/${config}.properties" /> <property file="nbproject/configs/${config}.properties" />
<scriptdef name="checkVersion" language="javascript"> <scriptdef name="checkVersion" language="javascript">
@ -59,7 +59,7 @@ made subject to such option by the copyright holder.
} }
]]> ]]>
</scriptdef> </scriptdef>
<scriptdef name="forDevice" language="javascript"> <scriptdef name="forDevice" language="javascript">
<![CDATA[ <![CDATA[
var dev = project.getProperty("device"); var dev = project.getProperty("device");
@ -77,7 +77,7 @@ made subject to such option by the copyright holder.
</or> </or>
</condition> </condition>
</target> </target>
<target name="upgrade-to-cordova-project" depends="check-cordova-project,check-cordova-version" unless="cordova.project"> <target name="upgrade-to-cordova-project" depends="check-cordova-project,check-cordova-version" unless="cordova.project">
<echo level="info" message="${cordova.command} -d create ${java.io.tmpdir}/nb_temp_project com.coolappz.${project.name} ${project.name}" /> <echo level="info" message="${cordova.command} -d create ${java.io.tmpdir}/nb_temp_project com.coolappz.${project.name} ${project.name}" />
<delete dir="${java.io.tmpdir}/nb_temp_project"/> <delete dir="${java.io.tmpdir}/nb_temp_project"/>
@ -85,8 +85,8 @@ made subject to such option by the copyright holder.
<env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/> <env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/>
<env key="JAVA_HOME" path="${jdk.home}"/> <env key="JAVA_HOME" path="${jdk.home}"/>
<arg value="-d"/> <arg value="-d"/>
<arg value="create"/> <arg value="create"/>
<arg value="${java.io.tmpdir}/nb_temp_project"/> <arg value="${java.io.tmpdir}/nb_temp_project"/>
<arg value="com.coolappz.${project.name}"/> <arg value="com.coolappz.${project.name}"/>
<arg value="${project.name}" /> <arg value="${project.name}" />
</exec> </exec>
@ -106,8 +106,8 @@ made subject to such option by the copyright holder.
<env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/> <env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/>
<env key="JAVA_HOME" path="${jdk.home}"/> <env key="JAVA_HOME" path="${jdk.home}"/>
<arg value="-d"/> <arg value="-d"/>
<arg value="create"/> <arg value="create"/>
<arg value="www_nb_temp"/> <arg value="www_nb_temp"/>
<arg value="com.coolappz.${project.name}"/> <arg value="com.coolappz.${project.name}"/>
<arg value="${project.name}" /> <arg value="${project.name}" />
</exec> </exec>
@ -117,26 +117,26 @@ made subject to such option by the copyright holder.
<delete dir="www_nb_temp"/> <delete dir="www_nb_temp"/>
<delete file="www/config.xml"/> <delete file="www/config.xml"/>
</target> </target>
<taskdef <taskdef
classname="org.netbeans.modules.cordova.updatetask.ReadConfigTask" classname="org.netbeans.modules.cordova.updatetask.ReadConfigTask"
classpath="${update.task.jar}" classpath="${update.task.jar}"
name="readconfig"/> name="readconfig"/>
<taskdef <taskdef
classname="org.netbeans.modules.cordova.updatetask.PluginTask" classname="org.netbeans.modules.cordova.updatetask.PluginTask"
classpath="${update.task.jar}" classpath="${update.task.jar}"
name="plugintask"/> name="plugintask"/>
<target name="check-cordova-version"> <target name="check-cordova-version">
<property environment="env"/> <property environment="env"/>
<checkVersion first="${cordova.version}" property="cordova.ver.3"/> <checkVersion first="${cordova.version}" property="cordova.ver.3"/>
<fail message="Cordova version 3 or greater required." unless="cordova.ver.3"/> <fail message="Cordova version 3 or greater required." unless="cordova.ver.3"/>
<readconfig/> <readconfig/>
<forDevice/> <forDevice/>
</target> </target>
<target name="check-android-template"> <target name="check-android-template">
<available file="platforms/android" property="android.generated.exists"/> <available file="platforms/android" property="android.generated.exists"/>
</target> </target>
@ -144,27 +144,27 @@ made subject to such option by the copyright holder.
<target name="check-ios-template"> <target name="check-ios-template">
<available file="platforms/ios" property="ios.generated.exists"/> <available file="platforms/ios" property="ios.generated.exists"/>
</target> </target>
<target name="create-android" depends="check-android-template,check-cordova-version,upgrade-to-cordova-project" unless="android.generated.exists"> <target name="create-android" depends="check-android-template,check-cordova-version,upgrade-to-cordova-project" unless="android.generated.exists">
<echo level="info" message="${cordova.command} -d platform add android"/> <echo level="info" message="${cordova.command} -d platform add android"/>
<exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" failonerror="true"> <exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" failonerror="true">
<env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/> <env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/>
<env key="JAVA_HOME" path="${jdk.home}"/> <env key="JAVA_HOME" path="${jdk.home}"/>
<arg value="-d"/> <arg value="-d"/>
<arg value="platform"/> <arg value="platform"/>
<arg value="add"/> <arg value="add"/>
<arg value="android"/> <arg value="android"/>
</exec> </exec>
</target> </target>
<target name="create-ios" depends="check-ios-template,check-cordova-version,upgrade-to-cordova-project" unless="ios.generated.exists"> <target name="create-ios" depends="check-ios-template,check-cordova-version,upgrade-to-cordova-project" unless="ios.generated.exists">
<echo level="info" message="${cordova.command} -d platform add ios"/> <echo level="info" message="${cordova.command} -d platform add ios"/>
<exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" dir="." failonerror="true"> <exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" dir="." failonerror="true">
<env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/> <env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/>
<env key="JAVA_HOME" path="${jdk.home}"/> <env key="JAVA_HOME" path="${jdk.home}"/>
<arg value="-d"/> <arg value="-d"/>
<arg value="platform"/> <arg value="platform"/>
<arg value="add"/> <arg value="add"/>
<arg value="ios"/> <arg value="ios"/>
</exec> </exec>
</target> </target>
@ -178,23 +178,23 @@ made subject to such option by the copyright holder.
<exec executable="xcodebuild" dir="platforms/ios" failonerror="true"> <exec executable="xcodebuild" dir="platforms/ios" failonerror="true">
<arg value="-project"/> <arg value="-project"/>
<arg value="${project.name}.xcodeproj"/> <arg value="${project.name}.xcodeproj"/>
<arg value="ARCHS=${ios.build.arch}"/> <arg value="ARCHS=${ios.build.arch}"/>
<arg value="-target"/> <arg value="-target"/>
<arg value="${project.name}"/> <arg value="${project.name}"/>
<arg value="-configuration"/> <arg value="-configuration"/>
<arg value="Release"/> <arg value="Release"/>
<arg value="-sdk"/> <arg value="-sdk"/>
<arg value="${ios.build.sdk}" /> <arg value="${ios.build.sdk}" />
<arg value="build"/> <arg value="build"/>
<arg value="CONFIGURATION_BUILD_DIR=${path}"/> <arg value="CONFIGURATION_BUILD_DIR=${path}"/>
</exec> </exec>
</target> </target>
<target name="build-ios-ipa" if="build.for.device"> <target name="build-ios-ipa" if="build.for.device">
<exec executable="xcrun" dir="platforms/ios/build" failonerror="true"> <exec executable="xcrun" dir="platforms/ios/build" failonerror="true">
<env key="CODESIGN_ALLOCATE" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate" /> <env key="CODESIGN_ALLOCATE" value="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate" />
<arg value="-sdk"/> <arg value="-sdk"/>
<arg value="${ios.build.sdk}" /> <arg value="${ios.build.sdk}" />
<arg value="PackageApplication"/> <arg value="PackageApplication"/>
<arg value="-v"/> <arg value="-v"/>
<arg value="${project.name}.app"/> <arg value="${project.name}.app"/>
@ -208,15 +208,15 @@ made subject to such option by the copyright holder.
<available file="${basedir}/platforms/ios/build/${project.name}.ipa" property="ipa.found"/> <available file="${basedir}/platforms/ios/build/${project.name}.ipa" property="ipa.found"/>
<fail unless="ipa.found" message="PackageApplication failed."/> <fail unless="ipa.found" message="PackageApplication failed."/>
</target> </target>
<target name="sim-ios" depends="build-ios,ios-run-device,ios-run-simulator"> <target name="sim-ios" depends="build-ios,ios-run-device,ios-run-simulator">
</target> </target>
<target name="ios-run-device" if="build.for.device"> <target name="ios-run-device" if="build.for.device">
<echo> <echo>
Install "${basedir}/platforms/ios/build/${project.name}.ipa" through iTunes and run it. Install "${basedir}/platforms/ios/build/${project.name}.ipa" through iTunes and run it.
</echo> </echo>
<exec executable="open" failonerror="true"> <exec executable="open" failonerror="true">
<arg value="${basedir}/platforms/ios/build/${project.name}.ipa"/> <arg value="${basedir}/platforms/ios/build/${project.name}.ipa"/>
</exec> </exec>
@ -228,13 +228,13 @@ made subject to such option by the copyright holder.
</exec> </exec>
<exec executable="${ios.sim.exec}" dir="platforms/ios/build"> <exec executable="${ios.sim.exec}" dir="platforms/ios/build">
<arg line="launch ${project.name}.app ${ios.device.args} --exit"/> <arg line="launch ${project.name}.app ${ios.device.args} --exit"/>
</exec> </exec>
</target> </target>
<target name="update-plugins"> <target name="update-plugins">
<plugintask/> <plugintask/>
</target> </target>
<target name="update-android"> <target name="update-android">
<echo level="info" message="${cordova.command} prepare android"/> <echo level="info" message="${cordova.command} prepare android"/>
@ -244,9 +244,9 @@ made subject to such option by the copyright holder.
<arg value="prepare"/> <arg value="prepare"/>
<arg value="android"/> <arg value="android"/>
</exec> </exec>
</target> </target>
<target name="update-ios"> <target name="update-ios">
<echo level="info" message="${cordova.command} prepare ios"/> <echo level="info" message="${cordova.command} prepare ios"/>
<exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" failonerror="true"> <exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" failonerror="true">
@ -255,21 +255,21 @@ made subject to such option by the copyright holder.
<arg value="prepare"/> <arg value="prepare"/>
<arg value="ios"/> <arg value="ios"/>
</exec> </exec>
</target> </target>
<target name="rebuild-android" depends="clean-android,build-android"/> <target name="rebuild-android" depends="clean-android,build-android"/>
<target name="build-android" depends="create-android,update-plugins"> <target name="build-android" depends="create-android,update-plugins">
<echo level="info" message="${cordova.command} -d build android"/> <echo level="info" message="${cordova.command} -d build android"/>
<exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" failonerror="true"> <exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" failonerror="true">
<env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/> <env key="${cordova.path.key}" path="${cordova.path.value}:${android.sdk.home}/tools:${android.sdk.home}/platform-tools:${jdk.home}/bin:${ant.home}/bin:${jdk.home}/bin"/>
<env key="JAVA_HOME" path="${jdk.home}"/> <env key="JAVA_HOME" path="${jdk.home}"/>
<arg value="-d"/> <arg value="-d"/>
<arg value="build"/> <arg value="build"/>
<arg value="android"/> <arg value="android"/>
</exec> </exec>
</target> </target>
<target name="sim-android" depends="create-android,update-plugins"> <target name="sim-android" depends="create-android,update-plugins">
<echo level="info" message="${cordova.command} -d ${android.target.device.arg} android"/> <echo level="info" message="${cordova.command} -d ${android.target.device.arg} android"/>
<exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" failonerror="true"> <exec executable="${cordova.command}" resolveexecutable="true" searchpath="true" failonerror="true">
@ -277,16 +277,16 @@ made subject to such option by the copyright holder.
<env key="JAVA_HOME" path="${jdk.home}"/> <env key="JAVA_HOME" path="${jdk.home}"/>
<arg value="-d"/> <arg value="-d"/>
<arg value="${android.target.device.arg}"/> <arg value="${android.target.device.arg}"/>
<arg value="android"/> <arg value="android"/>
</exec> </exec>
</target> </target>
<target name="clean-android" depends="check-android-template" if="android.generated.exists"> <target name="clean-android" depends="check-android-template" if="android.generated.exists">
<exec executable="./gradlew" dir="platforms/android"> <exec executable="./gradlew" dir="platforms/android">
<arg value="clean" /> <arg value="clean" />
</exec> </exec>
</target> </target>
<target name="clean-ios" depends="check-ios-template" if="ios.generated.exists"> <target name="clean-ios" depends="check-ios-template" if="ios.generated.exists">
<exec executable="platforms/ios/cordova/clean" /> <exec executable="platforms/ios/cordova/clean" />
</target> </target>

8
nbproject/project.properties
View File

@ -1,8 +1,8 @@
auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=52 auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=52
auxiliary.org-netbeans-modules-cordova.phonegap=false auxiliary.org-netbeans-modules-cordova.phonegap=false
file.reference.BusinessMobile-test=test file.reference.NetsymsMobile-test=test
file.reference.BusinessMobile-www=www file.reference.NetsymsMobile-www=www
files.encoding=UTF-8 files.encoding=UTF-8
project.licensePath=nbproject/mplheader.txt project.licensePath=nbproject/mplheader.txt
site.root.folder=${file.reference.BusinessMobile-www} site.root.folder=${file.reference.NetsymsMobile-www}
test.folder=${file.reference.BusinessMobile-test} test.folder=${file.reference.NetsymsMobile-test}

6
www/js/accounts.js
View File

@ -49,14 +49,14 @@ function recoveraccounts(callback) {
/** /**
* Switch to a different account. * Switch to a different account.
* @param {int} account The selected account index from localStorage.getItem('accounts') * @param {int} account The selected account index from localStorage.getItem('accounts')
* @param {boolean} showmsg Whether to show the "switched accounts" alert dialog. Default True. * @param {boolean} showmsg [HAS NO EFFECT] Whether to show the "switched accounts" alert dialog. Default True.
* @returns {undefined} * @returns {undefined}
*/ */
function switchaccount(account, showmsg) { function switchaccount(account, showmsg) {
if (typeof showmsg != 'boolean') { if (typeof showmsg != 'boolean') {
showmsg = true; showmsg = true;
} }
// If there isn't an accounts list yet, this shouldi take us back to the setup // If there isn't an accounts list yet, this should take us back to the setup
if (!isconfigvalid()) { if (!isconfigvalid()) {
restartApplication(); restartApplication();
} }
@ -74,7 +74,7 @@ function switchaccount(account, showmsg) {
restartApplication(); restartApplication();
if (showmsg == true) { if (showmsg == true) {
navigator.notification.alert("Successfully switched accounts.", null, "Switched", 'OK'); //navigator.notification.alert("Successfully switched accounts.", null, "Switched", 'OK');
} }
} }

2
www/pages/accounts.html
View File

@ -21,7 +21,7 @@
<ul id="accountlist"> <ul id="accountlist">
{{#each accounts}} {{#each accounts}}
<li class="swipeout accountlist-item" data-id="{{id}}"> <li class="swipeout accountlist-item" data-id="{{id}}">
<div class="item-content swipeout-content"> <div class="item-content swipeout-content" data-id="{{id}}">
<div class="item-media"><img src="img/accounticons/{{icon}}.svg" width="44"/></div> <div class="item-media"><img src="img/accounticons/{{icon}}.svg" width="44"/></div>
<div class="item-inner"> <div class="item-inner">
<div class="item-title-row"> <div class="item-title-row">