From c47be0c77f25ffdc145bf6255c138b2726b728ac Mon Sep 17 00:00:00 2001 From: Skylar Date: Thu, 19 May 2016 00:26:42 -0600 Subject: [PATCH] Fix bug where dropdown labels selectable on Android, add build script --- build-android.sh | 8 ++++++++ config.xml | 1 + nbproject/plugins.properties | 4 ++-- nbproject/project.properties | 3 +++ .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../2.2.1/taskArtifacts/fileHashes.bin | Bin 149436 -> 149604 bytes .../2.2.1/taskArtifacts/fileSnapshots.bin | Bin 1236631 -> 1436150 bytes .../2.2.1/taskArtifacts/taskArtifacts.bin | Bin 92782 -> 92782 bytes .../android/assets/www/screens/home.html | 6 +++--- platforms/android/res/xml/config.xml | 1 + www/screens/home.html | 6 +++--- 11 files changed, 21 insertions(+), 8 deletions(-) create mode 100755 build-android.sh diff --git a/build-android.sh b/build-android.sh new file mode 100755 index 0000000..2edf83b --- /dev/null +++ b/build-android.sh @@ -0,0 +1,8 @@ +cordova build --release android +cd platforms/android/build/outputs/apk +cp android-release-unsigned.apk android-release-signed.apk +jarsigner -verbose -keystore ~/Documents/Projects/Certificates/Android/android.keystore android-release-signed.apk android +jarsigner -verify -verbose -certs android-release-signed.apk +rm android-release-signed-zipaligned.apk +zipalign -v 4 android-release-signed.apk android-release-signed-zipaligned.apk + diff --git a/config.xml b/config.xml index 9cf507c..9c4710c 100644 --- a/config.xml +++ b/config.xml @@ -9,6 +9,7 @@ Netsyms Technologies + diff --git a/nbproject/plugins.properties b/nbproject/plugins.properties index 030fefe..e8501ce 100644 --- a/nbproject/plugins.properties +++ b/nbproject/plugins.properties @@ -19,8 +19,8 @@ cordova-plugin-camera=https://git-wip-us.apache.org/repos/asf/cordova-plugin-cam cordova-plugin-media=https://git-wip-us.apache.org/repos/asf/cordova-plugin-media.git cordova-plugin-media-capture=https://git-wip-us.apache.org/repos/asf/cordova-plugin-media-capture.git cordova-plugin-network-information=https://git-wip-us.apache.org/repos/asf/cordova-plugin-network-information.git -cordova-plugin-splashscreen=https://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen.git cordova-plugin-device=https://git-wip-us.apache.org/repos/asf/cordova-plugin-device.git cordova-plugin-console=https://git-wip-us.apache.org/repos/asf/cordova-plugin-console.git cordova-plugin-file=https://git-wip-us.apache.org/repos/asf/cordova-plugin-file.git -cordova-plugin-compat=https://git-wip-us.apache.org/repos/asf/cordova-plugin-compat.git \ No newline at end of file +cordova-plugin-compat=https://git-wip-us.apache.org/repos/asf/cordova-plugin-compat.git +cordova-plugin-splashscreen=https://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen.git diff --git a/nbproject/project.properties b/nbproject/project.properties index a281893..af2592d 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,5 +1,8 @@ auxiliary.org-netbeans-modules-cordova.cordova_5f_build_5f_script_5f_version=52 auxiliary.org-netbeans-modules-cordova.phonegap=false +auxiliary.org-netbeans-modules-javascript-nodejs.enabled=false +auxiliary.org-netbeans-modules-javascript-nodejs.node_2e_default=true +auxiliary.org-netbeans-modules-javascript-nodejs.sync_2e_enabled=true file.reference.SnipeITMobile-test=test file.reference.SnipeITMobile-www=www files.encoding=UTF-8 diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 2f21392d327090c019215f36388bfaa0bb61e968..79701693b3cc85b1d3a7cc3699b746cb8091f62b 100644 GIT binary patch literal 17 VcmZQBcb(j%J7wKj1~3q)1pqO51fBo@ literal 17 VcmZQBcb(j%J7wKj1~A}T0st|b1j7IT diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index ebb4e780150af5f954351b671452dbeb613f29bb..cd3b9568a4c9c2d56b94624f5bcab328997d41a6 100644 GIT binary patch delta 3136 zcma);c~DbF9LL|jBwzqJ3`Yc1l*6ci0$MH|5EPFZ1}(LyAX2MTQ3fx-u^y4irDG#o z-PU?lgaT3^28mSgJ}87%tyoV)YYRy0Me$%z`+hHwY#je6Gf5tw@9)~(-|pL*ufz|O zVx?W6kbyrGwUhhy=bu@Jc>Ob)Y;Sn}_lLgck9<~ps3KqZ2-qqAs;Bx^_7isJ|J`~d z*gsL?923AtVT5Pkci$3UxqAA+WD~uBY^5OFJYZsi8;acZoDm!bZkFq8g$2cK2JUto zcvjcsG#o^8CJMMqTul$yBl?2gZALO@#8|w#c?>(0co@o3ECwDH*E|$Ql~BU~$}lGt z=508;#4rqWqZGJse`^CiNpU7=I&cT?#|`*7#o3^Pz!#KPzQA6G4RILBc;LIYXEcz6 z=g7_0Q0WLqP?r0CeHQPbJ**0V+XQJt$t7bC(f6RNA3M7fo0n2KL@+tb=khlTNyrQ2 zYRG|7M}U%1R^^Ju@0uhR<4lS(A^dn9^W%@<6Et_?#~ULL+enn*h)OV@pXjFgz00t71;q!1K!V(# zy4vw#ntL!q~&C7?jbW-Xrlt6*UGKzti8yF0Udkuj#g9#GT-A z=z8t}Jm(1IVd??g?%9-ec*hZ{S`k0$8Cf+YxQ@0L)Pnuhp>nG{H5JC=4q&&$gXK7Y z=GOe`$maO9;1rq*al>+n9+V5)POT-F1!SMz?JHo_yirtR0VuVPSYCPMROq^XX&i&Htczn$}2n# z_7AQdKe{u4rM5TYG8Tl!G=U@DO*`~^1$>#JEdpPrxtSI4`+keJ;C@w90x{pEx8&Wc za0tx@%?A5f_YT~^sa4c~&7T8rxBBx7Tt@T$F2G;e1!(bKbR6MU;Ng|=UU-m(%4@Fx z9`AV|3`f&k%#Z7#vVN?3tLA1PJJnO2__WeNn21Oir;Z zeZUI$g5n=5Z6e-MM5Pt-<>SvRJqZdj-W+M*GSJEETe8>4MU(=mt8mVRcS`0RePldKy^7iPK!1XaC90f`JYD$ME%D0A1} z`v#Y1yK4G7qI4U4v{*Xb@nsPx+}XgtFV$}>-Tu$}QtzgFUuG#{Y&ET;&@T>#i8UNu zn!0c#Kn8_*1_@p2Q)Q%i5{i{b^WlH)Pt3nQ+QfG0L_Qhi*LZgAAbQ$;1RSk8&Bh2b7S*8xu7Z325VBiNhspAPkf9A$&(qkaUnA zBDf+KZ9)M^HtxDl?o8iF1=m`h{hXz3;m#QDzTw31Zxkl@Eq|mfFOq4=c?B$)zJi=^ zh;}O{d^UNlKpRF4vtfQGgSCeyR2_^G%{W_qrz4CH)#u>Vkp~V-3OZI3+9~tOwG~`baP#b(bP7skg3nxqpQq72W4U{(2Pv7t z4%ql^C0*_P$0hw!yxlWR@@%5_+o!q+eOGMpc8G9z)8nlF<=592jLxs7yZpO%{6;YE PPuM&3UdMoK{?h*dbHxQ%C8|#Li7` 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 awMudm3KQO=1t{k}?;E$!sOIEmhy4eCA!4=w delta 1182 zcmZXUe@s(X6vzAe+E=8d@4iyfR-m+6pwKWMBO=vCE6cVLGOZg9*`~v>8a4$XI@=V- zO4zIjGi6tH5ghU(M8Y;)W%H`zr%HtV;MabDb0a0obTWQwbZl(0@)&=4l9QZ#zTcC3 z?#;=4_+2_`PxXX6&07l8-Z#hN5z?jlExSs;QtPJ%7I-`uzQkR5KWkU&OPdqLlVyM-#dMiN(?r#^<1AjAR*`$Vplsz2! zLi=EM*a*1x+Os7O5^lZ83C!zm=n2>8dzv==KD)oPnS%j`Hm^+bmC1E3DZjph<3UyJ zuqpgB%vZDUvRVo6s_oDb!Gd2Z1$+0+in}-y<;;h*5#zKqH>1!YSbn;oIJ(uLF%#gQ zg3rfOH#GmsIVA=?{7h>F#Dd8ORS{2dke=*>^IB_b<{AwFE7vN4q6k-{yll{MDr0Md zqicJCu6N>I#u@4b4oVC2V5QCo@9Gp#85s}vM%v+Qqy;37ug@VbHaIvFX*mbks9umP zD!cut&G;S%C6(Q9HmV4gL_6r3UG^EL?%47%nKN)c+DMC^v^lT$m^db^J_7anY}ll4 zg4r?gbm@75y>rFC5&i&Q_d`#Nm$sj;t2ULka!lM_0Fz>q;PF_UVEYq=!QP^e6kbmP zRcy7mtrh}XE&P%ZoEaz`*5k;;h&nXk%O6#kq%4S7xq6-ZMpio(~A z2(J*B?Ga~^h`CRuA@c~SKzsV+YtY;YG9R6E3ROt^2YCRy>P5pUWPLuM9G4###uKRU zM;T{VVpoSKD**Z2B!dcXh|q^OL^;SjDOTg=8S%Re8hl8q(8f5441szXaGxq8{VBkw z%7hbAd^3XV<>O~+guYSqXo{XDCqj$e3I~N14iUS6-l-OTiu@`-7iI^jt!$u;op1amfyc`! z#cwZCL(z|$>-I=;QEt6dg~3n!T>?CvF1cmKF+Ne1`f>9R2+6_bMbZ2rJZcEqLf{|v zF@q*t+fOyh@xcmyTo}4s6(qsM-!plksO4imgG~;wIu>X8f|ND*jW2^MWXt&I81Sl* zzY*Y}$>5FKk-uAp4U5u)a%{UDl1AWZIel}4A~gP=L4$TI3M{CriK5yt{88C~*n6MM?sqAVO)l-t+0#)O-1X1m{&H&Av8v}ES>M(mc`(0S+bOZ{{WI#oW3qA@8dZ^?e!&vN2WV^GdfS+x#!R3v_12fCLai7VG(d`H=R7OR%3JXfg)~! zz6(z4{cWUbA~VX@J(&NoWjja%|&;R$1$r~rCOrCI1eESME#wkqOW7rrun5O$%GIC5VJbYoh4JQ(}b8=;% zw@ShU2k$e+3=9H4fcOIlGxL_VKCpVodPptJCNy=m`^K0%g|Yx<%X#^C7_BpB1Ta|tsBvrjfiU}0HOQ}SdxmjYv^ zkOb>l1_su%Os$!gMZcy!eY8F-LnC$R?s;GbZ=P^)Bh%*SgM4tOUSZ)`CVh8%pey4V z#_hi>8BekZgnSj9Z!oj;lai*${`-=r#HN36V!Xe7lRcvz^Y+7bjF*@o&iHA<=swMo z@z?eTPK>fF;223fvCwk6k~iZSCV}kyC5xTZ&l{%~E>5#L#Ul?g#9_OgA7cTtz|qN9 z8`gc^Kk-sTON#e-11BW8?eBaU4={rb%ao3NG(|2^eJnS9q&e?s| wjFwl12i109P}Q&s28*^>MrIv`Duy2~&=qW!rerpv6$e8Pk&Y#%az3n#Z z=B<0@F$qZbo{qNbs&2{F7q&XHzjwuSM{h>w$vgM_nS3CSg+;HvxM}jlT8+)k2a32i zdz@Xyw7tcLF`SWwvQ2GjOfDaNI&g0_LLcP|o-TdFBwRKis}W7@&ViYufhPuRmYeL^Io z>UKU+Mt#Q3JTZ}s(?29KhHjrA%UH(5qVKqI2ArA_frPKX07&AB9v}ZB0e0}%55CDrf8ngfa diff --git a/platforms/android/assets/www/screens/home.html b/platforms/android/assets/www/screens/home.html index cca0891..bf0f92a 100644 --- a/platforms/android/assets/www/screens/home.html +++ b/platforms/android/assets/www/screens/home.html @@ -189,7 +189,7 @@ }, success: function (data) { if (data.status === 'OK') { - var innerhtml = "" + var innerhtml = "" for (var i = 0; i < data.list.length; i++) { innerhtml += ""; } @@ -219,7 +219,7 @@ }, success: function (data) { if (data.status === 'OK') { - var innerhtml = "" + var innerhtml = "" for (var i = 0; i < data.list.length; i++) { if (from == 'hdd' && data.list[i].name.indexOf('HDD') == -1) { continue; @@ -254,7 +254,7 @@ }, success: function (data) { if (data.status === 'OK') { - var innerhtml = "" + var innerhtml = "" for (var i = 0; i < data.list.length; i++) { if (from == 'hdd' && data.list[i].name != 'Hard Drive') { continue; diff --git a/platforms/android/res/xml/config.xml b/platforms/android/res/xml/config.xml index 8fd58c5..ea4f0f9 100644 --- a/platforms/android/res/xml/config.xml +++ b/platforms/android/res/xml/config.xml @@ -44,6 +44,7 @@ Netsyms Technologies + diff --git a/www/screens/home.html b/www/screens/home.html index cca0891..bf0f92a 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -189,7 +189,7 @@ }, success: function (data) { if (data.status === 'OK') { - var innerhtml = "" + var innerhtml = "" for (var i = 0; i < data.list.length; i++) { innerhtml += ""; } @@ -219,7 +219,7 @@ }, success: function (data) { if (data.status === 'OK') { - var innerhtml = "" + var innerhtml = "" for (var i = 0; i < data.list.length; i++) { if (from == 'hdd' && data.list[i].name.indexOf('HDD') == -1) { continue; @@ -254,7 +254,7 @@ }, success: function (data) { if (data.status === 'OK') { - var innerhtml = "" + var innerhtml = "" for (var i = 0; i < data.list.length; i++) { if (from == 'hdd' && data.list[i].name != 'Hard Drive') { continue;