mytourbook · wolfgang-ch · Jan 20, 2021 · Dec 27, 2020 · Dec 27, 2020 · Dec 27, 2020
diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/DialogDropboxFolderBrowser.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/DialogDropboxFolderBrowser.java
@@ -230,22 +230,19 @@ public void update(final ViewerCell cell) {
 
             final Metadata entry = ((Metadata) cell.getElement());
 
-            String entryName = null;
-            Image entryImage = null;
-
-            entryName = entry.getName();
+            String imageName = UI.EMPTY_STRING;
 
             if (entry instanceof FolderMetadata) {
 
-               entryImage =
-                     Activator.getImageDescriptor(Messages.Image__Dropbox_Folder).createImage();
+               imageName = Messages.Image__Dropbox_Folder;
             } else if (entry instanceof FileMetadata) {
 
-               entryImage =
-                     Activator.getImageDescriptor(Messages.Image__Dropbox_File).createImage();
+               imageName = Messages.Image__Dropbox_File;
             }
 
-            cell.setText(entryName);
+            final Image entryImage = StringUtils.hasContent(imageName) ? Activator.getImageDescriptor(imageName).createImage() : null;
+
+            cell.setText(entry.getName());
             cell.setImage(entryImage);
          }
       });

diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/PrefPageDropbox.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/dropbox/PrefPageDropbox.java
@@ -226,6 +226,16 @@ public void init(final IWorkbench workbench) {
       //Not needed
    }
 
+   @Override
+   public boolean okToLeave() {
+
+      if (_server != null) {
+         _server.stopCallBackServer();
+      }
+
+      return super.okToLeave();
+   }
+
    /**
     * When the user clicks on the "Authorize" button, a browser is opened
     * so that the user can allow the MyTourbook Dropbox app to have access

diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/oauth2/TokensRetrievalHandler.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/oauth2/TokensRetrievalHandler.java
@@ -20,14 +20,14 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.net.HttpURLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Optional;
 
 import net.tourbook.cloud.Messages;
 import net.tourbook.common.UI;
+import net.tourbook.common.util.StatusUtil;
 
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
@@ -71,17 +71,20 @@ private Tokens handleGetRequest(final HttpExchange httpExchange) {
 
    private void handleResponse(final HttpExchange httpExchange) throws IOException {
 
-      final OutputStream outputStream = httpExchange.getResponseBody();
-
       final StringBuilder htmlBuilder = new StringBuilder();
-      htmlBuilder.append("<html><body><h1>" + Messages.Html_CloseBrowser_Text + "</h1></body></html>"); //$NON-NLS-1$ //$NON-NLS-2$
+      htmlBuilder.append("<html><head><meta charset=\"UTF-8\"></head><body><h1>" + Messages.Html_CloseBrowser_Text + "</h1></body></html>"); //$NON-NLS-1$ //$NON-NLS-2$
+
+      final byte[] response = htmlBuilder.toString().getBytes(StandardCharsets.UTF_8);
 
       // this line is a must
-      httpExchange.sendResponseHeaders(200, htmlBuilder.length());
+      httpExchange.sendResponseHeaders(HttpURLConnection.HTTP_OK, response.length);
+
+      try (OutputStream outputStream = httpExchange.getResponseBody()) {
 
-      try (Writer writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)) {
-         writer.write(htmlBuilder.toString());
+         outputStream.write(response);
          outputStream.flush();
+      } catch (final Exception e) {
+         StatusUtil.log(e);
       }
    }
 

diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/strava/PrefPageStrava.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/strava/PrefPageStrava.java
@@ -217,6 +217,16 @@ public void init(final IWorkbench workbench) {
       //Not needed
    }
 
+   @Override
+   public boolean okToLeave() {
+
+      if (_server != null) {
+         _server.stopCallBackServer();
+      }
+
+      return super.okToLeave();
+   }
+
    /**
     * When the user clicks on the "Authorize" button, a browser is opened
     * so that the user can allow the MyTourbook Strava app to have access

diff --git a/bundles/net.tourbook.cloud/src/net/tourbook/cloud/strava/StravaUploader.java b/bundles/net.tourbook.cloud/src/net/tourbook/cloud/strava/StravaUploader.java
@@ -146,9 +146,7 @@ public static StravaTokens getTokens(final String authorizationCode, final boole
       if (isRefreshToken) {
          body.append("{\"" + OAuth2Constants.PARAM_REFRESH_TOKEN + "\" : \"" + refreshToken); //$NON-NLS-1$ //$NON-NLS-2$
          grantType = OAuth2Constants.PARAM_REFRESH_TOKEN;
-      } else
-
-      {
+      } else {
          body.append("{\"" + OAuth2Constants.PARAM_CODE + "\" : \"" + authorizationCode);//$NON-NLS-1$ //$NON-NLS-2$
          grantType = OAuth2Constants.PARAM_AUTHORIZATION_CODE;
       }

diff --git a/bundles/net.tourbook.common/src/net/tourbook/common/util/FilesUtils.java b/bundles/net.tourbook.common/src/net/tourbook/common/util/FilesUtils.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (C) 2021 Frédéric Bard
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+ *******************************************************************************/
+
+package net.tourbook.common.util;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import net.tourbook.common.UI;
+
+public final class FilesUtils {
+
+   public static String readFileContentString(final String filePath) {
+
+      String fileContent = UI.EMPTY_STRING;
+      try {
+         fileContent = Files.readString(Paths.get(filePath), StandardCharsets.US_ASCII);
+      } catch (final IOException e) {
+         StatusUtil.log(e);
+      }
+      return fileContent;
+   }
+}
diff --git a/bundles/net.tourbook.export/format-templates/gpx-1.0.vm b/bundles/net.tourbook.export/format-templates/gpx-1.0.vm
@@ -210,7 +210,7 @@
             <time>$dateformat.format($point.Date)</time>
 #end
 ##
