Merge branch 'issue-64' into share_zip

Author: Andyporras

app/src/main/java/net/osmtracker/activity/OpenStreetMapUpload.java

@@ -26,9 +26,12 @@
 import net.osmtracker.db.TrackContentProvider;
 import net.osmtracker.db.model.Track;
 import net.osmtracker.gpx.ExportToTempFileTask;
+import net.osmtracker.gpx.ZipHelper;
 import net.osmtracker.osm.OpenStreetMapConstants;
 import net.osmtracker.osm.UploadToOpenStreetMapTask;
 
+import java.io.File;
+
 /**
  * <p>Uploads a track on OSM using the API and
  * OAuth authentication.</p>
@@ -205,8 +208,10 @@ public void uploadToOsm(String accessToken) {
 		new ExportToTempFileTask(this, trackId) {
 			@Override
 			protected void executionCompleted() {
+				File filezip = ZipHelper.zipFile(context,trackId,getTmpFile());
+				String nameFile = this.getFilename().substring(0, this.getFilename().length() - 3)+"zip";
 				new UploadToOpenStreetMapTask(OpenStreetMapUpload.this, accessToken,
-						trackId, this.getTmpFile(),	this.getFilename(),
+						trackId, filezip,	nameFile,
 						etDescription.getText().toString(), etTags.getText().toString(),
 						Track.OSMVisibility.fromPosition(
 								OpenStreetMapUpload.this.spVisibility.getSelectedItemPosition())

app/src/main/java/net/osmtracker/gpx/ZipHelper.java

@@ -63,7 +63,27 @@ public static File zipCacheFiles(Context context, long trackId, File fileGPX) {
             return null;
         }
     }
-
+    /***
+     * Compresses file gpx into a zip file.
+     * @param context   Application context.
+     * @param trackId   Track ID.
+     * @param fileGPX   GPX file.
+     * @return The created ZIP file or null if an error occurred.
+     */
+    public static File zipFile(Context context, long trackId, File fileGPX) {
+        String name = fileGPX.getName();
+        File zipFile = new File(context.getCacheDir(), name.substring(0, name.length() - 3)+"zip");
+        try (FileOutputStream fos = new FileOutputStream(zipFile);
+             ZipOutputStream zos = new ZipOutputStream(fos)) {
+            // Add the gpx file
+            addFileToZip(fileGPX, zos);
+            return zipFile;
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     /**
      * Adds a file to the ZIP archive.