Merge pull request #142 from jamescr/v0.6.12d

V0.6.12d

README.md

@@ -1,10 +1,10 @@
-[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=org.osmtracker)
-[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/app/org.osmtracker)
+[<img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="80"/>](https://play.google.com/store/apps/details?id=net.osmtracker)
+[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/app/net.osmtracker)
 
-OSMTracker for Android™ official source code repository is [https://github.com/nguillaumin/osmtracker-android](https://github.com/nguillaumin/osmtracker-android).
+OSMTracker for Android™ official source code repository is [https://github.com/labexp/osmtracker-android](https://github.com/labexp/osmtracker-android).
 
-[![Build Status](https://travis-ci.org/nguillaumin/osmtracker-android.svg?branch=master)](https://travis-ci.org/nguillaumin/osmtracker-android)
+[![Build Status](https://travis-ci.org/labexp/osmtracker-android.svg?branch=master)](https://travis-ci.org/labexp/osmtracker-android)
 
-For more information about the project, documentation and bug reports please visit https://github.com/nguillaumin/osmtracker-android/wiki
+For more information about the project, documentation and bug reports please visit https://github.com/labexp/osmtracker-android/wiki
 
 To help translate OSMTracker, please visit https://www.transifex.com/projects/p/osmtracker-android/

app/build.gradle

@@ -7,12 +7,12 @@ android {
     buildToolsVersion "27.0.3"
 
     defaultConfig {
-        applicationId "org.osmtracker"
-        minSdkVersion 8
-        targetSdkVersion 16
+        applicationId "net.osmtracker"
+        minSdkVersion 11
+        targetSdkVersion 26
         multiDexEnabled true
 
-        testApplicationId "org.osmtracker.test"
+        testApplicationId "net.osmtracker.test"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
     }
 
@@ -61,6 +61,7 @@ dependencies {
     implementation 'org.osmdroid:osmdroid-android:5.6.5'
     implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
     implementation 'org.slf4j:slf4j-android:1.7.25'
+    implementation 'com.android.support:support-v4:23.0.0'
 }
 
 task copyNorwegianValues(type: Copy) {

app/src/androidTest/java/org/osmtracker/test/activity/OSMUploadTest.java → app/src/androidTest/java/net/osmtracker/test/activity/OSMUploadTest.java

@@ -1,13 +1,13 @@
-package org.osmtracker.test.activity;
+package net.osmtracker.test.activity;
 
-import org.osmtracker.activity.OpenStreetMapUpload;
+import net.osmtracker.activity.OpenStreetMapUpload;
 
 import android.test.ActivityInstrumentationTestCase2;
 
 public class OSMUploadTest extends ActivityInstrumentationTestCase2<OpenStreetMapUpload> {
 
 	public OSMUploadTest() {
-		super("org.osmtracker", OpenStreetMapUpload.class);
+		super("net.osmtracker", OpenStreetMapUpload.class);
 	}
 
 	@Override

app/src/androidTest/java/org/osmtracker/test/activity/TrackDetailTest.java → app/src/androidTest/java/net/osmtracker/test/activity/TrackDetailTest.java

@@ -1,11 +1,11 @@
-package org.osmtracker.test.activity;
+package net.osmtracker.test.activity;
 
 import junit.framework.Assert;
 
-import org.osmtracker.activity.TrackDetail;
-import org.osmtracker.db.TrackContentProvider;
-import org.osmtracker.db.TrackContentProvider.Schema;
-import org.osmtracker.test.util.MockData;
+import net.osmtracker.activity.TrackDetail;
+import net.osmtracker.db.TrackContentProvider;
+import net.osmtracker.db.TrackContentProvider.Schema;
+import net.osmtracker.test.util.MockData;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -22,7 +22,7 @@ public class TrackDetailTest extends ActivityInstrumentationTestCase2<TrackDetai
 	private long trackId;
 
 	public TrackDetailTest() {
-		super("org.osmtracker", TrackDetail.class);
+		super("net.osmtracker", TrackDetail.class);
 	}
 
 	@Override
@@ -49,11 +49,11 @@ public void testSave() {
 		Assert.assertEquals("Private", cursor.getString(cursor.getColumnIndex(Schema.COL_OSM_VISIBILITY)));
 		cursor.close();
 
-		((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_name)).setText("test name");
-		((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_description)).setText("test description");
-		((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_tags)).setText("test tags");
-		((Spinner) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_osm_visibility)).setSelection(1);
-		((Button) getActivity().findViewById(org.osmtracker.R.id.trackdetail_btn_ok)).performClick();
+		((EditText) getActivity().findViewById(net.osmtracker.R.id.trackdetail_item_name)).setText("test name");
+		((EditText) getActivity().findViewById(net.osmtracker.R.id.trackdetail_item_description)).setText("test description");
+		((EditText) getActivity().findViewById(net.osmtracker.R.id.trackdetail_item_tags)).setText("test tags");
+		((Spinner) getActivity().findViewById(net.osmtracker.R.id.trackdetail_item_osm_visibility)).setSelection(1);
+		((Button) getActivity().findViewById(net.osmtracker.R.id.trackdetail_btn_ok)).performClick();
 
 		cursor = cr.query(
 				ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, trackId),

app/src/androidTest/java/org/osmtracker/test/gpx/ExportTrackTaskTest.java → app/src/androidTest/java/net/osmtracker/test/gpx/ExportTrackTaskTest.java

@@ -1,4 +1,4 @@
-package org.osmtracker.test.gpx;
+package net.osmtracker.test.gpx;
 
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -17,11 +17,11 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
-import org.osmtracker.OSMTracker;
-import org.osmtracker.activity.TrackManager;
-import org.osmtracker.db.DataHelper;
-import org.osmtracker.gpx.ExportToStorageTask;
-import org.osmtracker.test.util.MockData;
+import net.osmtracker.OSMTracker;
+import net.osmtracker.activity.TrackManager;
+import net.osmtracker.db.DataHelper;
+import net.osmtracker.gpx.ExportToStorageTask;
+import net.osmtracker.test.util.MockData;
 
 public class ExportTrackTaskTest extends ActivityInstrumentationTestCase2<TrackManager> {
 
@@ -30,7 +30,7 @@ public class ExportTrackTaskTest extends ActivityInstrumentationTestCase2<TrackM
 
 
 	public ExportTrackTaskTest() {
-		super("org.osmtracker", TrackManager.class);
+		super("net.osmtracker", TrackManager.class);
 	}
 
 	@Override
@@ -39,17 +39,17 @@ protected void setUp() throws Exception {
 		getActivity().getContentResolver().delete(
 				MediaStore.Files.getContentUri("external"),
 				MediaStore.Files.FileColumns.DATA + " LIKE ?",
-				new String[] {"%/osmtracker/gpx-test"});
+				new String[] {"%/net.osmtracker/gpx-test"});
 
 		Cursor cursor = getActivity().managedQuery(
 				MediaStore.Files.getContentUri("external"),
 				null,
 				MediaStore.Files.FileColumns.DATA + " LIKE ?",
-				new String[] {"%/osmtracker/gpx-test"},
+				new String[] {"%/net.osmtracker/gpx-test"},
 				null);
 		Assert.assertEquals(0, cursor.getCount());
 
-		trackFile = new File(Environment.getExternalStorageDirectory(), "osmtracker/gpx-test.gpx");
+		trackFile = new File(Environment.getExternalStorageDirectory(), "net.osmtracker/gpx-test.gpx");
 		if (trackFile.exists()) {
 			Assert.assertTrue(trackFile.delete());
 		}
@@ -89,7 +89,7 @@ public void test() throws Exception {
 					MediaStore.Files.getContentUri("external"),
 					null,
 					MediaStore.Files.FileColumns.DATA + " LIKE ?",
-					new String[]{"%/osmtracker/gpx-test.gpx"},
+					new String[]{"%/net.osmtracker/gpx-test.gpx"},
 					null);
 			if (c.moveToFirst()) {
 				break;

app/src/androidTest/java/org/osmtracker/test/util/MockData.java → app/src/androidTest/java/net/osmtracker/test/util/MockData.java

@@ -1,14 +1,14 @@
-package org.osmtracker.test.util;
+package net.osmtracker.test.util;
 
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.Random;
 import java.util.TimeZone;
 import java.util.UUID;
 
-import org.osmtracker.db.DataHelper;
-import org.osmtracker.db.TrackContentProvider;
-import org.osmtracker.db.TrackContentProvider.Schema;
+import net.osmtracker.db.DataHelper;
+import net.osmtracker.db.TrackContentProvider;
+import net.osmtracker.db.TrackContentProvider.Schema;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;

app/src/main/AndroidManifest.xml

@@ -1,50 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.osmtracker"
-	android:versionName="0.6.11" android:versionCode="37" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.osmtracker"
+	android:versionName="0.6.12" android:versionCode="40" android:installLocation="auto">
 
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
+	<uses-permission android:name="android.permission.CAMERA" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
 	<application android:label="@string/app_name" android:description="@string/app_description" android:icon="@drawable/ic_launcher">
 
-		<activity android:name="org.osmtracker.activity.TrackManager" android:label="@string/app_name">
+		<activity android:name="net.osmtracker.activity.TrackManager" android:label="@string/app_name">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
 
-		<activity android:name="org.osmtracker.activity.TrackLogger" android:label="@string/tracklogger" android:launchMode="singleTop"/>
-		<activity android:name="org.osmtracker.activity.Preferences" android:label="@string/prefs" />
-		<activity android:name="org.osmtracker.activity.WaypointList" android:label="@string/wplist" />
-		<activity android:name="org.osmtracker.activity.TrackDetail" android:label="@string/trackdetail" />
-		<activity android:name="org.osmtracker.activity.OpenStreetMapUpload" android:label="@string/osm_upload">
+		<activity android:name="net.osmtracker.activity.TrackLogger" android:label="@string/tracklogger" android:launchMode="singleTop"/>
+		<activity android:name="net.osmtracker.activity.Preferences" android:label="@string/prefs" />
+		<activity android:name="net.osmtracker.activity.WaypointList" android:label="@string/wplist" />
+		<activity android:name="net.osmtracker.activity.TrackDetail" android:label="@string/trackdetail" />
+		<activity android:name="net.osmtracker.activity.OpenStreetMapUpload" android:label="@string/osm_upload">
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 				<data android:host="osm-upload" android:scheme="osmtracker"/>
 			</intent-filter>
 		</activity>
-		<activity android:name="org.osmtracker.activity.About" android:label="@string/about" />
-		<activity android:name="org.osmtracker.activity.DisplayTrack" android:label="@string/displaytrack" />
-		<activity android:name="org.osmtracker.activity.DisplayTrackMap" android:label="@string/displaytrackmap" />
+		<activity android:name="net.osmtracker.activity.About" android:label="@string/about" />
+		<activity android:name="net.osmtracker.activity.DisplayTrack" android:label="@string/displaytrack" />
+		<activity android:name="net.osmtracker.activity.DisplayTrackMap" android:label="@string/displaytrackmap" />
 
-		<service android:name="org.osmtracker.service.gps.GPSLogger" android:exported="false">
+		<service android:name="net.osmtracker.service.gps.GPSLogger" android:exported="false">
 			<intent-filter>
-				<action android:name="org.osmtracker.intent.GPS_SERVICE" />
+				<action android:name="osmtracker.intent.GPS_SERVICE" />
 			</intent-filter>
 		</service>
 
-		<provider android:name="org.osmtracker.db.TrackContentProvider"
-		    android:authorities="org.osmtracker.provider"
+		<provider android:name="net.osmtracker.db.TrackContentProvider"
+		    android:authorities="net.osmtracker.provider"
 		    android:exported="false" />
 
-		<receiver android:name="org.osmtracker.receiver.MediaButtonReceiver" >
+		<receiver android:name="net.osmtracker.receiver.MediaButtonReceiver" >
 	        <intent-filter>
 	            <action android:name="android.intent.action.MEDIA_BUTTON" />               
 	        </intent-filter>

app/src/main/java/org/osmtracker/OSMTracker.java → app/src/main/java/net/osmtracker/OSMTracker.java

@@ -1,4 +1,4 @@
-package org.osmtracker;
+package net.osmtracker;
 
 
 /**
@@ -44,7 +44,7 @@ public static final class Preferences {
 		// Default values
 		public final static String VAL_STORAGE_DIR = "/osmtracker";
 		public final static String VAL_VOICEREC_DURATION = "2";
-		public final static String VAL_UI_THEME = "org.osmtracker:style/DefaultTheme";
+		public final static String VAL_UI_THEME = "net.osmtracker:style/DefaultTheme";
 		public final static boolean VAL_GPS_CHECKSTARTUP = true;
 		public final static boolean VAL_GPS_IGNORE_CLOCK = false;
 		public final static String VAL_GPS_LOGGING_INTERVAL = "0";

app/src/main/java/org/osmtracker/activity/About.java → app/src/main/java/net/osmtracker/activity/About.java

@@ -1,9 +1,9 @@
-package org.osmtracker.activity;
+package net.osmtracker.activity;
 
-import org.osmtracker.OSMTracker;
-import org.osmtracker.R;
-import org.osmtracker.db.DatabaseHelper;
-import org.osmtracker.db.ExportDatabaseTask;
+import net.osmtracker.OSMTracker;
+import net.osmtracker.R;
+import net.osmtracker.db.DatabaseHelper;
+import net.osmtracker.db.ExportDatabaseTask;
 
 import android.app.Activity;
 import android.app.AlertDialog;

app/src/main/java/org/osmtracker/activity/DisplayTrack.java → app/src/main/java/net/osmtracker/activity/DisplayTrack.java

@@ -1,9 +1,9 @@
-package org.osmtracker.activity;
+package net.osmtracker.activity;
 
-import org.osmtracker.OSMTracker;
-import org.osmtracker.util.ThemeValidator;
-import org.osmtracker.view.DisplayTrackView;
-import org.osmtracker.db.TrackContentProvider;
+import net.osmtracker.OSMTracker;
+import net.osmtracker.util.ThemeValidator;
+import net.osmtracker.view.DisplayTrackView;
+import net.osmtracker.db.TrackContentProvider;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -53,10 +53,10 @@ protected void onCreate(Bundle savedInstanceState) {
 				@Override
 				public void run() {
 					new AlertDialog.Builder(DisplayTrack.this)
-						.setTitle(org.osmtracker.R.string.prefs_displaytrack_osm)
-						.setMessage(org.osmtracker.R.string.prefs_displaytrack_osm_summary_ask)
+						.setTitle(net.osmtracker.R.string.prefs_displaytrack_osm)
+						.setMessage(net.osmtracker.R.string.prefs_displaytrack_osm_summary_ask)
 						.setNegativeButton(android.R.string.no, null)
-						.setPositiveButton(org.osmtracker.R.string.displaytrack_map, new DialogInterface.OnClickListener() {
+						.setPositiveButton(net.osmtracker.R.string.displaytrack_map, new DialogInterface.OnClickListener() {
 							@Override
 							public void onClick(DialogInterface dialog, int which) {
 								PreferenceManager.getDefaultSharedPreferences(DisplayTrack.this).edit()

app/src/main/java/org/osmtracker/activity/DisplayTrackMap.java → app/src/main/java/net/osmtracker/activity/DisplayTrackMap.java

@@ -1,13 +1,13 @@
-package org.osmtracker.activity;
+package net.osmtracker.activity;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.osmtracker.OSMTracker;
-import org.osmtracker.R;
-import org.osmtracker.db.TrackContentProvider;
-import org.osmtracker.overlay.WayPointsOverlay;
+import net.osmtracker.OSMTracker;
+import net.osmtracker.R;
+import net.osmtracker.db.TrackContentProvider;
+import net.osmtracker.overlay.WayPointsOverlay;
 
 import org.osmdroid.api.IMapController;
 import org.osmdroid.tileprovider.tilesource.ITileSource;

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

@@ -1,14 +1,14 @@
-package org.osmtracker.activity;
+package net.osmtracker.activity;
 
-import org.osmtracker.OSMTracker;
-import org.osmtracker.R;
-import org.osmtracker.db.TrackContentProvider;
-import org.osmtracker.db.model.Track;
-import org.osmtracker.gpx.ExportToTempFileTask;
-import org.osmtracker.osm.OpenStreetMapConstants;
-import org.osmtracker.osm.RetrieveAccessTokenTask;
-import org.osmtracker.osm.RetrieveRequestTokenTask;
-import org.osmtracker.osm.UploadToOpenStreetMapTask;
+import net.osmtracker.OSMTracker;
+import net.osmtracker.R;
+import net.osmtracker.db.TrackContentProvider;
+import net.osmtracker.db.model.Track;
+import net.osmtracker.gpx.ExportToTempFileTask;
+import net.osmtracker.osm.OpenStreetMapConstants;
+import net.osmtracker.osm.RetrieveAccessTokenTask;
+import net.osmtracker.osm.RetrieveRequestTokenTask;
+import net.osmtracker.osm.UploadToOpenStreetMapTask;
 
 import oauth.signpost.OAuth;
 import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer;