From 2d05ff98cabc4d494be9aeb4553522a0a6b57ace Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Mon, 2 Apr 2012 14:49:12 -0700 Subject: [PATCH] merge heads --- MyTracks/AndroidManifest.xml | 3 +- .../res/drawable-hdpi/ic_menu_recordtrack.png | Bin 2315 -> 0 bytes .../drawable-hdpi/ic_menu_stoprecording.png | Bin 639 -> 0 bytes MyTracks/res/drawable-hdpi/menu_help.png | Bin 0 -> 1533 bytes .../res/drawable-hdpi/menu_record_track.png | Bin 0 -> 1142 bytes MyTracks/res/drawable-hdpi/menu_search.png | Bin 0 -> 1764 bytes MyTracks/res/drawable-hdpi/menu_settings.png | Bin 0 -> 1540 bytes .../res/drawable-hdpi/menu_stop_recording.png | Bin 0 -> 1055 bytes .../res/drawable-ldpi/ic_menu_recordtrack.png | Bin 1250 -> 0 bytes .../drawable-ldpi/ic_menu_stoprecording.png | Bin 343 -> 0 bytes .../res/drawable-mdpi/ic_menu_recordtrack.png | Bin 1593 -> 0 bytes .../drawable-mdpi/ic_menu_stoprecording.png | Bin 384 -> 0 bytes MyTracks/res/drawable-mdpi/menu_help.png | Bin 0 -> 1314 bytes .../res/drawable-mdpi/menu_record_track.png | Bin 0 -> 1090 bytes MyTracks/res/drawable-mdpi/menu_search.png | Bin 0 -> 1394 bytes MyTracks/res/drawable-mdpi/menu_settings.png | Bin 0 -> 1339 bytes .../res/drawable-mdpi/menu_stop_recording.png | Bin 0 -> 1047 bytes MyTracks/res/drawable-xhdpi/menu_help.png | Bin 0 -> 1793 bytes .../res/drawable-xhdpi/menu_record_track.png | Bin 0 -> 1221 bytes MyTracks/res/drawable-xhdpi/menu_search.png | Bin 0 -> 2127 bytes MyTracks/res/drawable-xhdpi/menu_settings.png | Bin 0 -> 1641 bytes .../drawable-xhdpi/menu_stop_recording.png | Bin 0 -> 1114 bytes .../res/layout/mytracks_waypoint_details.xml | 6 +- MyTracks/res/layout/stats.xml | 2 - MyTracks/res/layout/track_detail.xml | 6 +- MyTracks/res/layout/track_widget.xml | 4 +- MyTracks/res/layout/upload_result.xml | 55 ++---- .../res/layout/upload_service_chooser.xml | 34 +--- MyTracks/res/menu/main.xml | 33 +--- MyTracks/res/menu/search_only.xml | 2 +- MyTracks/res/values/strings.xml | 116 ++++-------- .../android/apps/mytracks/ChartActivity.java | 89 +++++---- .../android/apps/mytracks/ExportActivity.java | 24 ++- .../android/apps/mytracks/ImportActivity.java | 6 +- .../apps/mytracks/ImportAsyncTask.java | 3 +- .../android/apps/mytracks/MapActivity.java | 2 +- .../android/apps/mytracks/MenuManager.java | 4 +- .../android/apps/mytracks/MyTracks.java | 8 +- .../apps/mytracks/SettingsActivity.java | 12 +- .../android/apps/mytracks/TrackList.java | 5 +- .../android/apps/mytracks/WaypointsList.java | 25 ++- .../apps/mytracks/WelcomeActivity.java | 1 - ...ava => Api8BackupPreferencesListener.java} | 9 +- .../mytracks/io/backup/BackupActivity.java | 21 +-- .../mytracks/io/backup/BackupAsyncTask.java | 6 +- .../io/backup/ExternalFileBackup.java | 8 +- .../io/backup/MyTracksBackupAgent.java | 2 + .../mytracks/io/backup/RestoreActivity.java | 21 +-- .../mytracks/io/backup/RestoreAsyncTask.java | 3 +- .../io/backup/RestoreChooserActivity.java | 57 +++--- .../apps/mytracks/io/file/SaveActivity.java | 13 +- .../mytracks/io/file/TrackWriterImpl.java | 10 +- .../mytracks/io/maps/ChooseMapActivity.java | 8 +- .../io/sendtogoogle/AbstractSendActivity.java | 25 ++- .../sendtogoogle/AccountChooserActivity.java | 85 +++++---- .../io/sendtogoogle/UploadResultActivity.java | 172 +++++++++--------- .../UploadServiceChooserActivity.java | 136 +++++++------- .../services/RemoveTempFilesService.java | 5 +- .../TrackRecordingServiceConnection.java | 3 +- .../ant/AntSrmBridgeSensorManager.java | 44 ++--- ...Task.java => Api8StatusAnnouncerTask.java} | 11 +- .../apps/mytracks/util/Api10Adapter.java | 2 + .../apps/mytracks/util/Api8Adapter.java | 8 +- .../apps/mytracks/util/Api9Adapter.java | 2 + .../apps/mytracks/util/DialogUtils.java | 54 +++--- .../android/apps/mytracks/util/EulaUtils.java | 3 +- .../android/apps/mytracks/util/FileUtils.java | 89 ++++----- .../apps/mytracks/util/PlayTrackUtils.java | 3 +- .../apps/mytracks/util/SystemUtils.java | 27 +-- MyTracksLib/AndroidManifest.xml | 12 +- .../arrow_icon.png | Bin MyTracksTest/.classpath | 1 + MyTracksTest/AndroidManifest.xml | 17 +- .../UploadResultActivityTest.java | 169 +++++++++++++++++ .../apps/mytracks/util/FileUtilsTest.java | 111 +++++------ 75 files changed, 783 insertions(+), 794 deletions(-) delete mode 100644 MyTracks/res/drawable-hdpi/ic_menu_recordtrack.png delete mode 100644 MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png create mode 100644 MyTracks/res/drawable-hdpi/menu_help.png create mode 100644 MyTracks/res/drawable-hdpi/menu_record_track.png create mode 100644 MyTracks/res/drawable-hdpi/menu_search.png create mode 100644 MyTracks/res/drawable-hdpi/menu_settings.png create mode 100644 MyTracks/res/drawable-hdpi/menu_stop_recording.png delete mode 100644 MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png delete mode 100644 MyTracks/res/drawable-ldpi/ic_menu_stoprecording.png delete mode 100644 MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png delete mode 100644 MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png create mode 100644 MyTracks/res/drawable-mdpi/menu_help.png create mode 100644 MyTracks/res/drawable-mdpi/menu_record_track.png create mode 100644 MyTracks/res/drawable-mdpi/menu_search.png create mode 100644 MyTracks/res/drawable-mdpi/menu_settings.png create mode 100644 MyTracks/res/drawable-mdpi/menu_stop_recording.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_help.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_record_track.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_search.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_settings.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_stop_recording.png rename MyTracks/src/com/google/android/apps/mytracks/io/backup/{BackupPreferencesListenerImpl.java => Api8BackupPreferencesListener.java} (82%) rename MyTracks/src/com/google/android/apps/mytracks/services/tasks/{FroyoStatusAnnouncerTask.java => Api8StatusAnnouncerTask.java} (90%) rename MyTracksLib/res/{drawable => drawable-mdpi}/arrow_icon.png (100%) create mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index e18dd20a7..9ba432210 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -137,8 +137,7 @@ limitations under the License. android:icon="@drawable/arrow_icon" android:label="@string/my_tracks_app_name" android:name="com.google.android.apps.mytracks.MyTracksApplication" - android:theme="@style/ThemeSelector" - android:uiOptions="splitActionBarWhenNarrow" > + android:theme="@style/ThemeSelector" > RNYjz~}hXLOUq$Ov)SmYF3}&@GOTJ+nVdrlKs_{#e`}BXc;!ESdZXI66uG6ny@*j`8J^P@^Yts|GsZ{bVZ@1eWX=!N#+1c5na5)ENr8Wzn zWu?$;0L$$PQ@A==eU^eK7$t?G1`9;1sHoU{@7}!)6B84e7Kk3;xaM z@9#el8XDRj8ynkNSXg*v`SRss@MANW1%Xjm4xa)fP>df16I5SczpACB<(<*d(R{ck z4M$?j+nfVQXYC&*dGt?a&k_7~CSe!vu3OjV@(8ohVL+`;C z*CZw;60KItgFz@9$MGfvv#>Ep2m}p5&Cbs9s=9OM4u2gP8Ts?BUAxL5W(`wCS*e<& z0qF4I!~842U@jGWWx{6BLr&n}8I|tr{B}(@vj0eGY=B z7COmiCRg0a8AxbmvzdT`$fHM(tQi>@`$|hof1yg6bp;aVA{@+Cfl%nhpFMlF3ThS} z4nX2vVPQschw&YOLBQajl$3<3_3P~H{JOTb_C@%ShK3P^w*X;{6MFRM(QiTOD=_Au zau!S1?luM~IXM|$wHOE6+uL=t+~7P7h`Ck}WU+mat+wFkg@lCg9rYxbg=)fVi30`M zPG3_~^EtXdjgbmZ0>ZyjU%PfqH#j(08WR)4SH#|gBUBP*Hl0p~_0nsVm6e-mT_!4H zt3;{?|4swbhf;_;p;+e#V~!LW6p&iP&So9UFq=}Mau3CREY_3QCa`oD?l z!Bp<)nDabW!wd=&Tr2~!p!|4=#!ICq6vWT7E?l^<6M~@zT}w*J5jKp8m{EIsd*6o3 z-|2kKso6g#(!Bzp-gp V=R?C}%Mx;Q&G*`O3|kHzR3cQMl8^`0RD@;>8pQhO5HD z!X)KdivdCvfzs8G_VXwp&YdpCPe^-uda@xn^EHpuPlsUgz|;=`djnk7cmxpKEDHfi zHTEoQ*jJ0il13GzbT=RsWQJs6?2&rIEDObK68*lMJ7W;P0|8a)3sMfw3ym(1Xs%wp z8b`l_!d(jDw`RbvgR#!=mD6b$hp@i}gCR-)$l(q^WO{m91vk{-O?~P39s)9(&7sbw zd8Yvd1qIpII*+db0ylGdUC3EL{B|(h%!De!^|9I?AUll2IPO&Vl7bKr z%*`GWC-=|90I~s~zX48yuK+^#g3`pae*OCU?goS(K8M@EPO$P7I*6Yu8?eo7!0|BxPfOv|8;SVid%Qh(UAd>FEzZ zw(TfgU#Oy?O>W${@d^>K1tca&IALw+t zFR(LG3fMT2#z6}Y4?mTgo7+VmZ~2Hi=^+*nQ_*x`VPPHA7!A09&t~}EPV3kg7_?gj z1qENaq8?WOF%@CjoZPl;+h;Ihy;9hEMmW$H%jP&Mj*jlYvx%5yJy8ha zF+aH9U`9s98vv(%so*RLAXMO@uV;ycQ<2__U5-I1A@*|wB$mc+#X&cE+ZoH)U@rt!E*NK;eO>o6Vp6kQI_IOADDSC>fG0dz>= zXp^9v%60439gm2Jz<_L`F-JPbfQ5hrkd!noY0PGGcyn`ek-=bie|maai)Wk>l+|i= zY7U34go?rKZV1K}0CEb7zzV3thA0>dk>Ww};^N{(M;Sn|L*+cE;o;$!?(Xilj7H-Y z0F({jIC#$=zQj}X7|`*=Dw{)L;Kc$I)dF=EU-*Ij1#p_7Ks~i`<;s2m7*^*=7ph3Zr(w-Me?AdwYAgOifMYf|B&O=m&uKSAk+~VHp7x`Yi+l+3DBR z)YL&T{~(J+;7-zgnB`f376HYc{9(Y@d-m*@Lby4=mUyYnQl&5`c2KXQy1LrES<(}A z3P5y#+o9RP_2wvu88ZJsor3)LfjS{1W)3VXFwlEy4N4*Z=O%8hgJeK5Ai2qaWI!?? l8ITM}1|$ReU$%b)7y!QBpW`-u$7TQk002ovPDHLkV1hTiQ7Qlc diff --git a/MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png b/MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png deleted file mode 100644 index a55f09f2736b5db169f4431df9135c425040d4f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YLAP)VbVTJPoax6qmP+4E*)d6wS@Ka%76fX z00@8p2!H?xfB*;!fB-1|Dgy5_BV}^cxcCpvUanrr0eL97Qz^eAQ<#mtsCD{s>PE1V z1LFHCr^aa}pmJq^IsxL+mhyg|`pcru#S^`N0=;kE`K)(dR-GUXv5My^S7D`Ne z25IkN$RO<*gf@So8EQ3Yw0Z1h50l2n z9r(E8v^3UutO_O#4?>$)pFxl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)z|q{?!q~*r$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq}R~E*~!ht2&Z09V#qB3+U$~Alv$RV;#QQOs{r=2 zRVHq?;5HAcHwBwpApS7M=@xyUWAs5$ixkx`Az=CeG2sap$bl#Q)I4B%F9IfPQ}q|m z7#NuHJzX3_DsH`*aXMQ#P~=$pq-UXvb4wLtMO~u#rr?{e#Q zS!;G&(7UruA@7%g(vISV+y{G|oS9h{26S>YEt{pL_Lr}Q`LHVIG_}3oPuYG*Hacvu z^Zwk=GW)|;SDHm1*?eaXgZcr^0;Vrf?%ngRGqWAEEU^0W$LI#ze2=3ljDZEbJ`LUv zL_8V`TE94ozGDB?s>JTFz-%rf&817J&m^$rsxGe z*?6<>MD<=7sEMUhpLqw#M_8{gkj^yrdB3-oY`C?XXqy1Kl47Ts;=3?bsl5gTeZN ziUf1|i=@WR)w1bt_FPw8;1s`)i|c`D#Ze#OZ@HXr+8=PmY8dQX9-l5yT{6}4L!0%z z6K)5RPP8`h{^84e;j{RW(fNN5_vPRDJ7rSb*0hDqHzL_eLVx~m;$=$mnH{Kl)@$1> zlh_8GqG^nOqE|kc)O6iP>;m_*gHtwD%s;rF$8Oe@Gp%oJDvl%vM(#Os$os>QEqNve zFWuyu?NUDmrY&5+uk|wT*{ewP3a+*(W{aD5>u*gsc%@Pybz-O7w0cY75FDR6kEM9Qf(TJr;*a367%X895Kd416_?i)$37j#XEIDK0op;dBux3l-G{r6?d zN^DL!T{}B%SO4?*2enpjTz%w!tZEq(INC2{|7PN0nDu93$(>m?EuaF~)78&qol`;+ E03={S=>Px# literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-hdpi/menu_record_track.png b/MyTracks/res/drawable-hdpi/menu_record_track.png new file mode 100644 index 0000000000000000000000000000000000000000..ad8ada6bdfa0d08e96c96ef2e8fc6656efc31f34 GIT binary patch literal 1142 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsViy(A34k#nsr<$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1ObbUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfX zG!Lpb1-Dy_aO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z4q0f*3(OQRJY5_^ zDsH`*smOQ8K%~vwiGeZv-~+WZOSZ=B1v}ZkA5bcg&|!bTpuiCPPfc~@%_GO8r_|{G zoD{$H=e4|Q-{R*n(~6#QC^RrIg@$%jp0M7yea4df9|g;jBtNOTHZI@cdUHutO?01w6Wim;H*=-YJSF-6)vTXc4;gaVh((-iXfZZqW+vo+u8V zBVlX)f0A7h-RPgQQ0YmtMO4nhGu#pz1)d)`lqGk1{e=6U^-ld^7jR%;WC0UGRzbha uDrBCXJI|cEda|~f-cO)#l3^w)^1&PVosU-?Y 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 literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png b/MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png deleted file mode 100644 index 60f3c67e6c0b8580242e6e620d8b51bf7a1a1df2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1250 zcmV<81ReW{P)5Fi`a@%*cU~x3(Hb=LF|JU^esy(6l^JoBIuKk`_L8&E2v$el!B-a zZ4l~pwXSQjY0_jeGyVSIj6`>0Mw5j?J@AoaJahi;vDo{oS2xAa+@; z>k=|@RUC73bDq`J)o(H1T~boQ2o{TlnM@{TG#Zu3k|Ze*MUe%ALAJBAL&Sv2%E~WC zMnboyV`F2FXoG+S-!;8+6(K8j_ulgI^4B(-EuR+7&COLvs483q znnUCe=*;bQv$C=>w!6FgWOjD84QtzI!&-z=#Spp5H99)_7@0IwUth26R!b2*gKQuZ zSs)Ogfd6G`YU*P=e#PTSPNxv5V+n;q&Xbdq0SaCybRlT33nD}=CZ(X-2h-EjAM#{* z%f2~PFfT4Hw!uY(#l^+vWHKENhlAPecDBF2@59gMK!jKIw1g~hl~)a3O5Ynm0QWzK*ko6Lxi7}M<)0UQ&&rl%4nUEs4)BAAMQ?J*%Mw=yf zX(h~6gh-``$K(06wzl>m`k@FlT;x7A*wcXqon1vmMGR-+d{B*mA?J&$1NeP@vi^_09KWHN|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%{q%Hk45_&FW=0^_VFjMH#~b(x^N((~745$i{H0;up~XFS z7vwYF^m@JJ!tum#=fb&-4FMhV>xFn#&sm;0={I4f=mMq^3k9j4b>Hefo}2Kky0X5a zK95o9*o@WJezmQ1xL&#{_xA4iUF$_B1#McExnPx+$c#jZXESC8yKyiovJ{*PY*@3k z_{8)ja|&}wRZoRtMl6raeRE| nY^P~2%@x4-%Y4Ch24;rW_g=Q1=6gO57zhlWu6{1-oD!M<4ZM&5 diff --git a/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png b/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png deleted file mode 100644 index f2327cef77ffca87efff1858b5bf74947d3d9a4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1593 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 literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-mdpi/menu_search.png b/MyTracks/res/drawable-mdpi/menu_search.png new file mode 100644 index 0000000000000000000000000000000000000000..587d9e0bf392fc928947f04293ba009f7fc77b29 GIT binary patch literal 1394 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)(9*=*)zI10$-vFf5X3XIbTx5uc62i} zG&gZFgz0t3PcF?(%`1WFO+n~&!KoLN7;+1MHoK%2WtOF;xE1B+Du6w0m5JLejyTPO z>P^Az7AKr~^?{Dj2SqJXRKtXT=?BDwCtM&0p7c}mfa$#mn6M+i2Q6b@V0_}~;uunK z>&^AE+Ae`I$3E`tm@-`{zx9(?>dU1k*tm~+ZG0%dVMD+vFR`R_eQ9k~)lEW^HhtI? zB&0NvW8=gpsXg!4y8B+<@$PBQ%`+>{C%wC~^SkBqd7pQuuW?X#(4E%(*>&epCKp?W zrqiE|F7`;J9Gc@U;Ny}9H~GSBM$UJ2|47y7x^EaYbO zm=^RUfnEK@zlTwYmbEt*&h}S4{%}u`&SQ?!WlSjvv9{-n3Kw#{NfhghW2)KCHS6mc z^@8V*Jmr$4uC6fJ$dg^zU&?d@|$3_EuOa%?|q_h0a*8dJ>+>(i$vUCaNY#uTIE zul#VEs1omUHKv?ZC$?1V2%BBCKXsA7(geZX8pRvuyee!cJTgs9KN2D`QS`=`xX%9*}?nyAhK z_Nf-Z4{Ui>oBh!|a6Nmso8l+YBlF(g-ZfEwMbWdDrE^;>d8}GD@Z@>D4V>xD8CRkc zdVC*mVv&1FrpctHKHIFmo)(#Y4~A;Ho~#?e&Q2v6MQ%0zKUO`Q$Im5rVUFgn)AKHP zSBG=VuX=ZVUZK&Y$p$gc*{*!{ocg_l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)$k4*r&A`;u$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfY zG!Lpb1-DyFaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zzTW#wpMimKt*47) zNX4x;(`~&EJ4hU#eM=~Qh3+e*AEGP=FItrrTsY|WOZ1EJjvdw(oa_9oZXR?!=qWq3 zDc-Rl$fx$;g=0VJAIMucT~d2m6!_%<`}Cr{HsA03uk3vKyH4?Zpw1JUBJ%}HD)(!x zD6V6UWBYsX(wau*4TpZR-Y}|UE&5gYfy*j^@ysj}hnSn8^Y$O`h~hOlpeFH@&9n6n z+cyXQpRvy#C&-_`sd!|u1&Gh3b zxiZf4FKbLh*2~7ZL CljEBJ literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-mdpi/menu_stop_recording.png b/MyTracks/res/drawable-mdpi/menu_stop_recording.png new file mode 100644 index 0000000000000000000000000000000000000000..20df415869bf4c224f577abc6fc30f107cada685 GIT binary patch literal 1047 zcmaJ=PiWIn9L}7ZI-QPzIEBe0lYwB9ye`>HSlrsCb%kZjuDTvPEKT0lu;tH^SKIYs znNAoCPYT1Uf{LJ`M-L7}QM@Xs$DL%Cfrxkz>r2;m9;|_v_uh~1`+k4l>g2@v&W;lu z6h(C=$CMP=L9q6>lfPdoeJ9&-9M9k>XBHPU4^a`r$s&-nv^kVQnz6L_4h>UO>nSsx z!5MX2(jAM@0t{2MT*9WP;gO=N>GKGKESfWIncjZ!k_M(B)6;^=scsDA%(0S(rb-iO zy)>_j20d~P3>PILU?Hr5qP1ZAQcx)M1DW|jt32%eYeouD%6B#1d40s_N@bZ!uW zL7ss;C-UMM5auAq!Z6DXg&-#hLlOr;?W2h|&zO}`N}}eA++;e3u`97`p-^B71B~O% zu}~C6mJ74taEKs6{*sNgV#xOU>Iw?-bDVAp)Ur+<%QT5}Ck4xG$l89bOr&6J zQFB?ya6w9SpsM~KYFQ1mk5gzj-hT@F=_MDjDdanOPbZC=?F(GFQp`gdcD%IXEYzzw znRBq?=NuQrrUV88Rntv7uv8hUDkW_nYqpM(icAv?#xxCy6XU{Jo`*sdauCL$$U`yC zM`MwM0EhS}taBAd&s)gGb*{0?4L9Wm!(h3@vw}SH3NjL&V}WYYlG!wtfkaci8rNtZ z3)hs(l3>`NwSTp`ZX)v&92@sco)o9SVB6-^(Q*5dcD?kC@7nJF*aF_`<)24Z4wpYip0)mtgzkT6;hvA( zT(0ESFPEn)Ii@GS@t`%)%Wah}>^rp8exR?r|5z7)ZDsW9Q*iO&Eq-kM?c#=c@6BG} kj`8W}+K)AY-Rz~hW~lBby{BW3UdzE#O~xmb$I+SPKUWG$(*OVf literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-xhdpi/menu_help.png b/MyTracks/res/drawable-xhdpi/menu_help.png new file mode 100644 index 0000000000000000000000000000000000000000..243704869415096feda6d981bf0588d5e2aaf807 GIT binary patch literal 1793 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 literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-xhdpi/menu_search.png b/MyTracks/res/drawable-xhdpi/menu_search.png new file mode 100644 index 0000000000000000000000000000000000000000..3549f84dd8f5e38665849b46e252bc34f29be027 GIT binary patch literal 2127 zcmaJ?3p8749=`}>v|V&cXT7fIiVk^PBSY|2Yr&=v7ow6Rs?3P)tYO9UbY&YptXLrxq`<;8g@B5$M@ArS6bB_lH z?%ndy?>_cC6SB(G6&(~SQ-pY&KIiL0O0N^7qU1>umoho2|NJ>z0}@`26fXS$!Y;UEMb9iezHJJmQ&F0bjj+o#*9aU z?;w&S3i{WeA{oJ;HzI;TB94IN5L_V8#Tf@V6G+Y^N6?7?5%7=`p5Tgw2xOuwnE-+B zAGF$=h#OB1rTM=1rM^+ni4uvBjK|AlGMwx)93o1;nrZR=!^>O;c6UJUq#;$DF zaAB#T;l97>E*sSPM#W}D*%&vC9?NAupxYHKzlA!#x5!R$$}KEz`?K}h?B51n479y{ zQ?w+-T-{f_$ZXze2L9K&)Yu$QW7O|sondWutk)Q_JN)t9M!T--)21nHt$r5=vLfUe z#a~sbymPXRm$zn0t^*N@y}d^w!HQdfF;iuh84+$H+Z4+ka__aF6WZ>MRwfDAoU*_4 zKAt=6rl=k>E5ha}R?E)6T2N6Nf^OP-%$aH>Bc8h!4HjG5*0h$}RLuF0wJIdU zjbsxQA=8r?J*La4uKG`NBKyje7GpNe$A4*b?~}^!@0p@BU-D}9Y0|DSGj9_&&vy2n zQeDat7d%QfdZnZfB$RpBz3j0+qI>gE4|*|g|5_uvwMYuieyxZbW3|Ym*9t0tEK}11 zgB`JFNiGkc^uC#|FE~5P={}HhaMbF44G_^7>)*O~(scZ=-NEp+E*C;j>-o*bCxDi3 zXOy%zwU#lt!zkoitfTlMMv&ukM11wB<9Ly8m4A7rd4=8VmEuTqCE#F>RMNjFx!hDS z*^3*Aj}bPwVf3_cag!0d1gTf#oDN&Pd_dVdv;*a))ZL!>%mq7^3xp5xV>fH7@?30Q zVZ_0I3ioUK1=0^Dmsa~f=zf0w_-@SpBesVoWKv#w7qz2*hgn81*v0aQExoe8xC}Ud zTF)@Kr5w^Hd|ny~nn#~01FEkQYo=Zk?|RW2wR1u*{x~g|l2$HI8$O*Sc9iaR|5^LT z7z@^tH7CEpE{iyR=lRT`f)Gq&W#>w?$%+474im${sA7G49aR&=5h)*xuKt( zs=lY~A0X2EGC2yz*(%&NQ`6m4sFRdnpWY(BuzLy9{bqK?^RhtY*?v?Rb8IX~Z+jfI z;;~&!>dGdE5QDf>2lR{f*G!oe^^i@6bj6^de z|760+^ec-hFSDPm&usrXosE~R+77^4Qp$9A=Gi&x>XqsJg^B&;MqPy~i!R@{7aI(* zPp*h%eOKpxS5Nuohv%4z8e7tNq)^&ziI^HKVDgG4t07*+q|$&B9LYtwE& zuX8zyz5BF4SJBd78KhXt*r~-u9TxnaihZE<@~dg zf?Taq%d**36IX-_-{`-ie?JGKIv|#fpz>=msy(frIe0zoOg8uRrTKhIv%w?7`7Tcyl|isZ*ecw#u<}mcLbp((0&jng0SYa%AcN literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-xhdpi/menu_settings.png b/MyTracks/res/drawable-xhdpi/menu_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..09b01483454788c435acf715c57d92fc0ead0a7c GIT binary patch literal 1641 zcmaJ>c~BE~6yA_XI1DNx4tQ;2tWqJn8xu$(;Yb1`lrR)Bl4(0iNS3f-vN2hb;JJmd z#e)&FR;g4iRmP*XT4ijNk*%drb?kVQ0WT1(fI@*<)JP3>gMj^`bZ2&dzxU>S-@Crq z%^B$_oPh8E001~@l`@k)6TGjVFa14=t!|@_Fd|7uWZ`*)Q*T3oL?fPyf@-tggl3|8 zW6|o1Xe0?b8Cm_^3zKUdEMF{6x| zEz-ams{+l(RBLQ#)|zy!VNHQSV&ulhfw3+rO<+a|J?Jv8ve>0A8Fz$NO5eS1hzpK{ z5Ct;s>!Ng;3{ZjFP*B8&qYQ8~0!9n@h!Bdq!mror(2L8P?@eWuDr~5pz-?L_Uo|$xjC`EH?fJMBRAhAcr8SdB$O)>lSN33P>zgY zmAIkMj9Q2>tnm#NnGow0gV{=FR-!h{ff|!-xEUO2T8d3r3z9S;-ze5NVJ%4Vgjk3! z2J)`lzL5DxWNsL*#xGc<^7H2{+TnJ{ zn9h!qy-js@D_1+Zf@Zt^eugYr>*#8enEC_ni$mkiWVqV)0B@821LruRoDEr&aLy~1 zyB?9b0<;9u46|NoT=ivDSMdve5Or{-s#V3xd64*MQMnUK9!80p9AxYmyS4}rq+OUQAhE&h4 zX#*VHi8_`8yD#tP{AE3r`(r=4ac`lYnAd8VzlGIsx=|A7RwcALd@gl5dIb#qmGh8l z$g$+t!ibEOn>A-WTZufCRb5xU8oK3xBjZy@C zo2@M_tN7_Gr{Z*dd9?EAP++6K3Oatcap%qMA@XqNvfVvQRtvlJPf$0xd61cQr@5@E zcE3fvo~l~3QL?gO3Vf)29uObmUp{kK9@4@N8Db~`N_ab3gp7;2lFo;9FCw01CsUyV zcb)``rtBy^9uMtCmWjxBgBF|^IYf(S*waUKtOwR#oHr;e&-#)rPeNQ(!yZU5Tx9*#J}uSbEWvP~&o4jw^$UnLvcP znb!4*dKE|VI@GPaZs4&|Kgr;NC@GqwsUie{OK27pH3=m6Fo8HoMUgq04McllzFvQn zp&2I5us(*3`=YVPpq~l)qD&pj>rzn#8mwdGZ7kaq>kNZxAkRE7l}kV#G<6lPCe10$ zV+l0nt6}Blu>_l9DHIIlw01|U>nb!qj@TGnbZCq|(9pb_Xt4L3S!qF!Vllx-()P;d zl}Ot&`asKTzI%0O @@ -78,8 +77,7 @@ limitations under the License. android:layout_width="fill_parent" android:layout_height="0dp" android:singleLine="false" - android:autoText="true" - android:capitalize="sentences" + android:inputType="textAutoCorrect|textCapSentences" android:selectAllOnFocus="true" android:minLines="5" android:maxLines="50" diff --git a/MyTracks/res/layout/stats.xml b/MyTracks/res/layout/stats.xml index 7608a597c..d80189ce4 100644 --- a/MyTracks/res/layout/stats.xml +++ b/MyTracks/res/layout/stats.xml @@ -204,8 +204,6 @@ limitations under the License. style="@style/StatsUnit" /> - android:layout_height="3dp" - android:layout_width="fill_parent" /> diff --git a/MyTracks/res/layout/track_detail.xml b/MyTracks/res/layout/track_detail.xml index c5e30931e..fe4f4ed10 100644 --- a/MyTracks/res/layout/track_detail.xml +++ b/MyTracks/res/layout/track_detail.xml @@ -52,8 +52,7 @@ limitations under the License. android:src="@drawable/track" /> - @@ -70,7 +70,7 @@ limitations under the License. style="@style/WidgetTextView" android:text="@string/stat_moving_time" /> - diff --git a/MyTracks/res/layout/upload_result.xml b/MyTracks/res/layout/upload_result.xml index a0610a4c7..65f20a9a5 100644 --- a/MyTracks/res/layout/upload_result.xml +++ b/MyTracks/res/layout/upload_result.xml @@ -18,20 +18,16 @@ limitations under the License. android:layout_height="fill_parent" android:layout_margin="8dp" android:layout_width="fill_parent" > - - - - - - - + android:text="@string/send_google_maps" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> + android:text="@string/send_google_maps_url" + style="@android:style/TextAppearance.DeviceDefault.Small" /> - - - - - - + android:text="@string/send_google_fusion_tables" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> + android:text="@string/send_google_fusion_tables_url" + style="@android:style/TextAppearance.DeviceDefault.Small" /> - - - - - - + android:text="@string/send_google_docs" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> + android:text="@string/send_google_docs_url" + style="@android:style/TextAppearance.DeviceDefault.Small" /> - - - + android:text="@string/send_google_success_footer" + style="@android:style/TextAppearance.DeviceDefault.Small" /> + android:text="@string/send_google_error" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> - \ No newline at end of file diff --git a/MyTracks/res/layout/upload_service_chooser.xml b/MyTracks/res/layout/upload_service_chooser.xml index 599f5f421..c4cc68a35 100644 --- a/MyTracks/res/layout/upload_service_chooser.xml +++ b/MyTracks/res/layout/upload_service_chooser.xml @@ -17,89 +17,75 @@ limitations under the License. - - - - + android:text="@string/send_google_maps" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> - - - - + android:text="@string/send_google_new_map" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> + android:text="@string/send_google_existing_map" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> - - - + android:text="@string/send_google_fusion_tables" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> - - + android:text="@string/send_google_docs" + style="@android:style/TextAppearance.DeviceDefault.Medium" /> - \ No newline at end of file diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml index 76be5e18e..5ed7798dc 100644 --- a/MyTracks/res/menu/main.xml +++ b/MyTracks/res/menu/main.xml @@ -15,78 +15,61 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - - - - - \ No newline at end of file diff --git a/MyTracks/res/menu/search_only.xml b/MyTracks/res/menu/search_only.xml index 44cd456e8..22d061d37 100644 --- a/MyTracks/res/menu/search_only.xml +++ b/MyTracks/res/menu/search_only.xml @@ -16,7 +16,7 @@ limitations under the License. --> diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index d0404fe29..32420774d 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -461,7 +461,7 @@ limitations under the License. Activity type: %1$s @@ -476,7 +476,7 @@ limitations under the License. translation_description="Average moving speed description. %1$.2f speed in kilometers per hour - %2$.1f speed in miles per hour"> + %2$.1f speed in miles per hour"> Average moving speed: %1$.2f km/h (%2$.1f mi/h) Elevation gain: %1$d m (%2$d ft) @@ -530,14 +530,14 @@ limitations under the License. Max elevation: %1$d m (%2$d ft) Max grade: %1$d %% @@ -550,14 +550,14 @@ limitations under the License. Min elevation: %1$d m (%2$d ft) Min grade: %1$d %% @@ -570,13 +570,13 @@ limitations under the License. Moving time: %1$s Recorded: %1$s @@ -606,14 +606,14 @@ limitations under the License. Total distance: %1$.2f km (%2$.1f mi) Total time: %1$s @@ -643,15 +643,12 @@ limitations under the License. + %1$s: host name, 'm.google.com'"> By using Google\'s mobile products and services ("Services"), you agree to be bound by a) the YouTube Terms of Use (%1$s/tos_youtube) for YouTube-related Services, b) the Google Maps Terms - and Conditions (%2$s/tos_maps) for mapping, local and location-based Services, c) the Google - Books Terms of Service (%3$s/tos_books) for Books-related Services, and e) the Google Terms of - Service (%4$s/utos) for all other Services, as updated from time to time. + and Conditions (%1$s/tos_maps) for mapping, local and location-based Services, c) the Google + Books Terms of Service (%1$s/tos_books) for Books-related Services, and e) the Google Terms of + Service (%1$s/utos) for all other Services, as updated from time to time. @@ -689,10 +686,6 @@ limitations under the License. translation_description="The title on an alert dialog indicating error."> Error - - No - OK @@ -713,10 +706,6 @@ limitations under the License. Screenshot: sd_card_success_write_file.png"> Success - - Yes - + translation_description="In the menu, to go to the aggregated statistics page."> Aggregated statistics - + Chart settings + translation_description="In the menu, to go to the help page."> Help - + Map mode - - My location - - - Satellite mode - + translation_description="In the menu, to show a list of markers for the current track."> Markers + + My location + + translation_description="In the menu, to start recording a track."> Record track + + Satellite mode + Search + translation_description="In the menu, to go to the sensor state page."> Sensor state + translation_description="In the menu, to go to the settings page."> Settings + translation_description="In the menu, to stop recording a track."> Stop recording + translation_description="In the menu, to show a list of all the tracks."> Tracks @@ -1298,7 +1262,7 @@ limitations under the License. - You did not select any service. No data is sent. + You did not select any service. The track was not sent. min - - min/km - - - min/mi - { @Override protected Boolean doInBackground(Void... params) { try { - FileUtils fileUtils = new FileUtils(); - if (!fileUtils.isSdCardAvailable()) { + if (!FileUtils.isSdCardAvailable()) { return false; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java index 115e015ef..7214687d0 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MapActivity.java @@ -250,7 +250,7 @@ public class MapActivity extends com.google.android.maps.MapActivity return PlayTrackUtils.createInstallEarthDialog(this); case DIALOG_DELETE_CURRENT_ID: return DialogUtils.createConfirmationDialog(this, - getString(R.string.track_list_delete_track_confirm_message), + R.string.track_list_delete_track_confirm_message, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java index 90480c3ab..f9f624a39 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java @@ -81,9 +81,7 @@ class MenuManager { .setVisible(isMapTab); menu.findItem(R.id.menu_satellite_mode) .setVisible(isMapTab) - .setTitle(isSatelliteMode - ? R.string.menu_map_view_map_mode - : R.string.menu_map_view_satellite_mode); + .setTitle(isSatelliteMode ? R.string.menu_map_mode : R.string.menu_satellite_mode); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java index 3fd22109a..37ab619bd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java @@ -32,8 +32,8 @@ import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection import com.google.android.apps.mytracks.util.AnalyticsUtils; import com.google.android.apps.mytracks.util.ApiAdapterFactory; import com.google.android.apps.mytracks.util.EulaUtils; -import com.google.android.apps.mytracks.util.SystemUtils; import com.google.android.apps.mytracks.util.UriUtils; +import com.google.android.maps.mytracks.BuildConfig; import com.google.android.maps.mytracks.R; import android.app.Activity; @@ -73,7 +73,7 @@ public class MyTracks extends TabActivity implements OnTouchListener { private static final int DIALOG_CHECK_UNITS_ID = 1; private static final String CHECK_UNITS_PREFERENCE_FILE = "checkunits"; private static final String CHECK_UNITS_PREFERENCE_KEY = "checkunits.checked"; - + private TrackDataHub dataHub; /** @@ -140,7 +140,7 @@ public class MyTracks extends TabActivity implements OnTouchListener { protected void onCreate(Bundle savedInstanceState) { Log.d(TAG, "MyTracks.onCreate"); super.onCreate(savedInstanceState); - if (!SystemUtils.isRelease(this)) { + if (BuildConfig.DEBUG) { ApiAdapterFactory.getApiAdapter().enableStrictMode(); } @@ -153,7 +153,7 @@ public class MyTracks extends TabActivity implements OnTouchListener { serviceConnection = new TrackRecordingServiceConnection(this, serviceBindCallback); setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM); - + // Show the action bar (or nothing at all). ApiAdapterFactory.getApiAdapter().showActionBar(this); diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java index 17d41c844..06c0cacf1 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java @@ -30,7 +30,6 @@ import com.google.android.maps.mytracks.R; import android.app.Dialog; import android.bluetooth.BluetoothAdapter; import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; @@ -178,7 +177,7 @@ public class SettingsActivity extends PreferenceActivity { switch (id) { case DIALOG_CONFIRM_RESET_ID: return DialogUtils.createConfirmationDialog( - this, getString(R.string.settings_reset_confirm_message), new OnClickListener() { + this, R.string.settings_reset_confirm_message, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int button) { onResetPreferencesConfirmed(); @@ -186,8 +185,8 @@ public class SettingsActivity extends PreferenceActivity { }); case DIALOG_CONFIRM_ACCESS_ID: return DialogUtils.createConfirmationDialog(this, - getString(R.string.settings_sharing_allow_access_confirm_message), - new OnClickListener() { + R.string.settings_sharing_allow_access_confirm_message, + new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int button) { CheckBoxPreference pref = (CheckBoxPreference) findPreference( @@ -196,8 +195,9 @@ public class SettingsActivity extends PreferenceActivity { } }); case DIALOG_CONFIRM_RESTORE_ID: - return DialogUtils.createConfirmationDialog( - this, getString(R.string.settings_backup_restore_confirm_message), new OnClickListener() { + return DialogUtils.createConfirmationDialog(this, + R.string.settings_backup_restore_confirm_message, + new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { startActivity(new Intent(SettingsActivity.this, RestoreChooserActivity.class)); diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java index 9dc6f773b..0695071fa 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java @@ -365,8 +365,7 @@ public class TrackList extends ListActivity .create(); case DIALOG_DELETE_ALL_ID: return DialogUtils.createConfirmationDialog(this, - getString(R.string.track_list_delete_all_confirm_message), - new DialogInterface.OnClickListener() { + R.string.track_list_delete_all_confirm_message, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { MyTracksProviderUtils.Factory.get(TrackList.this).deleteAllTracks(); @@ -380,7 +379,7 @@ public class TrackList extends ListActivity }); case DIALOG_DELETE_CURRENT_ID: return DialogUtils.createConfirmationDialog(this, - getString(R.string.track_list_delete_track_confirm_message), + R.string.track_list_delete_track_confirm_message, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java index 85bc8993b..7ef0dae1f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java @@ -203,22 +203,19 @@ public class WaypointsList extends ListActivity implements View.OnClickListener @Override protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_DELETE_CURRENT_ID: - return DialogUtils.createConfirmationDialog(this, - getString(R.string.marker_list_delete_marker_confirm_message), - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - providerUtils.deleteWaypoint( - selectedWaypointId, new DescriptionGeneratorImpl(WaypointsList.this)); - } - }); - default: - return null; + if (id != DIALOG_DELETE_CURRENT_ID) { + return null; } + return DialogUtils.createConfirmationDialog(this, + R.string.marker_list_delete_marker_confirm_message, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + providerUtils.deleteWaypoint( + selectedWaypointId, new DescriptionGeneratorImpl(WaypointsList.this)); + } + }); } - + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.search_only, menu); diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java index ff32fdc44..2a1f5f42d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java @@ -61,7 +61,6 @@ public class WelcomeActivity extends Activity { View view = getLayoutInflater().inflate(R.layout.about, null); TextView aboutVersion = (TextView) view.findViewById(R.id.about_version); aboutVersion.setText(SystemUtils.getMyTracksVersion(this)); - return new AlertDialog.Builder(this) .setCancelable(true) .setNegativeButton(R.string.about_license, new DialogInterface.OnClickListener() { diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupPreferencesListenerImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/Api8BackupPreferencesListener.java similarity index 82% rename from MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupPreferencesListenerImpl.java rename to MyTracks/src/com/google/android/apps/mytracks/io/backup/Api8BackupPreferencesListener.java index 5f11b2876..10cdebc95 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupPreferencesListenerImpl.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/Api8BackupPreferencesListener.java @@ -15,21 +15,24 @@ */ package com.google.android.apps.mytracks.io.backup; +import android.annotation.TargetApi; import android.app.backup.BackupManager; import android.content.Context; import android.content.SharedPreferences; /** * Implementation of {@link BackupPreferencesListener} that calls the - * {@link BackupManager}. + * {@link BackupManager}.
+ * For API Level 8 or higher. * * @author Jimmy Shih */ -public class BackupPreferencesListenerImpl implements BackupPreferencesListener { +@TargetApi(8) +public class Api8BackupPreferencesListener implements BackupPreferencesListener { private final BackupManager backupManager; - public BackupPreferencesListenerImpl(Context context) { + public Api8BackupPreferencesListener(Context context) { this.backupManager = new BackupManager(context); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivity.java index 4f55a9ccf..fb4f12de2 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivity.java @@ -58,19 +58,16 @@ public class BackupActivity extends Activity { @Override protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_PROGRESS_ID: - return DialogUtils.createSpinnerProgressDialog(this, - getString(R.string.settings_backup_now_progress_message), - new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - finish(); - } - }); - default: - return null; + if (id != DIALOG_PROGRESS_ID) { + return null; } + return DialogUtils.createSpinnerProgressDialog( + this, R.string.settings_backup_now_progress_message, new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + finish(); + } + }); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java index 3ef19ad31..fd0675640 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupAsyncTask.java @@ -53,7 +53,7 @@ public class BackupAsyncTask extends AsyncTask { */ public BackupAsyncTask(BackupActivity backupActivity) { this.backupActivity = backupActivity; - this.externalFileBackup = new ExternalFileBackup(backupActivity, new FileUtils()); + this.externalFileBackup = new ExternalFileBackup(backupActivity); success = false; completed = false; messageId = R.string.sd_card_error_write_file; @@ -80,9 +80,7 @@ public class BackupAsyncTask extends AsyncTask { @Override protected Boolean doInBackground(Void... params) { - FileUtils fileUtils = new FileUtils(); - - if (!fileUtils.isSdCardAvailable()) { + if (!FileUtils.isSdCardAvailable()) { messageId = R.string.sd_card_error_no_storage; return false; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java index 68a0aea09..7fe2b3c2b 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/ExternalFileBackup.java @@ -65,11 +65,9 @@ class ExternalFileBackup { private static final int COMPRESSION_LEVEL = 8; private final Context context; - private final FileUtils fileUtils; - public ExternalFileBackup(Context context, FileUtils fileUtils) { + public ExternalFileBackup(Context context) { this.context = context; - this.fileUtils = fileUtils; } /** @@ -87,12 +85,12 @@ class ExternalFileBackup { * @param create whether to try creating the directory if it doesn't exist */ private File getBackupsDirectory(boolean create) { - String dirName = fileUtils.buildExternalDirectoryPath(BACKUPS_SUBDIR); + String dirName = FileUtils.buildExternalDirectoryPath(BACKUPS_SUBDIR); final File dir = new File(dirName); Log.d(Constants.TAG, "Dir: " + dir.getAbsolutePath()); if (create) { // Try to create - if that fails, return null - return fileUtils.ensureDirectoryExists(dir) ? dir : null; + return FileUtils.ensureDirectoryExists(dir) ? dir : null; } else { // Return it if it already exists, otherwise return null return dir.isDirectory() ? dir : null; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java index 23084d94c..7830a482f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/MyTracksBackupAgent.java @@ -17,6 +17,7 @@ package com.google.android.apps.mytracks.io.backup; import com.google.android.apps.mytracks.Constants; +import android.annotation.TargetApi; import android.app.backup.BackupAgent; import android.app.backup.BackupDataInput; import android.app.backup.BackupDataOutput; @@ -34,6 +35,7 @@ import java.io.IOException; * * @author Rodrigo Damazio */ +@TargetApi(8) public class MyTracksBackupAgent extends BackupAgent { private static final String PREFERENCES_ENTITY = "prefs"; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java index 43528a63b..b00aa3fe3 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreActivity.java @@ -71,19 +71,16 @@ public class RestoreActivity extends Activity { @Override protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_PROGRESS_ID: - return DialogUtils.createSpinnerProgressDialog(this, - getString(R.string.settings_backup_restore_progress_message), - new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - finish(); - } - }); - default: - return null; + if (id != DIALOG_PROGRESS_ID) { + return null; } + return DialogUtils.createSpinnerProgressDialog(this, + R.string.settings_backup_restore_progress_message, new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + finish(); + } + }); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java index 23917d521..009c0d44f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java @@ -16,7 +16,6 @@ package com.google.android.apps.mytracks.io.backup; -import com.google.android.apps.mytracks.util.FileUtils; import com.google.android.maps.mytracks.R; import android.os.AsyncTask; @@ -57,7 +56,7 @@ public class RestoreAsyncTask extends AsyncTask { public RestoreAsyncTask(RestoreActivity restoreActivity, Date date) { this.restoreActivity = restoreActivity; this.date = date; - this.externalFileBackup = new ExternalFileBackup(restoreActivity, new FileUtils()); + this.externalFileBackup = new ExternalFileBackup(restoreActivity); success = false; completed = false; messageId = R.string.sd_card_error_read_file; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java index 8b5fc81c7..fc1ba9bce 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java @@ -24,8 +24,6 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; -import android.content.DialogInterface.OnCancelListener; -import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Bundle; import android.widget.Toast; @@ -55,11 +53,10 @@ public class RestoreChooserActivity extends Activity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - FileUtils fileUtils = new FileUtils(); - ExternalFileBackup externalFileBackup = new ExternalFileBackup(this, fileUtils); + ExternalFileBackup externalFileBackup = new ExternalFileBackup(this); // Get the list of existing backups - if (!fileUtils.isSdCardAvailable()) { + if (!FileUtils.isSdCardAvailable()) { Toast.makeText(this, R.string.sd_card_error_no_storage, Toast.LENGTH_LONG).show(); finish(); return; @@ -91,32 +88,30 @@ public class RestoreChooserActivity extends Activity { @Override protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_CHOOSER_ID: - String items[] = new String[backupDates.length]; - for (int i = 0; i < backupDates.length; i++) { - items[i] = StringUtils.formatDateTime(this, backupDates[i].getTime()); - } - return new AlertDialog.Builder(this) - .setCancelable(true) - .setItems(items, new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - startActivity(new Intent(RestoreChooserActivity.this, RestoreActivity.class) - .putExtra(RestoreActivity.EXTRA_DATE, backupDates[which].getTime())); - finish(); - } - }) - .setOnCancelListener(new OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - finish(); - } - }) - .setTitle(R.string.settings_backup_restore_select_title) - .create(); - default: - return null; + if (id != DIALOG_CHOOSER_ID) { + return null; } + String items[] = new String[backupDates.length]; + for (int i = 0; i < backupDates.length; i++) { + items[i] = StringUtils.formatDateTime(this, backupDates[i].getTime()); + } + return new AlertDialog.Builder(this) + .setCancelable(true) + .setItems(items, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + startActivity(new Intent(RestoreChooserActivity.this, RestoreActivity.class).putExtra( + RestoreActivity.EXTRA_DATE, backupDates[which].getTime())); + finish(); + } + }) + .setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + finish(); + } + }) + .setTitle(R.string.settings_backup_restore_select_title) + .create(); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java index 1c0b4ed73..bc31d16b5 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java @@ -28,8 +28,6 @@ import android.app.AlertDialog; import android.app.Dialog; import android.app.ProgressDialog; import android.content.DialogInterface; -import android.content.DialogInterface.OnCancelListener; -import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -102,7 +100,7 @@ public class SaveActivity extends Activity { } if (shareTrack || playTrack) { // Save to the temp directory - String dirName = new FileUtils().buildExternalDirectoryPath( + String dirName = FileUtils.buildExternalDirectoryPath( trackFileFormat.getExtension(), "tmp"); trackWriter.setDirectory(new File(dirName)); } @@ -121,9 +119,8 @@ public class SaveActivity extends Activity { protected Dialog onCreateDialog(int id) { switch (id) { case DIALOG_PROGRESS_ID: - progressDialog = DialogUtils.createHorizontalProgressDialog(this, - getString(R.string.sd_card_progress_message), - new DialogInterface.OnCancelListener() { + progressDialog = DialogUtils.createHorizontalProgressDialog( + this, R.string.sd_card_progress_message, new DialogInterface.OnCancelListener() { @Override public void onCancel(DialogInterface dialog) { saveAsyncTask.cancel(true); @@ -137,14 +134,14 @@ public class SaveActivity extends Activity { .setIcon(success ? android.R.drawable.ic_dialog_info : android.R.drawable.ic_dialog_alert) .setMessage(messageId) - .setOnCancelListener(new OnCancelListener() { + .setOnCancelListener(new DialogInterface.OnCancelListener() { @Override public void onCancel(DialogInterface dialog) { dialog.dismiss(); onPostResultDialog(); } }) - .setPositiveButton(R.string.generic_ok, new OnClickListener() { + .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int arg1) { dialog.dismiss(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java index 76517544b..977ea8692 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java @@ -52,7 +52,6 @@ class TrackWriterImpl implements TrackWriter { private final MyTracksProviderUtils providerUtils; private final Track track; private final TrackFormatWriter writer; - private final FileUtils fileUtils; private boolean success = false; private int errorMessage = -1; private File directory = null; @@ -66,7 +65,6 @@ class TrackWriterImpl implements TrackWriter { this.providerUtils = providerUtils; this.track = track; this.writer = writer; - this.fileUtils = new FileUtils(); } @Override @@ -175,7 +173,7 @@ class TrackWriterImpl implements TrackWriter { } // Make sure the file doesn't exist yet (possibly by changing the filename) - String fileName = fileUtils.buildUniqueFileName( + String fileName = FileUtils.buildUniqueFileName( directory, track.getName(), writer.getExtension()); if (fileName == null) { Log.e(Constants.TAG, @@ -200,16 +198,16 @@ class TrackWriterImpl implements TrackWriter { protected boolean canWriteFile() { if (directory == null) { String dirName = - fileUtils.buildExternalDirectoryPath(writer.getExtension()); + FileUtils.buildExternalDirectoryPath(writer.getExtension()); directory = newFile(dirName); } - if (!fileUtils.isSdCardAvailable()) { + if (!FileUtils.isSdCardAvailable()) { Log.i(Constants.TAG, "Could not find SD card."); errorMessage = R.string.sd_card_error_no_storage; return false; } - if (!fileUtils.ensureDirectoryExists(directory)) { + if (!FileUtils.ensureDirectoryExists(directory)) { Log.i(Constants.TAG, "Could not create export directory."); errorMessage = R.string.sd_card_error_create_dir; return false; diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java index c864e01de..62112474c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/ChooseMapActivity.java @@ -25,8 +25,6 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; -import android.content.DialogInterface.OnCancelListener; -import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.graphics.Color; import android.os.Bundle; @@ -122,7 +120,7 @@ public class ChooseMapActivity extends Activity { switch (id) { case DIALOG_PROGRESS_ID: return DialogUtils.createSpinnerProgressDialog( - this, getString(R.string.maps_list_progress_message), new DialogInterface.OnCancelListener() { + this, R.string.maps_list_progress_message, new DialogInterface.OnCancelListener() { @Override public void onCancel(DialogInterface dialog) { asyncTask.cancel(true); @@ -134,13 +132,13 @@ public class ChooseMapActivity extends Activity { .setCancelable(true) .setIcon(android.R.drawable.ic_dialog_alert) .setMessage(R.string.maps_list_error) - .setOnCancelListener(new OnCancelListener() { + .setOnCancelListener(new DialogInterface.OnCancelListener() { @Override public void onCancel(DialogInterface dialog) { finish(); } }) - .setPositiveButton(R.string.generic_ok, new OnClickListener() { + .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int arg1) { finish(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendActivity.java index 6a094d1e1..b21aee1d9 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AbstractSendActivity.java @@ -71,21 +71,18 @@ public abstract class AbstractSendActivity extends Activity { @Override protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_PROGRESS_ID: - progressDialog = DialogUtils.createHorizontalProgressDialog(this, - getString(R.string.send_google_progress_message, getServiceName()), - new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - asyncTask.cancel(true); - startNextActivity(false, true); - } - }); - return progressDialog; - default: - return null; + if (id != DIALOG_PROGRESS_ID) { + return null; } + progressDialog = DialogUtils.createHorizontalProgressDialog( + this, R.string.send_google_progress_message, new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + asyncTask.cancel(true); + startNextActivity(false, true); + } + }, getServiceName()); + return progressDialog; } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java index 1e078aefe..9b769ef1a 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/AccountChooserActivity.java @@ -135,49 +135,56 @@ public class AccountChooserActivity extends Activity { .setTitle(R.string.send_google_no_account_title) .create(); case DIALOG_CHOOSER_ID: - String[] choices = new String[accounts.length]; - for (int i = 0; i < accounts.length; i++) { - choices[i] = accounts[i].name; - } - return new AlertDialog.Builder(this) - .setCancelable(true) - .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - finish(); - } - }) - .setOnCancelListener(new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - finish(); - } - }) - .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - Account account = accounts[selectedAccountIndex]; - SharedPreferences sharedPreferences = getSharedPreferences( - Constants.SETTINGS_NAME, Context.MODE_PRIVATE); - Editor editor = sharedPreferences.edit(); - editor.putString(getString(R.string.preferred_account_key), account.name); - ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor); - - sendRequest.setAccount(account); - getPermission(MapsConstants.SERVICE_NAME, sendRequest.isSendMaps(), mapsCallback); - } - }) - .setSingleChoiceItems( - choices, selectedAccountIndex, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - selectedAccountIndex = which; - } - }) - .setTitle(R.string.send_google_choose_account_title) - .create(); + return createChooserDialog(); default: return null; } } + + /** + * Creates a chooser dialog. + */ + private Dialog createChooserDialog() { + String[] choices = new String[accounts.length]; + for (int i = 0; i < accounts.length; i++) { + choices[i] = accounts[i].name; + } + return new AlertDialog.Builder(this) + .setCancelable(true) + .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + finish(); + } + }) + .setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + finish(); + } + }) + .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + Account account = accounts[selectedAccountIndex]; + SharedPreferences sharedPreferences = getSharedPreferences( + Constants.SETTINGS_NAME, Context.MODE_PRIVATE); + Editor editor = sharedPreferences.edit(); + editor.putString(getString(R.string.preferred_account_key), account.name); + ApiAdapterFactory.getApiAdapter().applyPreferenceChanges(editor); + + sendRequest.setAccount(account); + getPermission(MapsConstants.SERVICE_NAME, sendRequest.isSendMaps(), mapsCallback); + } + }) + .setSingleChoiceItems( + choices, selectedAccountIndex, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + selectedAccountIndex = which; + } + }) + .setTitle(R.string.send_google_choose_account_title) + .create(); + } private PermissionCallback spreadsheetsCallback = new PermissionCallback() { @Override diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java index 5f12ee9c5..f77a33f4b 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivity.java @@ -80,100 +80,94 @@ public class UploadResultActivity extends Activity { @Override protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_RESULT_ID: - View view = getLayoutInflater().inflate(R.layout.upload_result, null); + if (id != DIALOG_RESULT_ID) { + return null; + } + View view = getLayoutInflater().inflate(R.layout.upload_result, null); - LinearLayout mapsResult = (LinearLayout) view.findViewById(R.id.upload_result_maps_result); - LinearLayout fusionTablesResult = (LinearLayout) view.findViewById( - R.id.upload_result_fusion_tables_result); - LinearLayout docsResult = (LinearLayout) view.findViewById(R.id.upload_result_docs_result); + LinearLayout mapsResult = (LinearLayout) view.findViewById(R.id.upload_result_maps_result); + LinearLayout fusionTablesResult = (LinearLayout) view.findViewById( + R.id.upload_result_fusion_tables_result); + LinearLayout docsResult = (LinearLayout) view.findViewById(R.id.upload_result_docs_result); - ImageView mapsResultIcon = (ImageView) view.findViewById( - R.id.upload_result_maps_result_icon); - ImageView fusionTablesResultIcon = (ImageView) view.findViewById( - R.id.upload_result_fusion_tables_result_icon); - ImageView docsResultIcon = (ImageView) view.findViewById( - R.id.upload_result_docs_result_icon); + ImageView mapsResultIcon = (ImageView) view.findViewById(R.id.upload_result_maps_result_icon); + ImageView fusionTablesResultIcon = (ImageView) view.findViewById( + R.id.upload_result_fusion_tables_result_icon); + ImageView docsResultIcon = (ImageView) view.findViewById(R.id.upload_result_docs_result_icon); - TextView successFooter = (TextView) view.findViewById(R.id.upload_result_success_footer); - TextView errorFooter = (TextView) view.findViewById(R.id.upload_result_error_footer); + TextView successFooter = (TextView) view.findViewById(R.id.upload_result_success_footer); + TextView errorFooter = (TextView) view.findViewById(R.id.upload_result_error_footer); - boolean hasError = false; - if (!sendRequest.isSendMaps()) { - mapsResult.setVisibility(View.GONE); - } else { - if (!sendRequest.isMapsSuccess()) { - mapsResultIcon.setImageResource(R.drawable.failure); - mapsResultIcon.setContentDescription(getString(R.string.generic_error_title)); - hasError = true; - } - } - - if (!sendRequest.isSendFusionTables()) { - fusionTablesResult.setVisibility(View.GONE); - } else { - if (!sendRequest.isFusionTablesSuccess()) { - fusionTablesResultIcon.setImageResource(R.drawable.failure); - fusionTablesResultIcon.setContentDescription(getString(R.string.generic_error_title)); - hasError = true; - } - } - - if (!sendRequest.isSendDocs()) { - docsResult.setVisibility(View.GONE); - } else { - if (!sendRequest.isDocsSuccess()) { - docsResultIcon.setImageResource(R.drawable.failure); - docsResultIcon.setContentDescription(getString(R.string.generic_error_title)); - hasError = true; - } - } - - if (hasError) { - successFooter.setVisibility(View.GONE); - } else { - errorFooter.setVisibility(View.GONE); - } - - AlertDialog.Builder builder = new AlertDialog.Builder(this) - .setCancelable(true) - .setIcon(hasError ? android.R.drawable.ic_dialog_alert - : android.R.drawable.ic_dialog_info) - .setOnCancelListener(new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - finish(); - } - }) - .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - if (!sendRequest.isShowAll() && shareUrl != null) { - startShareUrlActivity(shareUrl); - } - finish(); - } - }) - .setTitle(hasError ? R.string.generic_error_title : R.string.generic_success_title) - .setView(view); - - // Add a Share URL button if showing all the options and a shareUrl - // exists - if (sendRequest.isShowAll() && shareUrl != null) { - builder.setNegativeButton(getString(R.string.send_google_result_share_url), - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - startShareUrlActivity(shareUrl); - finish(); - } - }); - } - return builder.create(); - default: - return null; + boolean hasError = false; + if (!sendRequest.isSendMaps()) { + mapsResult.setVisibility(View.GONE); + } else { + if (!sendRequest.isMapsSuccess()) { + mapsResultIcon.setImageResource(R.drawable.failure); + mapsResultIcon.setContentDescription(getString(R.string.generic_error_title)); + hasError = true; + } } + + if (!sendRequest.isSendFusionTables()) { + fusionTablesResult.setVisibility(View.GONE); + } else { + if (!sendRequest.isFusionTablesSuccess()) { + fusionTablesResultIcon.setImageResource(R.drawable.failure); + fusionTablesResultIcon.setContentDescription(getString(R.string.generic_error_title)); + hasError = true; + } + } + + if (!sendRequest.isSendDocs()) { + docsResult.setVisibility(View.GONE); + } else { + if (!sendRequest.isDocsSuccess()) { + docsResultIcon.setImageResource(R.drawable.failure); + docsResultIcon.setContentDescription(getString(R.string.generic_error_title)); + hasError = true; + } + } + + if (hasError) { + successFooter.setVisibility(View.GONE); + } else { + errorFooter.setVisibility(View.GONE); + } + + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setCancelable(true) + .setIcon(hasError ? android.R.drawable.ic_dialog_alert : android.R.drawable.ic_dialog_info) + .setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface dialog) { + finish(); + } + }) + .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (!sendRequest.isShowAll() && shareUrl != null) { + startShareUrlActivity(shareUrl); + } + finish(); + } + }) + .setTitle(hasError ? R.string.generic_error_title : R.string.generic_success_title) + .setView(view); + + // Add a Share URL button if showing all the options and a shareUrl exists + if (sendRequest.isShowAll() && shareUrl != null) { + builder.setNegativeButton( + R.string.send_google_result_share_url, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + startShareUrlActivity(shareUrl); + finish(); + } + }); + } + return builder.create(); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java index 0e0433cb7..c2703b016 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java @@ -78,77 +78,73 @@ public class UploadServiceChooserActivity extends Activity { @Override protected Dialog onCreateDialog(int id) { - switch (id) { - case DIALOG_CHOOSER_ID: - View view = getLayoutInflater().inflate(R.layout.upload_service_chooser, null); - - mapsTableRow = (TableRow) view.findViewById(R.id.send_google_maps_row); - fusionTablesTableRow = (TableRow) view.findViewById(R.id.send_google_fusion_tables_row); - docsTableRow = (TableRow) view.findViewById(R.id.send_google_docs_row); - - mapsCheckBox = (CheckBox) view.findViewById(R.id.send_google_maps); - fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.send_google_fusion_tables); - docsCheckBox = (CheckBox) view.findViewById(R.id.send_google_docs); - - mapsOptionTableRow = (TableRow) view.findViewById(R.id.send_google_maps_option_row); - newMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_new_map); - existingMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_existing_map); - - // Setup checkboxes - OnCheckedChangeListener checkBoxListener = new OnCheckedChangeListener() { - public void onCheckedChanged(CompoundButton button, boolean checked) { - updateStateBySelection(); - } - }; - mapsCheckBox.setOnCheckedChangeListener(checkBoxListener); - fusionTablesCheckBox.setOnCheckedChangeListener(checkBoxListener); - docsCheckBox.setOnCheckedChangeListener(checkBoxListener); - - // Setup initial state - initState(); - - // Update state based on sendRequest - updateStateBySendRequest(); - - // Update state based on current selection - updateStateBySelection(); - - alertDialog = new AlertDialog.Builder(this) - .setCancelable(true) - .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - finish(); - } - }) - .setOnCancelListener(new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface d) { - finish(); - } - }) - .setPositiveButton( - R.string.send_google_send_now, new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, int which) { - saveState(); - if (sendMaps() || sendFusionTables() || sendDocs()) { - startNextActivity(); - } else { - Toast.makeText(UploadServiceChooserActivity.this, - R.string.send_google_no_service_selected, Toast.LENGTH_LONG).show(); - finish(); - } - } - }) - .setTitle(R.string.send_google_title) - .setView(view) - .create(); - return alertDialog; - default: - return null; + if (id != DIALOG_CHOOSER_ID) { + return null; } + View view = getLayoutInflater().inflate(R.layout.upload_service_chooser, null); + + mapsTableRow = (TableRow) view.findViewById(R.id.send_google_maps_row); + fusionTablesTableRow = (TableRow) view.findViewById(R.id.send_google_fusion_tables_row); + docsTableRow = (TableRow) view.findViewById(R.id.send_google_docs_row); + + mapsCheckBox = (CheckBox) view.findViewById(R.id.send_google_maps); + fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.send_google_fusion_tables); + docsCheckBox = (CheckBox) view.findViewById(R.id.send_google_docs); + + mapsOptionTableRow = (TableRow) view.findViewById(R.id.send_google_maps_option_row); + newMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_new_map); + existingMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_existing_map); + + // Setup checkboxes + OnCheckedChangeListener checkBoxListener = new OnCheckedChangeListener() { + public void onCheckedChanged(CompoundButton button, boolean checked) { + updateStateBySelection(); + } + }; + mapsCheckBox.setOnCheckedChangeListener(checkBoxListener); + fusionTablesCheckBox.setOnCheckedChangeListener(checkBoxListener); + docsCheckBox.setOnCheckedChangeListener(checkBoxListener); + + // Setup initial state + initState(); + + // Update state based on sendRequest + updateStateBySendRequest(); + + // Update state based on current selection + updateStateBySelection(); + + alertDialog = new AlertDialog.Builder(this) + .setCancelable(true) + .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + finish(); + } + }) + .setOnCancelListener(new DialogInterface.OnCancelListener() { + @Override + public void onCancel(DialogInterface d) { + finish(); + } + }) + .setPositiveButton(R.string.send_google_send_now, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + saveState(); + if (sendMaps() || sendFusionTables() || sendDocs()) { + startNextActivity(); + } else { + Toast.makeText(UploadServiceChooserActivity.this, + R.string.send_google_no_service_selected, Toast.LENGTH_LONG).show(); + finish(); + } + } + }) + .setTitle(R.string.send_google_title) + .setView(view) + .create(); + return alertDialog; } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java index 0a36b2e66..9866aca3f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/RemoveTempFilesService.java @@ -91,10 +91,7 @@ public class RemoveTempFilesService extends Service { } private void cleanTempDirectory(String name) { - FileUtils fileUtils = new FileUtils(); - String dirName = fileUtils.buildExternalDirectoryPath(name, "tmp"); - File dir = new File(dirName); - cleanTempDirectory(dir); + cleanTempDirectory(new File(FileUtils.buildExternalDirectoryPath(name, "tmp"))); } /** diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java index f646ab1cd..58bfb95a2 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java @@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.services; import static com.google.android.apps.mytracks.Constants.TAG; import com.google.android.apps.mytracks.util.SystemUtils; +import com.google.android.maps.mytracks.BuildConfig; import android.content.ComponentName; import android.content.Context; @@ -157,7 +158,7 @@ public class TrackRecordingServiceConnection { Log.i(TAG, "Binding to the service"); Intent intent = new Intent(context, TrackRecordingService.class); - int flags = SystemUtils.isRelease(context) ? 0 : Context.BIND_DEBUG_UNBIND; + int flags = BuildConfig.DEBUG ? Context.BIND_DEBUG_UNBIND : 0; context.bindService(intent, serviceConnection, flags); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java index 1006e4a6b..2a16fb743 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/sensors/ant/AntSrmBridgeSensorManager.java @@ -23,7 +23,7 @@ import com.dsi.ant.exception.AntInterfaceException; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.content.Sensor; import com.google.android.apps.mytracks.util.ApiAdapterFactory; -import com.google.android.apps.mytracks.util.SystemUtils; +import com.google.android.maps.mytracks.BuildConfig; import com.google.android.maps.mytracks.R; import android.content.Context; @@ -32,7 +32,7 @@ import android.util.Log; /** * A sensor manager to the PC7 SRM ANT+ bridge. - * + * * @author Sandor Dornbush * @author Umran Abdulla */ @@ -54,15 +54,15 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { private static final int INDEX_MESSAGE_SPEED = 5; private static final int INDEX_MESSAGE_CADENCE = 7; private static final int INDEX_MESSAGE_BPM = 8; - + private static final int MSG_INITIAL = 5; private static final int MSG_DATA = 6; - + private short deviceNumber; public AntSrmBridgeSensorManager(Context context) { super(context); - + Log.i(TAG, "new ANT SRM Bridge Sensor Manager created"); deviceNumber = WILDCARD; @@ -77,15 +77,15 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { } Log.i(TAG, "Will pair with device: " + deviceNumber); } - - + + @Override protected boolean handleMessage(byte messageId, byte[] messageData) { if (super.handleMessage(messageId, messageData)) { return true; } - - if (!SystemUtils.isRelease(context)) { + + if (BuildConfig.DEBUG) { Log.d(TAG, "Received ANT msg: " + AntUtils.antMessageToString(messageId) + "(" + messageId + ")"); } @@ -100,7 +100,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { return true; } - + /** * Decode an ant device message. * @param messageData The byte array received from the device. @@ -132,10 +132,10 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { } setSensorState(Sensor.SensorState.CONNECTED); - + int messageType = antMessage[INDEX_MESSAGE_TYPE] & 0xFF; Log.d(TAG, "Received message-type=" + messageType); - + switch (messageType) { case MSG_INITIAL: break; @@ -149,7 +149,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { { int messageId = msg[INDEX_MESSAGE_ID] & 0xFF; Log.d(TAG, "Received message-id=" + messageId); - + int powerVal = (((msg[INDEX_MESSAGE_POWER] & 0xFF) << 8) | (msg[INDEX_MESSAGE_POWER+1] & 0xFF)); @SuppressWarnings("unused") @@ -158,12 +158,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { int cadenceVal = (msg[INDEX_MESSAGE_CADENCE] & 0xFF); int bpmVal = (msg[INDEX_MESSAGE_BPM] & 0xFF); long time = System.currentTimeMillis(); - - Sensor.SensorData.Builder power = + + Sensor.SensorData.Builder power = Sensor.SensorData.newBuilder() .setValue(powerVal) .setState(Sensor.SensorState.SENDING); - + /* * Although speed is available from the SRM Bridge, MyTracks doesn't use the value, and * computes speed from the GPS location data. @@ -171,12 +171,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { // Sensor.SensorData.Builder speed = Sensor.SensorData.newBuilder().setValue(speedVal).setState( // Sensor.SensorState.SENDING); - Sensor.SensorData.Builder cadence = + Sensor.SensorData.Builder cadence = Sensor.SensorData.newBuilder() .setValue(cadenceVal) .setState(Sensor.SensorState.SENDING); - Sensor.SensorData.Builder bpm = + Sensor.SensorData.Builder bpm = Sensor.SensorData.newBuilder() .setValue(bpmVal) .setState(Sensor.SensorState.SENDING); @@ -189,7 +189,7 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { .setHeartRate(bpm) .build(); } - + void handleChannelId(byte[] rawMessage) { AntChannelIdMessage message = new AntChannelIdMessage(rawMessage); deviceNumber = message.getDeviceNumber(); @@ -203,12 +203,12 @@ public class AntSrmBridgeSensorManager extends AntSensorManager { } private void handleMessageResponse(byte[] rawMessage) { - AntChannelResponseMessage message = + AntChannelResponseMessage message = new AntChannelResponseMessage(rawMessage); - if (!SystemUtils.isRelease(context)) { + if (BuildConfig.DEBUG) { Log.d(TAG, "Received ANT Response: " + AntUtils.antMessageToString(message.getMessageId()) + "(" + message.getMessageId() + ")" + - ", Code: " + AntUtils.antEventToStr(message.getMessageCode()) + + ", Code: " + AntUtils.antEventToStr(message.getMessageCode()) + "(" + message.getMessageCode() + ")"); } switch (message.getMessageId()) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/FroyoStatusAnnouncerTask.java b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/Api8StatusAnnouncerTask.java similarity index 90% rename from MyTracks/src/com/google/android/apps/mytracks/services/tasks/FroyoStatusAnnouncerTask.java rename to MyTracks/src/com/google/android/apps/mytracks/services/tasks/Api8StatusAnnouncerTask.java index 5bf03e439..fbc640998 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/FroyoStatusAnnouncerTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/Api8StatusAnnouncerTask.java @@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.services.tasks; import static com.google.android.apps.mytracks.Constants.TAG; +import android.annotation.TargetApi; import android.content.Context; import android.media.AudioManager; import android.speech.tts.TextToSpeech; @@ -28,12 +29,14 @@ import java.util.HashMap; /** - * This class will periodically announce the user's trip statistics for Froyo and future handsets. - * This class will request and release audio focus. + * This class will periodically announce the user's trip statistics. This class + * will request and release audio focus.
+ * For API Level 8 or higher. * * @author Sandor Dornbush */ -public class FroyoStatusAnnouncerTask extends StatusAnnouncerTask { +@TargetApi(8) +public class Api8StatusAnnouncerTask extends StatusAnnouncerTask { private final static HashMap SPEECH_PARAMS = new HashMap(); static { SPEECH_PARAMS.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "not_used"); @@ -51,7 +54,7 @@ public class FroyoStatusAnnouncerTask extends StatusAnnouncerTask { } }; - public FroyoStatusAnnouncerTask(Context context) { + public Api8StatusAnnouncerTask(Context context) { super(context); audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api10Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api10Adapter.java index 8bdece372..b346a802e 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api10Adapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api10Adapter.java @@ -18,6 +18,7 @@ package com.google.android.apps.mytracks.util; import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.services.sensors.BluetoothConnectionManager; +import android.annotation.TargetApi; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothSocket; import android.util.Log; @@ -29,6 +30,7 @@ import java.io.IOException; * * @author Jimmy Shih */ +@TargetApi(10) public class Api10Adapter extends Api9Adapter { @Override diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java index f8371e081..26ccf5b2c 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java @@ -16,8 +16,8 @@ package com.google.android.apps.mytracks.util; import com.google.android.apps.mytracks.io.backup.BackupPreferencesListener; -import com.google.android.apps.mytracks.io.backup.BackupPreferencesListenerImpl; -import com.google.android.apps.mytracks.services.tasks.FroyoStatusAnnouncerTask; +import com.google.android.apps.mytracks.io.backup.Api8BackupPreferencesListener; +import com.google.android.apps.mytracks.services.tasks.Api8StatusAnnouncerTask; import com.google.android.apps.mytracks.services.tasks.PeriodicTask; import android.content.Context; @@ -31,11 +31,11 @@ public class Api8Adapter extends Api7Adapter { @Override public PeriodicTask getStatusAnnouncerTask(Context context) { - return new FroyoStatusAnnouncerTask(context); + return new Api8StatusAnnouncerTask(context); } @Override public BackupPreferencesListener getBackupPreferencesListener(Context context) { - return new BackupPreferencesListenerImpl(context); + return new Api8BackupPreferencesListener(context); } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api9Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api9Adapter.java index 86fb12d3d..98d5a9bfa 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/Api9Adapter.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api9Adapter.java @@ -19,6 +19,7 @@ import com.google.android.apps.mytracks.Constants; import com.google.api.client.http.HttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; +import android.annotation.TargetApi; import android.content.SharedPreferences.Editor; import android.os.StrictMode; import android.util.Log; @@ -30,6 +31,7 @@ import java.util.Arrays; * * @author Rodrigo Damazio */ +@TargetApi(9) public class Api9Adapter extends Api8Adapter { @Override diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java index c6c39cfac..126f25bf4 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/DialogUtils.java @@ -37,15 +37,15 @@ public class DialogUtils { * Creates a confirmation dialog. * * @param context the context - * @param message the confirmation message + * @param messageId the confirmation message id * @param onClickListener the listener to invoke when the user clicks OK */ public static Dialog createConfirmationDialog( - Context context, String message, DialogInterface.OnClickListener onClickListener) { + Context context, int messageId, DialogInterface.OnClickListener onClickListener) { return new AlertDialog.Builder(context) .setCancelable(true) .setIcon(android.R.drawable.ic_dialog_alert) - .setMessage(message) + .setMessage(context.getString(messageId)) .setNegativeButton(android.R.string.cancel, null) .setPositiveButton(android.R.string.ok, onClickListener) .setTitle(R.string.generic_confirm_title) @@ -56,39 +56,47 @@ public class DialogUtils { * Creates a spinner progress dialog. * * @param context the context - * @param message the progress message - * @param onCancelListener the listener to invoke when the user cancels + * @param messageId the progress message id + * @param onCancelListener the cancel listener */ public static ProgressDialog createSpinnerProgressDialog( - Context context, String message, DialogInterface.OnCancelListener onCancelListener) { - ProgressDialog progressDialog = new ProgressDialog(context); - progressDialog.setCancelable(true); - progressDialog.setIcon(android.R.drawable.ic_dialog_info); - progressDialog.setIndeterminate(true); - progressDialog.setMessage(message); - progressDialog.setOnCancelListener(onCancelListener); - progressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER); - progressDialog.setTitle(R.string.generic_progress_title); - return progressDialog; + Context context, int messageId, DialogInterface.OnCancelListener onCancelListener) { + return createProgressDialog(true, context, messageId, onCancelListener); } - + /** * Creates a horizontal progress dialog. * * @param context the context - * @param message the progress message - * @param onCancelListener the listener to invoke when the user cancels + * @param messageId the progress message id + * @param onCancelListener the cancel listener + * @param formatArgs the format arguments for the messageId */ - public static ProgressDialog createHorizontalProgressDialog( - Context context, String message, DialogInterface.OnCancelListener onCancelListener) { + public static ProgressDialog createHorizontalProgressDialog(Context context, int messageId, + DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) { + return createProgressDialog(false, context, messageId, onCancelListener, formatArgs); + } + + /** + * Creates a progress dialog. + * + * @param spinner true to use the spinner style + * @param context the context + * @param messageId the progress message id + * @param onCancelListener the cancel listener + * @param formatArgs the format arguments for the message id + */ + private static ProgressDialog createProgressDialog(boolean spinner, Context context, + int messageId, DialogInterface.OnCancelListener onCancelListener, Object... formatArgs) { ProgressDialog progressDialog = new ProgressDialog(context); progressDialog.setCancelable(true); progressDialog.setIcon(android.R.drawable.ic_dialog_info); progressDialog.setIndeterminate(true); - progressDialog.setMessage(message); + progressDialog.setMessage(context.getString(messageId, formatArgs)); progressDialog.setOnCancelListener(onCancelListener); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setTitle(R.string.generic_progress_title); + progressDialog.setProgressStyle(spinner ? ProgressDialog.STYLE_SPINNER + : ProgressDialog.STYLE_HORIZONTAL); + progressDialog.setTitle(R.string.generic_progress_title); return progressDialog; } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/EulaUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/EulaUtils.java index 078136391..c2d7ed541 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/EulaUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/EulaUtils.java @@ -35,6 +35,7 @@ public class EulaUtils { // Accepting Google mobile terms of service private static final String EULA_PREFERENCE_KEY = "eula.google_mobile_tos_accepted"; + // Google's mobile page private static final String HOST_NAME = "m.google.com"; private EulaUtils() {} @@ -56,7 +57,7 @@ public class EulaUtils { public static String getEulaMessage(Context context) { return context.getString(R.string.eula_date) + "\n\n" - + context.getString(R.string.eula_body, HOST_NAME, HOST_NAME, HOST_NAME, HOST_NAME) + + context.getString(R.string.eula_body, HOST_NAME) + "\n\n" + context.getString(R.string.eula_footer, HOST_NAME) + "\n\n" diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java index 99ce45838..11d7ff5da 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/FileUtils.java @@ -29,20 +29,46 @@ import java.io.File; */ public class FileUtils { + private FileUtils() {} + /** * The maximum FAT32 path length. See the FAT32 spec at * http://msdn.microsoft.com/en-us/windows/hardware/gg463080 */ @VisibleForTesting static final int MAX_FAT32_PATH_LENGTH = 260; - + + /** + * Returns whether the SD card is available. + */ + public static boolean isSdCardAvailable() { + return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()); + } + + /** + * Ensures the given directory exists by creating it and its parents if + * necessary. + * + * @return whether the directory exists (either already existed or was + * successfully created) + */ + public static boolean ensureDirectoryExists(File dir) { + if (dir.exists() && dir.isDirectory()) { + return true; + } + if (dir.mkdirs()) { + return true; + } + return false; + } + /** * Builds a path inside the My Tracks directory in the SD card. * * @param components the path components inside the mytracks directory * @return the full path to the destination */ - public String buildExternalDirectoryPath(String... components) { + public static String buildExternalDirectoryPath(String... components) { StringBuilder dirNameBuilder = new StringBuilder(); dirNameBuilder.append(Environment.getExternalStorageDirectory()); dirNameBuilder.append(File.separatorChar); @@ -54,33 +80,6 @@ public class FileUtils { return dirNameBuilder.toString(); } - /** - * Returns whether the SD card is available. - */ - public boolean isSdCardAvailable() { - return Environment.MEDIA_MOUNTED.equals( - Environment.getExternalStorageState()); - } - - /** - * Ensures the given directory exists by creating it and its parents if - * necessary. - * - * @return whether the directory exists (either already existed or was - * successfully created) - */ - public boolean ensureDirectoryExists(File dir) { - if (dir.exists() && dir.isDirectory()) { - return true; - } - - if (dir.mkdirs()) { - return true; - } - - return false; - } - /** * Builds a filename with the given base name (prefix) and the given * extension, possibly adding a suffix to ensure the file doesn't exist. @@ -90,8 +89,8 @@ public class FileUtils { * @param extension the file's extension * @return the complete file name, without the directory */ - public synchronized String buildUniqueFileName(File directory, - String fileBaseName, String extension) { + public static synchronized String buildUniqueFileName( + File directory, String fileBaseName, String extension) { return buildUniqueFileName(directory, fileBaseName, extension, 0); } @@ -105,7 +104,8 @@ public class FileUtils { * @param suffix the first numeric suffix to try to use, or 0 for none * @return the complete filename, without the directory */ - private String buildUniqueFileName(File directory, String base, String extension, int suffix) { + private static String buildUniqueFileName( + File directory, String base, String extension, int suffix) { String suffixName = ""; if (suffix > 0) { suffixName += "(" + Integer.toString(suffix) + ")"; @@ -115,8 +115,8 @@ public class FileUtils { String baseName = sanitizeFileName(base); baseName = truncateFileName(directory, baseName, suffixName); String fullName = baseName + suffixName; - - if (!fileExists(directory, fullName)) { + + if (!new File(directory, fullName).exists()) { return fullName; } return buildUniqueFileName(directory, base, extension, suffix + 1); @@ -131,7 +131,7 @@ public class FileUtils { * @param name name */ @VisibleForTesting - String sanitizeFileName(String name) { + static String sanitizeFileName(String name) { StringBuffer buffer = new StringBuffer(name.length()); for (int i = 0; i < name.length(); i++) { int codePoint = name.codePointAt(i); @@ -145,13 +145,13 @@ public class FileUtils { String result = buffer.toString(); return result.replaceAll("_+", "_"); } - + /** * Returns true if it is a special FAT32 character. - * + * * @param character the character */ - private boolean isSpecialFat32(char character) { + private static boolean isSpecialFat32(char character) { switch (character) { case '$': case '%': @@ -191,8 +191,8 @@ public class FileUtils { * @param suffix suffix */ @VisibleForTesting - String truncateFileName(File directory, String name, String suffix) { - // 1 at the end accounts for the FAT32 filename trailing NUL character + static String truncateFileName(File directory, String name, String suffix) { + // 1 at the end accounts for the FAT32 filename trailing NUL character int requiredLength = directory.getPath().length() + suffix.length() + 1; if (name.length() + requiredLength > MAX_FAT32_PATH_LENGTH) { int limit = MAX_FAT32_PATH_LENGTH - requiredLength; @@ -201,13 +201,4 @@ public class FileUtils { return name; } } - - /** - * Checks whether a file with the given name exists in the given directory. - * This is isolated so it can be overridden in tests. - */ - protected boolean fileExists(File directory, String fullName) { - File file = new File(directory, fullName); - return file.exists(); - } } diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java index 675bef4f5..2605904a5 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/PlayTrackUtils.java @@ -24,7 +24,6 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; @@ -96,7 +95,7 @@ public class PlayTrackUtils { .setCancelable(true) .setMessage(R.string.track_list_play_install_earth_message) .setNegativeButton(android.R.string.cancel, null) - .setPositiveButton(android.R.string.ok, new OnClickListener() { + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { Intent intent = new Intent(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java index c45c88308..b0dc284d6 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/SystemUtils.java @@ -1,12 +1,12 @@ /* * Copyright 2011 Google Inc. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -22,7 +22,6 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.pm.Signature; import android.os.PowerManager; import android.os.PowerManager.WakeLock; import android.util.Log; @@ -34,26 +33,6 @@ import android.util.Log; */ public class SystemUtils { - private static final int RELEASE_SIGNATURE_HASHCODE = -1855564782; - - /** - * Returns whether or not this is a release build. - */ - public static boolean isRelease(Context context) { - try { - Signature [] sigs = context.getPackageManager().getPackageInfo( - context.getPackageName(), PackageManager.GET_SIGNATURES).signatures; - for (Signature sig : sigs) { - if (sig.hashCode() == RELEASE_SIGNATURE_HASHCODE) { - return true; - } - } - } catch (NameNotFoundException e) { - Log.e(Constants.TAG, "Unable to get signatures", e); - } - return false; - } - /** * Get the My Tracks version from the manifest. * diff --git a/MyTracksLib/AndroidManifest.xml b/MyTracksLib/AndroidManifest.xml index 34a51462d..8545d5d4e 100644 --- a/MyTracksLib/AndroidManifest.xml +++ b/MyTracksLib/AndroidManifest.xml @@ -15,22 +15,22 @@ See the License for the specific language governing permissions and limitations under the License. --> + android:versionName="1.0" > + + - - \ No newline at end of file diff --git a/MyTracksLib/res/drawable/arrow_icon.png b/MyTracksLib/res/drawable-mdpi/arrow_icon.png similarity index 100% rename from MyTracksLib/res/drawable/arrow_icon.png rename to MyTracksLib/res/drawable-mdpi/arrow_icon.png diff --git a/MyTracksTest/.classpath b/MyTracksTest/.classpath index 6044ff11f..a59367532 100644 --- a/MyTracksTest/.classpath +++ b/MyTracksTest/.classpath @@ -11,5 +11,6 @@ + diff --git a/MyTracksTest/AndroidManifest.xml b/MyTracksTest/AndroidManifest.xml index e1479313f..13ba18d63 100644 --- a/MyTracksTest/AndroidManifest.xml +++ b/MyTracksTest/AndroidManifest.xml @@ -15,16 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - + android:versionName="1.0" > + + + + \ No newline at end of file diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java new file mode 100644 index 000000000..4025f5aa0 --- /dev/null +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java @@ -0,0 +1,169 @@ +/* + * Copyright 2012 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.android.apps.mytracks.io.sendtogoogle; + +import com.google.android.maps.mytracks.R; +import com.jayway.android.robotium.solo.Solo; + +import android.app.Instrumentation; +import android.content.Intent; +import android.test.ActivityInstrumentationTestCase2; +import android.view.View; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.HashSet; + +/** + * Tests the {@link UploadResultActivity}. + * + * @author Youtao Liu + */ +public class UploadResultActivityTest extends + ActivityInstrumentationTestCase2 { + + private Instrumentation instrumentation; + private UploadResultActivity uploadResultActivity; + private Solo solo; + + @Override + protected void setUp() throws Exception { + super.setUp(); + instrumentation = getInstrumentation(); + solo = new Solo(instrumentation); + } + + /** + * This method is necessary for ActivityInstrumentationTestCase2. + */ + public UploadResultActivityTest() { + super(UploadResultActivity.class); + } + + /** + * Checks the display of dialog when send to all and all sends are successful. + */ + public void testAllSuccess() { + initialActivity(true, true, true, true, true, true); + + HashSet stringHashSet = new HashSet(); + ArrayList view = solo.getViews(); + for (View oneView : view) { + if (oneView instanceof TextView && oneView.isShown()) { + stringHashSet.add((String) ((TextView) oneView).getText()); + } + } + + assertTrue(stringHashSet.contains(uploadResultActivity + .getString(R.string.generic_success_title))); + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_maps))); + assertTrue(stringHashSet.contains(uploadResultActivity + .getString(R.string.send_google_fusion_tables))); + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_docs))); + assertTrue(stringHashSet.contains(uploadResultActivity + .getString(R.string.send_google_success_footer))); + + assertFalse(stringHashSet + .contains(uploadResultActivity.getString(R.string.generic_error_title))); + assertFalse(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_error))); + } + + /** + * Checks the display of dialog when send to all and all sends are failed. + */ + public void testAllFailed() { + // Send all kinds but all failed. + initialActivity(true, true, true, false, false, false); + HashSet stringHashSet = new HashSet(); + ArrayList view = solo.getViews(); + for (View oneView : view) { + if (oneView instanceof TextView && oneView.isShown()) { + stringHashSet.add((String) ((TextView) oneView).getText()); + } + } + + assertTrue(stringHashSet.contains((Object) uploadResultActivity + .getString(R.string.generic_error_title))); + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_maps))); + assertTrue(stringHashSet.contains(uploadResultActivity + .getString(R.string.send_google_fusion_tables))); + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_docs))); + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_error))); + + assertFalse(stringHashSet.contains(uploadResultActivity + .getString(R.string.generic_success_title))); + assertFalse(stringHashSet.contains(uploadResultActivity + .getString(R.string.send_google_success_footer))); + } + + /** + * Checks the display of dialog when match following items: + *
    + *
  • Only send to Maps and Docs.
    • + *
  • Send to Maps successful.
    • + *
  • Send to Docs failed.
    • + *
+ */ + public void testPartialSuccess() { + initialActivity(true, false, true, true, false, false); + + HashSet stringHashSet = new HashSet(); + ArrayList view = solo.getViews(); + for (View oneView : view) { + if (oneView instanceof TextView && oneView.isShown()) { + stringHashSet.add((String) ((TextView) oneView).getText()); + } + } + + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.generic_error_title))); + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_maps))); + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_docs))); + assertTrue(stringHashSet.contains(uploadResultActivity.getString(R.string.send_google_error))); + + assertFalse(stringHashSet.contains(uploadResultActivity + .getString(R.string.send_google_fusion_tables))); + assertFalse(stringHashSet.contains(uploadResultActivity + .getString(R.string.generic_success_title))); + assertFalse(stringHashSet.contains(uploadResultActivity + .getString(R.string.send_google_success_footer))); + } + + /** + * Initial a {@link SendRequest} and then initials a activity to be tested. + * + * @param isSendMaps + * @param isSendFusionTables + * @param isSendDocs + * @param isMapsSuccess + * @param isFusionTablesSuccess + * @param isDocsSuccess + */ + private void initialActivity(boolean isSendMaps, boolean isSendFusionTables, boolean isSendDocs, + boolean isMapsSuccess, boolean isFusionTablesSuccess, boolean isDocsSuccess) { + Intent intent = new Intent(); + SendRequest sendRequest = new SendRequest(1L, true, true, true); + sendRequest.setSendMaps(isSendMaps); + sendRequest.setSendFusionTables(isSendFusionTables); + sendRequest.setSendDocs(isSendDocs); + sendRequest.setMapsSuccess(isMapsSuccess); + sendRequest.setFusionTablesSuccess(isFusionTablesSuccess); + sendRequest.setDocsSuccess(isDocsSuccess); + intent.putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest); + setActivityIntent(intent); + uploadResultActivity = this.getActivity(); + } + +} diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java index 8adda2946..12152c3c7 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/util/FileUtilsTest.java @@ -20,8 +20,6 @@ import com.google.android.apps.mytracks.Constants; import android.os.Environment; import java.io.File; -import java.util.HashSet; -import java.util.Set; import junit.framework.TestCase; @@ -31,76 +29,81 @@ import junit.framework.TestCase; * @author Rodrigo Damazio */ public class FileUtilsTest extends TestCase { - private FileUtils fileUtils; - private Set existingFiles; - - @Override - protected void setUp() throws Exception { - super.setUp(); - - existingFiles = new HashSet(); - fileUtils = new FileUtils() { - @Override - protected boolean fileExists(File directory, String fullName) { - return existingFiles.contains(fullName); - } - }; - } + /** + * Tests {@link FileUtils#buildExternalDirectoryPath(String...)}. + */ public void testBuildExternalDirectoryPath() { - String expectedName = Environment.getExternalStorageDirectory() - + File.separator - + Constants.SDCARD_TOP_DIR - + File.separator - + "a" - + File.separator - + "b" - + File.separator + String expectedName = Environment.getExternalStorageDirectory() + File.separator + + Constants.SDCARD_TOP_DIR + File.separator + "a" + File.separator + "b" + File.separator + "c"; - - String dirName = fileUtils.buildExternalDirectoryPath("a", "b", "c"); + String dirName = FileUtils.buildExternalDirectoryPath("a", "b", "c"); assertEquals(expectedName, dirName); } /** - * Tests sanitize filename. + * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the + * file is new. + */ + public void testBuildUniqueFileName_new() { + String filename = FileUtils.buildUniqueFileName(new File("/dir"), "Filename", "ext"); + assertEquals("Filename.ext", filename); + } + + /** + * Tests {@link FileUtils#buildUniqueFileName(File, String, String)} when the + * file exists already. + */ + public void testBuildUniqueFileName_exist() { + // Expect "/default.prop" to exist on the phone/emulator + String filename = FileUtils.buildUniqueFileName(new File("/"), "default", "prop"); + assertEquals("default(1).prop", filename); + } + + /** + * Tests {@link FileUtils#sanitizeFileName(String)} with special characters. + * Verifies that they are sanitized. */ public void testSanitizeFileName() { String name = "Swim\10ming-^across:/the/ pacific (ocean)."; String expected = "Swim_ming-^across_the_ pacific (ocean)_"; - assertEquals(expected, fileUtils.sanitizeFileName(name)); + assertEquals(expected, FileUtils.sanitizeFileName(name)); } /** - * Tests characters in other languages, like Chinese and Russian, are allowed. + * Tests {@link FileUtils#sanitizeFileName(String)} with i18n characters (in + * Chinese and Russian). Verifies that they are allowed. */ public void testSanitizeFileName_i18n() { String name = "您好-привет"; String expected = "您好-привет"; - - assertEquals(expected, fileUtils.sanitizeFileName(name)); + assertEquals(expected, FileUtils.sanitizeFileName(name)); } - + /** - * Tests special FAT32 characters are allowed. + * Tests {@link FileUtils#sanitizeFileName(String)} with special FAT32 + * characters. Verifies that they are allowed. */ public void testSanitizeFileName_special_characters() { String name = "$%'-_@~`!(){}^#&+,;=[] "; String expected = "$%'-_@~`!(){}^#&+,;=[] "; - - assertEquals(expected, fileUtils.sanitizeFileName(name)); + assertEquals(expected, FileUtils.sanitizeFileName(name)); } /** - * Testing collapsing multiple underscores characters. + * Tests {@link FileUtils#sanitizeFileName(String)} with multiple escaped + * characters in a row. Verifies that they are collapsed into one underscore. */ public void testSanitizeFileName_collapse() { String name = "hello//there"; String expected = "hello_there"; - - assertEquals(expected, fileUtils.sanitizeFileName(name)); + assertEquals(expected, FileUtils.sanitizeFileName(name)); } - + + /** + * Tests {@link FileUtils#truncateFileName(File, String, String)}. Verifies + * the a long file name is truncated. + */ public void testTruncateFileName() { File directory = new File("/dir1/dir2/"); String suffix = ".gpx"; @@ -109,36 +112,12 @@ public class FileUtilsTest extends TestCase { name[i] = 'a'; } String nameString = new String(name); - - String truncated = fileUtils.truncateFileName(directory, nameString, suffix); + String truncated = FileUtils.truncateFileName(directory, nameString, suffix); + for (int i = 0; i < truncated.length(); i++) { assertEquals('a', truncated.charAt(i)); } assertEquals(FileUtils.MAX_FAT32_PATH_LENGTH, new File(directory, truncated + suffix).getPath().length()); } - - public void testBuildUniqueFileName_someExist() { - existingFiles = new HashSet(); - existingFiles.add("Filename.ext"); - existingFiles.add("Filename(1).ext"); - existingFiles.add("Filename(2).ext"); - existingFiles.add("Filename(3).ext"); - existingFiles.add("Filename(4).ext"); - - String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext"); - assertEquals("Filename(5).ext", filename); - } - - public void testBuildUniqueFileName_oneExists() { - existingFiles.add("Filename.ext"); - - String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext"); - assertEquals("Filename(1).ext", filename); - } - - public void testBuildUniqueFileName_noneExists() { - String filename = fileUtils.buildUniqueFileName(new File("/dir/"), "Filename", "ext"); - assertEquals("Filename.ext", filename); - } }