-#if($point.hasValidExtention())
+#if($point.hasValidExtension())
             <extensions>
                <gpxtpx:TrackPointExtension>
 #if($point.hasValidTemperature())

diff --git a/bundles/net.tourbook.export/format-templates/tcx-2.0.vm b/bundles/net.tourbook.export/format-templates/tcx-2.0.vm
@@ -2,42 +2,48 @@
 <TrainingCenterDatabase 
 	xmlns="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-	xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 https://www8.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd">
+	xsi:schemaLocation="http://www.garmin.com/xmlschemas/TrainingCenterDatabase/v2 https://www8.garmin.com/xmlschemas/TrainingCenterDatabasev2.xsd http://www.garmin.com/xmlschemas/ActivityExtension/v2 https://www8.garmin.com/xmlschemas/ActivityExtensionv2.xsd">
 #if($iscourses)
 	<Courses>
 		<Course>
 			<Name>$coursename</Name>
+			<Lap>
 #else
 	<Activities>
 		<Activity Sport="$activityType">
-#end
 			<Id>$dateformat.format($starttime)</Id>
 			<Lap StartTime="$dateformat.format($starttime)">
+#end
 				<TotalTimeSeconds>$totaltime</TotalTimeSeconds>
 				<DistanceMeters>$nf3.format($totaldistance)</DistanceMeters>
+#if(!$iscourses)
 				<Calories>$lap.getCalories()</Calories>
+#end
 #if($averageheartrate)
-				<AverageHeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t">
+				<AverageHeartRateBpm>
 					<Value>$averageheartrate</Value>
 				</AverageHeartRateBpm>
 #end
 #if($maximumheartrate)
-				<MaximumHeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t">
+				<MaximumHeartRateBpm>
 					<Value>$maximumheartrate</Value>
 				</MaximumHeartRateBpm>
 #end
 				<Intensity>Active</Intensity>
 #if($averagecadence)		
 				<Cadence>$averagecadence</Cadence>
 #end
