From 8a56c262cbb6071cd578a8dcd1eb51853069fcb8 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 4 Sep 2019 22:09:22 +0200 Subject: [PATCH] Cleanup. --- .../opentracks/TrackEditActivity.java | 3 +- .../io/file/exporter/KmzTrackExporter.java | 5 +-- .../importer/AbstractFileTrackImporter.java | 42 +++++++----------- .../widgets/TrackWidgetProvider.java | 6 +-- src/main/res/drawable-hdpi/ic_menu_export.png | Bin 1318 -> 0 bytes src/main/res/drawable-hdpi/ic_menu_import.png | Bin 1331 -> 0 bytes src/main/res/drawable-mdpi/ic_menu_export.png | Bin 1221 -> 0 bytes src/main/res/drawable-mdpi/ic_menu_import.png | Bin 1238 -> 0 bytes .../res/drawable-xhdpi/ic_menu_export.png | Bin 1467 -> 0 bytes .../res/drawable-xhdpi/ic_menu_import.png | Bin 1482 -> 0 bytes src/main/res/values-pt-rPT/strings.xml | 6 +-- src/main/res/values/preference_keys.xml | 3 -- 12 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 src/main/res/drawable-hdpi/ic_menu_export.png delete mode 100644 src/main/res/drawable-hdpi/ic_menu_import.png delete mode 100644 src/main/res/drawable-mdpi/ic_menu_export.png delete mode 100644 src/main/res/drawable-mdpi/ic_menu_import.png delete mode 100644 src/main/res/drawable-xhdpi/ic_menu_export.png delete mode 100644 src/main/res/drawable-xhdpi/ic_menu_import.png diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java index 9312aa2d8..b27c1441e 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java @@ -36,7 +36,6 @@ import de.dennisguse.opentracks.services.TrackRecordingServiceConnection; import de.dennisguse.opentracks.util.TrackIconUtils; import de.dennisguse.opentracks.util.TrackRecordingServiceConnectionUtils; import de.dennisguse.opentracks.util.TrackUtils; -import de.dennisguse.opentracks.R; /** * An activity that let's the user see and edit the user editable track meta @@ -67,7 +66,7 @@ public class TrackEditActivity extends AbstractActivity implements ChooseActivit super.onCreate(bundle); trackRecordingServiceConnection = new TrackRecordingServiceConnection(this, null); - Long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L); + long trackId = getIntent().getLongExtra(EXTRA_TRACK_ID, -1L); if (trackId == -1L) { Log.e(TAG, "invalid trackId"); finish(); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java index e395dba15..513adb849 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/KmzTrackExporter.java @@ -80,10 +80,7 @@ public class KmzTrackExporter implements TrackExporter { // Add photos addImages(zipOutputStream); return true; - } catch (InterruptedException e) { - Log.e(TAG, "Unable to write track", e); - return false; - } catch (IOException e) { + } catch (InterruptedException | IOException e) { Log.e(TAG, "Unable to write track", e); return false; } finally { diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java index f223ccb47..690ffcad9 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java @@ -22,6 +22,22 @@ import android.location.LocationManager; import android.net.Uri; import android.util.Log; +import org.xml.sax.Locator; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.content.ContentProviderUtils; import de.dennisguse.opentracks.content.ContentProviderUtils.LocationIterator; import de.dennisguse.opentracks.content.DescriptionGeneratorImpl; @@ -37,22 +53,6 @@ import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.StringUtils; import de.dennisguse.opentracks.util.TrackIconUtils; import de.dennisguse.opentracks.util.UnitConversions; -import de.dennisguse.opentracks.R; - -import org.xml.sax.Locator; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; /** * Abstract class for various file track importers like {@link GpxFileTrackImporter} and @@ -139,15 +139,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track return -1L; } return trackIds.get(0); - } catch (IOException e) { - Log.e(TAG, "Unable to import file", e); - cleanImport(); - return -1L; - } catch (ParserConfigurationException e) { - Log.e(TAG, "Unable to import file", e); - cleanImport(); - return -1L; - } catch (SAXException e) { + } catch (IOException | SAXException | ParserConfigurationException e) { Log.e(TAG, "Unable to import file", e); cleanImport(); return -1L; diff --git a/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java b/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java index 720554b0f..a6d079ed2 100644 --- a/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java +++ b/src/main/java/de/dennisguse/opentracks/widgets/TrackWidgetProvider.java @@ -31,6 +31,7 @@ import android.widget.RemoteViews; import androidx.core.app.TaskStackBuilder; +import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackDetailActivity; import de.dennisguse.opentracks.TrackListActivity; import de.dennisguse.opentracks.content.ContentProviderUtils; @@ -40,7 +41,6 @@ import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.IntentUtils; import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.StringUtils; -import de.dennisguse.opentracks.R; /** * A track widget to start/stop/pause/resume recording, launch the main activity, and @@ -318,7 +318,7 @@ public class TrackWidgetProvider extends AppWidgetProvider { reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace); remoteViews.setTextViewText(ids[0], averageSpeedLabel); - Double speed = tripStatistics == null ? Double.NaN : tripStatistics.getAverageSpeed(); + double speed = tripStatistics == null ? Double.NaN : tripStatistics.getAverageSpeed(); String[] speedParts = StringUtils.getSpeedParts(context, speed, metricUnits, reportSpeed); if (speedParts[0] == null) { @@ -362,7 +362,7 @@ public class TrackWidgetProvider extends AppWidgetProvider { reportSpeed ? R.string.stats_average_moving_speed : R.string.stats_average_moving_pace); remoteViews.setTextViewText(ids[0], averageMovingSpeedLabel); - Double speed = tripStatistics == null ? Double.NaN : tripStatistics.getAverageMovingSpeed(); + double speed = tripStatistics == null ? Double.NaN : tripStatistics.getAverageMovingSpeed(); String[] speedParts = StringUtils.getSpeedParts(context, speed, metricUnits, reportSpeed); if (speedParts[0] == null) { diff --git a/src/main/res/drawable-hdpi/ic_menu_export.png b/src/main/res/drawable-hdpi/ic_menu_export.png deleted file mode 100644 index 0faf43b06b308a428b21e5f18f89bad68ad2e16f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1318 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(#^lGsVil(agZy(Amt?$G&eP`1g19yq1POzUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dHn&*1 znp&8c;5HAcHwBwpAbKruxPZ!6Kid%1HZ1iGw6ll{wS?M@2BT?$8Q?%u0N@40gGP)|FHvoTSRWL3P0$LWERzA@}Bd1ea&5l zDa+dvj+8bAZa6NS*RpSYvylZ`<7%e6bG|d%Jj}Szccwu%oYm~0$%?H%{CnSfY+lEy z)6grg_CJ>2?vrR;h?w|dwrGiv>b-Y{obhwqDsJMRoKgJ0YW`>4uOl~n!Wh0?XfEnF)a fK&YcnpOKAWVpoXt!io=(ppwhe)z4*}Q$iB}c+u32 diff --git a/src/main/res/drawable-hdpi/ic_menu_import.png b/src/main/res/drawable-hdpi/ic_menu_import.png deleted file mode 100644 index d5bfa457ce5bf3d9566ebc45ffcfc646a38d28fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1331 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(#^lGX)r!E=H#2u4blAh6aX)u7;K-hL)}-PR@>Q zriSJwPKGeOF8Rr&xv6<2Fuf@Vz2-Ref)Yb+0nlcb)S}F?)D*X({9FaFr>!z^yTt^j zc~HG6xZPrkQ?EYIG5VmWMT%;e5HS6KnDB%P;W3D!SY)E}(9%BXRA`Y*c;tjBt9UghlyYvhiJ*=T-n zR^W%a*oGvIoaV+|))Omi|Gi~QPq>!$ZF3Yef5J_PgvF8zlLaf7xVJT*FA|h*j=gaA z$=9$0i}NEhWMh_jT-Ycp_D!!h?10ervw?>`>J=R1zJA-PfYmI*LGt&@`cBr>cH9AP z8kNtPd^~inc-J1zg+js0G@Gn1oc#Gu;7$7#Zrf(pX**e0ud7mg`s4F2p8K7j16Y^L z-S*Z^-EqI~=BWo+f@3XnzY1D0EM8~VX(D)~DZW{A_IJj)mlo{g$^Ff7_p_(nKM#dR ldEuKTfPw*xrhn8uz~HQrEZ=c=dmyM7^K|udS?83{1OSYc-sJ!Q diff --git a/src/main/res/drawable-mdpi/ic_menu_export.png b/src/main/res/drawable-mdpi/ic_menu_export.png deleted file mode 100644 index 2d4ba56fa2fd337c5b071cd1a8f4bf0a13183269..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1221 zcmaJ>Z)h837=P0=t!5;q4z@ZRyt~%zi@85p(&Wx&ZIWx3fLF3KxKM`l?(()dy8F|+ zw$eRD-b%D^dQQk<-a81K5K^Mmo=?tR~f z=l6Sl&-?tiMt0()&wI!V0Ptnfe9m5>^FGvLf30fuuDv{l#|n5-pTT9(L?BVrB?L37 zIE!*fEH2J}jfMem4=VWrE(lL^vaXV%lS5Wi!$t!zJW?@4c@AMHp;<+X6Tf}FMnI() zCr(EMS};t(m9bV4fJ7J1|J1KZB zPTUt&5VA0(n+QfoIw;da3>*rROqgcF?2|A=Gc?77C^{NsXf6`vXa?>+gk8-n&Tu(? ze7BZ;iW4P_4UVG9zF|` z?8-bcmFG}#+|*UL(=?}a))MQ;w~H-y*1~qgQnnb%8STGD-45CQakhKLwGVsNN1E+- z(>6A>;`tB&S2V*X@|AVzuU2d1+Gy9&ms~xU{QV2yeSg*?Z7tzZZ=g3PfqkB;dwKhK z;N9+x-*5F_P0u8{y?>q`z3%y=c^F>k-FWqGy=ww$Kytyq-OZ6&VSoMG+pqVSOW$|b z*N!w^aBV>7|KJn%nWdP&zV=?@+{V_iz?c?bOGCoxaDn{4(GI&ldM-aGtj?7-B|T^{(XuX#P&`-Mk}t_=K=3(QN6t~)orssHGo z=C9$^ef`T-vGLj_cm9VnS6t2Y^p`DP^Wd`Q(Xaf|N3Nc1)wT~_?0>57)K>4yTjQ>k z3-?l|(;o2g-2T9K@D?})pE<|Xrrz!;Tl3^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(#^lGX)r!E=H#2u8yWoh6aX)u7;K-hL)}-PR@>Q zriSJwPKGeOF8Rr&xv6<2Fuf@ty+(!xrcO@IIQ4=OLv8`kW|!2W%(B!Jx1#)91+b^B zGI6`b0;hRUy(!q-0`Z3>PQCg-$LNEi7AdM>LcsI`V!{(HkONQpsd>QkUIa|owI#w= z85kHnJY5_^DsCnH`TyVkumh7?8zb9dK8aEW?wP+-8Z7u;F}f-IV>@Ep_=A0~i~`G% zK!-CtrAMq4=K1@xH*oda2h8F;wX9m|M}M1pF=MRk2WIb*n&qWtQ`nO%S3Lcc@v=d* zBe&s)w!miQkERNB-aQL@RIaqWa@Zr#@w4HF__QhfpLoOt;@KamB*{8>iQHj%l&0}p z-t0WXM|XvFir0#YE*%I{h~qnQCqgHk`H`K%KA+bv9Gjjf2^1@JHp*;aePuC;L3yUG zlCDA=!&lQ47Ii#FHZEbYU3ybs%Bkvwo$vGo%qJvUs+KZxtYJywR@ldXWcdlxmWhYl zG&RouKQ>YO1RtZAkkd2$5Z#S|KiT*GIgl2}CGa~i=;))5Z`2g#Ii6r#c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=8rK_ohiHWJHlc9m3p{t>#iJ_&diIcOV zo2j9>iIX8ruSMv>2~2MaLa!N4y`aR9TL84#CABECEH%ZgC_h&L>}jh^+-@<( zX&zK>3U0TU;MA)Rbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3b{YX*OjDdkk*VDx@ zq~g|_ndiMl5+#n8hh2|ywaE}*X%+W(st9r9vH8h76{A}`5M;3;pN!m zv_0?cD-l7KQjHfPR}>F52XuAqTK)KW>vM%oix=x`-fMiH-ER8K*k`r&pZC1~yzf0r zqQtXJGL0-A4XDV0cae16p)4`hn5O9;1k)7G%xcKo!TH*N@BJo~2Vy=4^h^%OS1|0~ zq_99(Y@y`0H&McSS_L(hMmD_u!W7d!ck$Z>B^zVQm7*Uc@(!1^R+k2}CC-)zR!PF^umr zc5fG(e8uvx?Bd#nomruc*%zi--@aLQc9WFef%jR{4sP1}cau8Pr)$?%aca!CI>%iy zV8ybA^VdFZQZH_JeO-L2Bj*GLRMgO6A(FuG;N+Wq<_G2qgNjp6S3j3^P6c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W(qJcU5rf4U5!kg3=IqoT@5Ww3@u$voSYrq zObyLVoD5-lUGkGlb5rw5V0u#!dW~`F1to^u0-((!1>a$s9yC-ew!)FRL_2YGUt8Ga}&oy+{ia1^8b&kxP7k0eo z8f-GSe$<*iyPUxI#(g1Q#T4sGb;-R!*%MfHNi21G!Ewg(x?h;Y_v!m>-yL4X5`J)3 zO4LK^;swGo9z{G$Rh{aBwn)!uzP*EsWADeG z4O%WQ)mBR^nZ=`(An=9d&V?WRzP@X#-7=GxsWIK^y>wZ2nc$)L8&{v1t~6PnWyzwm z^Y=70rb)-H^WK!__OLcHEqTfKGK%Yj=Ywf#mJUa!rpq3%YGBepMK!mUGcYr_g*5ex Sweo^WZ3a(QKbLh*2~7b0eH0o1 diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index f89d5e63e..b8a8839f4 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -362,7 +362,7 @@ %1$d minutos 2 minutos 0 minutos - %1$s por quilómetro + %1$s por quilômetro %1$s por milha %1$d segundos %1$d segundos @@ -372,7 +372,7 @@ 0 segundos %1$.1f quilómetros por hora %1$.1f quilómetros por hora - 1 quilómetro por hora + 1 quilômetro por hora %1$.1f quilómetros por hora 2 quilómetros por hora 0 quilómetros por hora @@ -385,7 +385,7 @@ Os Meus Percursos %1$s em %2$s a %3$s distância total de %1$.2f quilómetros distância total de %1$.2f quilómetros - distância total 1 quilómetro + distância total 1 quilômetro distância total de %1$.2f quilómetros distância total de 2 quilómetros distância total de 0 quilómetros diff --git a/src/main/res/values/preference_keys.xml b/src/main/res/values/preference_keys.xml index 691ca81a8..4ae486dd7 100644 --- a/src/main/res/values/preference_keys.xml +++ b/src/main/res/values/preference_keys.xml @@ -46,11 +46,8 @@ limitations under the License. recordingTrackId recordingTrackPaused - settingsAdvanced - settingsChart settingsRecording settingsReset - settingsSensor settingsSensorBluetooth settingsSensorBluetoothPairing settingsSensorRoot