Code cleanup.

myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java

@@ -27,6 +27,7 @@ import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragme
 import com.google.android.apps.mytracks.fragments.ChooseActivityTypeDialogFragment.ChooseActivityTypeCaller;
 import com.google.android.apps.mytracks.fragments.ConfirmDeleteDialogFragment;
 import com.google.android.apps.mytracks.fragments.FrequencyDialogFragment;
+import com.google.android.apps.mytracks.fragments.MarkerDetailFragment;
 import com.google.android.apps.mytracks.fragments.StatsFragment;
 import com.google.android.apps.mytracks.io.file.TrackFileFormat;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceConnection;

myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java

@@ -477,23 +477,19 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
         }
       }
     }
-    if (waypoint != null) {
+    if (waypoint != null && waypoint.hasPhoto()) {
-      String photoUrl = waypoint.getPhotoUrl();
+      Uri uri = waypoint.getPhotoURI();
-      if (photoUrl != null && !photoUrl.equals("")) {
+      File file = new File(uri.getPath());
-        Uri uri = Uri.parse(photoUrl);
+      if (file.exists()) {
-        File file = new File(uri.getPath());
+        File parent = file.getParentFile();
-        if (file.exists()) {
+        file.delete();
-          File parent = file.getParentFile();
+        FileUtils.updateMediaScanner(context, uri);
-          file.delete();
+        if (parent.listFiles().length == 0) {
-          FileUtils.updateMediaScanner(context, uri);
+          parent.delete();
-          if (parent.listFiles().length == 0) {
+        }
-            parent.delete();
-          }
-        }                      
       }
     }
-    contentResolver.delete(WaypointsColumns.CONTENT_URI, WaypointsColumns._ID + "=?",
+    contentResolver.delete(WaypointsColumns.CONTENT_URI, WaypointsColumns._ID + "=?", new String[] { Long.toString(waypointId) });
-        new String[] { Long.toString(waypointId) });
   }
 
   @Override

myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java

@@ -32,8 +32,7 @@ import android.provider.BaseColumns;
 public interface TrackPointsColumns extends BaseColumns {
 
   String TABLE_NAME = "trackpoints";
-  Uri CONTENT_URI = Uri.parse(
+  Uri CONTENT_URI = Uri.parse("content://com.google.android.maps.mytracks/trackpoints");
-      "content://com.google.android.maps.mytracks/trackpoints");
   String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.google.trackpoint";
   String CONTENT_ITEMTYPE = "vnd.android.cursor.item/vnd.google.trackpoint";
   String DEFAULT_SORT_ORDER = "_id";

myTracks/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java

@@ -31,8 +31,7 @@ public interface TracksColumns extends BaseColumns {
   /**
    * Tracks provider uri.
    */
-  Uri CONTENT_URI = Uri.parse(
+  Uri CONTENT_URI = Uri.parse("content://com.google.android.maps.mytracks/tracks");
-      "content://com.google.android.maps.mytracks/tracks");
 
   /**
    * Track content type.

myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java

@@ -16,12 +16,15 @@
 
 package com.google.android.apps.mytracks.content;
 
-import com.google.android.apps.mytracks.stats.TripStatistics;
-
 import android.location.Location;
+import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.google.android.apps.mytracks.stats.TripStatistics;
+
+import java.net.URI;
+
 /**
  * A waypoint.
  * 
@@ -243,6 +246,14 @@ public final class Waypoint implements Parcelable {
     return photoUrl;
   }
 
+  public Uri getPhotoURI() {
+    return Uri.parse(photoUrl);
+  }
+
+  public boolean hasPhoto() {
+    return photoUrl != null && !"".equals(photoUrl);
+  }
+
   public void setPhotoUrl(String photoUrl) {
     this.photoUrl = photoUrl;
   }

myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java

@@ -16,7 +16,6 @@
 
 package com.google.android.apps.mytracks.fragments;
 
-import android.content.Context;
 import android.content.Intent;
 import android.location.Location;
 import android.net.Uri;
@@ -184,9 +183,7 @@ public class MarkerDetailFragment extends Fragment {
 
     updateWaypoint(false);
 
-    String photoUrl = waypoint.getPhotoUrl();
+    menu.findItem(R.id.marker_detail_view_photo).setVisible(waypoint.hasPhoto());
-    boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
-    menu.findItem(R.id.marker_detail_view_photo).setVisible(hasPhoto);
 
     TrackIconUtils.setMenuIconColor(menu);
   }
@@ -215,7 +212,7 @@ public class MarkerDetailFragment extends Fragment {
       case R.id.marker_detail_view_photo:
         intent = new Intent();
         intent.setAction(Intent.ACTION_VIEW);
-        intent.setDataAndType(Uri.parse(waypoint.getPhotoUrl()), "image/*");
+        intent.setDataAndType(waypoint.getPhotoURI(), "image/*");
         startActivity(intent);
         return true;
       default:
@@ -250,8 +247,7 @@ public class MarkerDetailFragment extends Fragment {
     statisticsView.setVisibility(isWaypoint ? View.GONE : View.VISIBLE);
 
     if (isWaypoint) {
-      String photoUrl = waypoint.getPhotoUrl();
+      boolean hasPhoto = waypoint.hasPhoto();
-      boolean hasPhoto = photoUrl != null && !photoUrl.equals("");
       photo.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
       textGradient.setVisibility(hasPhoto ? View.VISIBLE : View.GONE);
       waypointInfo.setVisibility(View.VISIBLE);
@@ -259,8 +255,7 @@ public class MarkerDetailFragment extends Fragment {
       if (hasPhoto) {
         handler.removeCallbacks(hideText);
         Display defaultDisplay = getActivity().getWindowManager().getDefaultDisplay();
-        PhotoUtils.setImageVew(photo, Uri.parse(photoUrl), defaultDisplay.getWidth(),
+        PhotoUtils.setImageView(photo, waypoint.getPhotoURI(), defaultDisplay.getWidth(), defaultDisplay.getHeight(), true);
-            defaultDisplay.getHeight(), true);
         handler.postDelayed(hideText, HIDE_TEXT_DELAY);
       }
 

myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java

@@ -169,16 +169,12 @@ public class KmlTrackWriter implements TrackWriter {
   @Override
   public void writeWaypoint(Waypoint waypoint) {
     if (printWriter != null) {
-      String styleName = waypoint.getType() == WaypointType.STATISTICS ? STATISTICS_STYLE
+      String styleName = waypoint.getType() == WaypointType.STATISTICS ? STATISTICS_STYLE : WAYPOINT_STYLE;
-          : WAYPOINT_STYLE;
+      if (waypoint.hasPhoto()) {
-      String photoUrl = waypoint.getPhotoUrl();
-      if (photoUrl != null && !photoUrl.equals("")) {
         float heading = getHeading(waypoint.getTrackId(), waypoint.getLocation());
-        writePhotoOverlay(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(),
+        writePhotoOverlay(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(), styleName, waypoint.getLocation(), waypoint.getPhotoUrl(), heading);
-            styleName, waypoint.getLocation(), photoUrl, heading);
       } else {
-        writePlacemark(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(),
+        writePlacemark(waypoint.getName(), waypoint.getCategory(), waypoint.getDescription(), styleName, waypoint.getLocation());
-            styleName, waypoint.getLocation());
       }
     }
   }

myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java

@@ -122,9 +122,8 @@ public class KmzTrackExporter implements TrackExporter {
               throw new InterruptedException();
             }
             Waypoint waypoint = myTracksProviderUtils.createWaypoint(cursor);
-            String photoUrl = waypoint.getPhotoUrl();
+            if (waypoint.hasPhoto()) {
-            if (photoUrl != null && !photoUrl.equals("")) {
+              addImage(zipOutputStream, waypoint.getPhotoUrl());
-              addImage(zipOutputStream, photoUrl);
             }
           }
         }

myTracks/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java

@@ -79,8 +79,7 @@ public class ListItemUtils {
       photo.getLayoutParams().height = photoHeight;
       photo.setImageResource(android.R.color.transparent);
       Display defaultDisplay = activity.getWindowManager().getDefaultDisplay();
-      PhotoUtils.setImageVew(
+      PhotoUtils.setImageView(photo, Uri.parse(photoUrl), defaultDisplay.getWidth(), photoHeight, false);
-          photo, Uri.parse(photoUrl), defaultDisplay.getWidth(), photoHeight, false);
     }
     
     // Set icon

myTracks/src/main/java/com/google/android/apps/mytracks/util/PhotoUtils.java

@@ -43,13 +43,10 @@ public class PhotoUtils {
    *          entire image (no cropping). False to fill the entire target area.
    *          (allow cropping).
    */
-  public static void setImageVew(
+  public static void setImageView(ImageView imageView, Uri uri, int targetWidth, int targetHeight, boolean fitWithin) {
-      ImageView imageView, Uri uri, int targetWidth, int targetHeight, boolean fitWithin) {
     if (cancelBitmapLoader(imageView, uri)) {
-      BitmapLoader bitmapLoader = new BitmapLoader(
+      BitmapLoader bitmapLoader = new BitmapLoader(imageView, uri, targetWidth, targetHeight, fitWithin);
-          imageView, uri, targetWidth, targetHeight, fitWithin);
+      WeakReference<BitmapLoader> bitmapLoaderReference = new WeakReference<>(bitmapLoader);
-      WeakReference<BitmapLoader> bitmapLoaderReference = new WeakReference<>(
-              bitmapLoader);
       imageView.setTag(bitmapLoaderReference);
       bitmapLoader.execute();
     }