+#if(!$iscourses)
 				<TriggerMethod>Manual</TriggerMethod>
+#end
+#if(!$iscourses)
 #foreach( $track in $tracks )				
 				<Track>
 #set ($points = $track.getWaypoints())
 #foreach ($point in $points)
 					<Trackpoint>
 #if($point.getDate())
-                        <Time>$dateformat.format($point.getDate())</Time>
+						<Time>$dateformat.format($point.getDate())</Time>
 #end
 						<Position>
 							<LatitudeDegrees>$nf8.format($point.Latitude)</LatitudeDegrees>
@@ -50,32 +56,69 @@
 						<DistanceMeters>$nf3.format($point.Distance)</DistanceMeters>
 #end
 #if($point.hasValidHeartrate())
-						<HeartRateBpm xsi:type="HeartRateInBeatsPerMinute_t">
+						<HeartRateBpm>
 							<Value>$point.Heartrate</Value>
 						</HeartRateBpm>
+#end
 #if($point.hasValidCadence())
-						<Cadence type="CadenceValue_t">$point.Cadence</Cadence>
+						<Cadence>$point.Cadence</Cadence>
+#end
+#if($point.hasValidPower() || $point.hasValidSpeed())
+						<Extensions>
+           						<TPX xmlns="http://www.garmin.com/xmlschemas/ActivityExtension/v2">
+#if($point.hasValidSpeed())
+              							<Speed>$point.getSpeed()</Speed>
 #end
+#if($point.hasValidPower())
+		              					<Watts>$point.getPower()</Watts>
+#end
+            						</TPX>
+          					</Extensions>
 #end
 					</Trackpoint>
 #end
 				</Track>
 #end
 			</Lap>
+#else
+			</Lap>
+#foreach( $track in $tracks )				
+			<Track>
+#set ($points = $track.getWaypoints())
+#foreach ($point in $points)
+				<Trackpoint>
+#if($point.getDate())
+					<Time>$dateformat.format($point.getDate())</Time>
+#end
+					<Position>
+						<LatitudeDegrees>$nf8.format($point.Latitude)</LatitudeDegrees>
+						<LongitudeDegrees>$nf8.format($point.Longitude)</LongitudeDegrees>
+					</Position>
+#if($point.hasValidAltitude())
+					<AltitudeMeters>$nf3.format($point.Altitude)</AltitudeMeters>
+#end
+#if($point.hasValidDistance())
+					<DistanceMeters>$nf3.format($point.Distance)</DistanceMeters>
+#end
+				</Trackpoint>
+#end
+			</Track>
+#end
+#end
 #if ($lap.hasNotes())
 			<Notes><![CDATA[$!lap.Notes]]></Notes>
 #end
-            <Creator xsi:type="Device_t">
-              <Name>$creator</Name>
-              <UnitId>0</UnitId>
-              <ProductID>0</ProductID>
-              <Version>
-                <VersionMajor>$pluginMajorVersion</VersionMajor>
-                <VersionMinor>$pluginMinorVersion</VersionMinor>
-                <BuildMajor>$pluginMicroVersion</BuildMajor>
-                <BuildMinor>$pluginQualifierVersion</BuildMinor>
-              </Version>
-            </Creator>
+            		<Creator xsi:type="Device_t">
+            			<Name>$creator</Name>
+            			<UnitId>0</UnitId>
+       		       		<ProductID>0</ProductID>
+	              		<Version>
+	                		<VersionMajor>$pluginMajorVersion</VersionMajor>
+        	       		 	<VersionMinor>$pluginMinorVersion</VersionMinor>
+               				<BuildMajor>$pluginMicroVersion</BuildMajor>
+              				<BuildMinor>$pluginQualifierVersion</BuildMinor>
+              			</Version>
+		        </Creator>
 #if($iscourses)
 		</Course>
 	</Courses>