Skip to content

Commit 29f7cfd

Browse files
author
aton1698
authored
Merge pull request #142 from jamescr/v0.6.12d
V0.6.12d
2 parents 1221b98 + db822a0 commit 29f7cfd

65 files changed

Lines changed: 834 additions & 394 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[<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)
2-
[<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)
1+
[<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)
2+
[<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)
33

4-
OSMTracker for Android™ official source code repository is [https://github.com/nguillaumin/osmtracker-android](https://github.com/nguillaumin/osmtracker-android).
4+
OSMTracker for Android™ official source code repository is [https://github.com/labexp/osmtracker-android](https://github.com/labexp/osmtracker-android).
55

6-
[![Build Status](https://travis-ci.org/nguillaumin/osmtracker-android.svg?branch=master)](https://travis-ci.org/nguillaumin/osmtracker-android)
6+
[![Build Status](https://travis-ci.org/labexp/osmtracker-android.svg?branch=master)](https://travis-ci.org/labexp/osmtracker-android)
77

8-
For more information about the project, documentation and bug reports please visit https://github.com/nguillaumin/osmtracker-android/wiki
8+
For more information about the project, documentation and bug reports please visit https://github.com/labexp/osmtracker-android/wiki
99

1010
To help translate OSMTracker, please visit https://www.transifex.com/projects/p/osmtracker-android/

‎app/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ android {
77
buildToolsVersion "27.0.3"
88

99
defaultConfig {
10-
applicationId "org.osmtracker"
11-
minSdkVersion 8
12-
targetSdkVersion 16
10+
applicationId "net.osmtracker"
11+
minSdkVersion 11
12+
targetSdkVersion 26
1313
multiDexEnabled true
1414

15-
testApplicationId "org.osmtracker.test"
15+
testApplicationId "net.osmtracker.test"
1616
testInstrumentationRunner "android.test.InstrumentationTestRunner"
1717
}
1818

@@ -61,6 +61,7 @@ dependencies {
6161
implementation 'org.osmdroid:osmdroid-android:5.6.5'
6262
implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
6363
implementation 'org.slf4j:slf4j-android:1.7.25'
64+
implementation 'com.android.support:support-v4:23.0.0'
6465
}
6566

6667
task copyNorwegianValues(type: Copy) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.osmtracker.test.activity;
1+
package net.osmtracker.test.activity;
22

3-
import org.osmtracker.activity.OpenStreetMapUpload;
3+
import net.osmtracker.activity.OpenStreetMapUpload;
44

55
import android.test.ActivityInstrumentationTestCase2;
66

77
public class OSMUploadTest extends ActivityInstrumentationTestCase2<OpenStreetMapUpload> {
88

99
public OSMUploadTest() {
10-
super("org.osmtracker", OpenStreetMapUpload.class);
10+
super("net.osmtracker", OpenStreetMapUpload.class);
1111
}
1212

1313
@Override

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.osmtracker.test.activity;
1+
package net.osmtracker.test.activity;
22

33
import junit.framework.Assert;
44

5-
import org.osmtracker.activity.TrackDetail;
6-
import org.osmtracker.db.TrackContentProvider;
7-
import org.osmtracker.db.TrackContentProvider.Schema;
8-
import org.osmtracker.test.util.MockData;
5+
import net.osmtracker.activity.TrackDetail;
6+
import net.osmtracker.db.TrackContentProvider;
7+
import net.osmtracker.db.TrackContentProvider.Schema;
8+
import net.osmtracker.test.util.MockData;
99

1010
import android.content.ContentResolver;
1111
import android.content.ContentUris;
@@ -22,7 +22,7 @@ public class TrackDetailTest extends ActivityInstrumentationTestCase2<TrackDetai
2222
private long trackId;
2323

2424
public TrackDetailTest() {
25-
super("org.osmtracker", TrackDetail.class);
25+
super("net.osmtracker", TrackDetail.class);
2626
}
2727

2828
@Override
@@ -49,11 +49,11 @@ public void testSave() {
4949
Assert.assertEquals("Private", cursor.getString(cursor.getColumnIndex(Schema.COL_OSM_VISIBILITY)));
5050
cursor.close();
5151

52-
((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_name)).setText("test name");
53-
((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_description)).setText("test description");
54-
((EditText) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_tags)).setText("test tags");
55-
((Spinner) getActivity().findViewById(org.osmtracker.R.id.trackdetail_item_osm_visibility)).setSelection(1);
56-
((Button) getActivity().findViewById(org.osmtracker.R.id.trackdetail_btn_ok)).performClick();
52+
((EditText) getActivity().findViewById(net.osmtracker.R.id.trackdetail_item_name)).setText("test name");
53+
((EditText) getActivity().findViewById(net.osmtracker.R.id.trackdetail_item_description)).setText("test description");
54+
((EditText) getActivity().findViewById(net.osmtracker.R.id.trackdetail_item_tags)).setText("test tags");
55+
((Spinner) getActivity().findViewById(net.osmtracker.R.id.trackdetail_item_osm_visibility)).setSelection(1);
56+
((Button) getActivity().findViewById(net.osmtracker.R.id.trackdetail_btn_ok)).performClick();
5757

5858
cursor = cr.query(
5959
ContentUris.withAppendedId(TrackContentProvider.CONTENT_URI_TRACK, trackId),

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.osmtracker.test.gpx;
1+
package net.osmtracker.test.gpx;
22

33
import android.content.SharedPreferences;
44
import android.content.SharedPreferences.Editor;
@@ -17,11 +17,11 @@
1717
import java.io.InputStream;
1818
import java.io.InputStreamReader;
1919

20-
import org.osmtracker.OSMTracker;
21-
import org.osmtracker.activity.TrackManager;
22-
import org.osmtracker.db.DataHelper;
23-
import org.osmtracker.gpx.ExportToStorageTask;
24-
import org.osmtracker.test.util.MockData;
20+
import net.osmtracker.OSMTracker;
21+
import net.osmtracker.activity.TrackManager;
22+
import net.osmtracker.db.DataHelper;
23+
import net.osmtracker.gpx.ExportToStorageTask;
24+
import net.osmtracker.test.util.MockData;
2525

2626
public class ExportTrackTaskTest extends ActivityInstrumentationTestCase2<TrackManager> {
2727

@@ -30,7 +30,7 @@ public class ExportTrackTaskTest extends ActivityInstrumentationTestCase2<TrackM
3030

3131

3232
public ExportTrackTaskTest() {
33-
super("org.osmtracker", TrackManager.class);
33+
super("net.osmtracker", TrackManager.class);
3434
}
3535

3636
@Override
@@ -39,17 +39,17 @@ protected void setUp() throws Exception {
3939
getActivity().getContentResolver().delete(
4040
MediaStore.Files.getContentUri("external"),
4141
MediaStore.Files.FileColumns.DATA + " LIKE ?",
42-
new String[] {"%/osmtracker/gpx-test"});
42+
new String[] {"%/net.osmtracker/gpx-test"});
4343

4444
Cursor cursor = getActivity().managedQuery(
4545
MediaStore.Files.getContentUri("external"),
4646
null,
4747
MediaStore.Files.FileColumns.DATA + " LIKE ?",
48-
new String[] {"%/osmtracker/gpx-test"},
48+
new String[] {"%/net.osmtracker/gpx-test"},
4949
null);
5050
Assert.assertEquals(0, cursor.getCount());
5151

52-
trackFile = new File(Environment.getExternalStorageDirectory(), "osmtracker/gpx-test.gpx");
52+
trackFile = new File(Environment.getExternalStorageDirectory(), "net.osmtracker/gpx-test.gpx");
5353
if (trackFile.exists()) {
5454
Assert.assertTrue(trackFile.delete());
5555
}
@@ -89,7 +89,7 @@ public void test() throws Exception {
8989
MediaStore.Files.getContentUri("external"),
9090
null,
9191
MediaStore.Files.FileColumns.DATA + " LIKE ?",
92-
new String[]{"%/osmtracker/gpx-test.gpx"},
92+
new String[]{"%/net.osmtracker/gpx-test.gpx"},
9393
null);
9494
if (c.moveToFirst()) {
9595
break;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package org.osmtracker.test.util;
1+
package net.osmtracker.test.util;
22

33
import java.util.Calendar;
44
import java.util.Locale;
55
import java.util.Random;
66
import java.util.TimeZone;
77
import java.util.UUID;
88

9-
import org.osmtracker.db.DataHelper;
10-
import org.osmtracker.db.TrackContentProvider;
11-
import org.osmtracker.db.TrackContentProvider.Schema;
9+
import net.osmtracker.db.DataHelper;
10+
import net.osmtracker.db.TrackContentProvider;
11+
import net.osmtracker.db.TrackContentProvider.Schema;
1212
import android.content.ContentResolver;
1313
import android.content.ContentUris;
1414
import android.content.ContentValues;

‎app/src/main/AndroidManifest.xml‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,51 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.osmtracker"
3-
android:versionName="0.6.11" android:versionCode="37" android:installLocation="auto">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.osmtracker"
3+
android:versionName="0.6.12" android:versionCode="40" android:installLocation="auto">
44

55
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
66
<uses-permission android:name="android.permission.RECORD_AUDIO" />
7+
<uses-permission android:name="android.permission.CAMERA" />
78
<uses-permission android:name="android.permission.INTERNET" />
89
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
910
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1011
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
1112

1213
<application android:label="@string/app_name" android:description="@string/app_description" android:icon="@drawable/ic_launcher">
1314

14-
<activity android:name="org.osmtracker.activity.TrackManager" android:label="@string/app_name">
15+
<activity android:name="net.osmtracker.activity.TrackManager" android:label="@string/app_name">
1516
<intent-filter>
1617
<action android:name="android.intent.action.MAIN" />
1718
<category android:name="android.intent.category.LAUNCHER" />
1819
</intent-filter>
1920
</activity>
2021

21-
<activity android:name="org.osmtracker.activity.TrackLogger" android:label="@string/tracklogger" android:launchMode="singleTop"/>
22-
<activity android:name="org.osmtracker.activity.Preferences" android:label="@string/prefs" />
23-
<activity android:name="org.osmtracker.activity.WaypointList" android:label="@string/wplist" />
24-
<activity android:name="org.osmtracker.activity.TrackDetail" android:label="@string/trackdetail" />
25-
<activity android:name="org.osmtracker.activity.OpenStreetMapUpload" android:label="@string/osm_upload">
22+
<activity android:name="net.osmtracker.activity.TrackLogger" android:label="@string/tracklogger" android:launchMode="singleTop"/>
23+
<activity android:name="net.osmtracker.activity.Preferences" android:label="@string/prefs" />
24+
<activity android:name="net.osmtracker.activity.WaypointList" android:label="@string/wplist" />
25+
<activity android:name="net.osmtracker.activity.TrackDetail" android:label="@string/trackdetail" />
26+
<activity android:name="net.osmtracker.activity.OpenStreetMapUpload" android:label="@string/osm_upload">
2627
<intent-filter>
2728
<action android:name="android.intent.action.VIEW"/>
2829
<category android:name="android.intent.category.BROWSABLE"/>
2930
<category android:name="android.intent.category.DEFAULT"/>
3031
<data android:host="osm-upload" android:scheme="osmtracker"/>
3132
</intent-filter>
3233
</activity>
33-
<activity android:name="org.osmtracker.activity.About" android:label="@string/about" />
34-
<activity android:name="org.osmtracker.activity.DisplayTrack" android:label="@string/displaytrack" />
35-
<activity android:name="org.osmtracker.activity.DisplayTrackMap" android:label="@string/displaytrackmap" />
34+
<activity android:name="net.osmtracker.activity.About" android:label="@string/about" />
35+
<activity android:name="net.osmtracker.activity.DisplayTrack" android:label="@string/displaytrack" />
36+
<activity android:name="net.osmtracker.activity.DisplayTrackMap" android:label="@string/displaytrackmap" />
3637

37-
<service android:name="org.osmtracker.service.gps.GPSLogger" android:exported="false">
38+
<service android:name="net.osmtracker.service.gps.GPSLogger" android:exported="false">
3839
<intent-filter>
39-
<action android:name="org.osmtracker.intent.GPS_SERVICE" />
40+
<action android:name="osmtracker.intent.GPS_SERVICE" />
4041
</intent-filter>
4142
</service>
4243

43-
<provider android:name="org.osmtracker.db.TrackContentProvider"
44-
android:authorities="org.osmtracker.provider"
44+
<provider android:name="net.osmtracker.db.TrackContentProvider"
45+
android:authorities="net.osmtracker.provider"
4546
android:exported="false" />
4647

47-
<receiver android:name="org.osmtracker.receiver.MediaButtonReceiver" >
48+
<receiver android:name="net.osmtracker.receiver.MediaButtonReceiver" >
4849
<intent-filter>
4950
<action android:name="android.intent.action.MEDIA_BUTTON" />
5051
</intent-filter>

app/src/main/java/org/osmtracker/OSMTracker.java renamed to app/src/main/java/net/osmtracker/OSMTracker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.osmtracker;
1+
package net.osmtracker;
22

33

44
/**
@@ -44,7 +44,7 @@ public static final class Preferences {
4444
// Default values
4545
public final static String VAL_STORAGE_DIR = "/osmtracker";
4646
public final static String VAL_VOICEREC_DURATION = "2";
47-
public final static String VAL_UI_THEME = "org.osmtracker:style/DefaultTheme";
47+
public final static String VAL_UI_THEME = "net.osmtracker:style/DefaultTheme";
4848
public final static boolean VAL_GPS_CHECKSTARTUP = true;
4949
public final static boolean VAL_GPS_IGNORE_CLOCK = false;
5050
public final static String VAL_GPS_LOGGING_INTERVAL = "0";

app/src/main/java/org/osmtracker/activity/About.java renamed to app/src/main/java/net/osmtracker/activity/About.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.osmtracker.activity;
1+
package net.osmtracker.activity;
22

3-
import org.osmtracker.OSMTracker;
4-
import org.osmtracker.R;
5-
import org.osmtracker.db.DatabaseHelper;
6-
import org.osmtracker.db.ExportDatabaseTask;
3+
import net.osmtracker.OSMTracker;
4+
import net.osmtracker.R;
5+
import net.osmtracker.db.DatabaseHelper;
6+
import net.osmtracker.db.ExportDatabaseTask;
77

88
import android.app.Activity;
99
import android.app.AlertDialog;

app/src/main/java/org/osmtracker/activity/DisplayTrack.java renamed to app/src/main/java/net/osmtracker/activity/DisplayTrack.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.osmtracker.activity;
1+
package net.osmtracker.activity;
22

3-
import org.osmtracker.OSMTracker;
4-
import org.osmtracker.util.ThemeValidator;
5-
import org.osmtracker.view.DisplayTrackView;
6-
import org.osmtracker.db.TrackContentProvider;
3+
import net.osmtracker.OSMTracker;
4+
import net.osmtracker.util.ThemeValidator;
5+
import net.osmtracker.view.DisplayTrackView;
6+
import net.osmtracker.db.TrackContentProvider;
77

88
import android.app.Activity;
99
import android.app.AlertDialog;
@@ -53,10 +53,10 @@ protected void onCreate(Bundle savedInstanceState) {
5353
@Override
5454
public void run() {
5555
new AlertDialog.Builder(DisplayTrack.this)
56-
.setTitle(org.osmtracker.R.string.prefs_displaytrack_osm)
57-
.setMessage(org.osmtracker.R.string.prefs_displaytrack_osm_summary_ask)
56+
.setTitle(net.osmtracker.R.string.prefs_displaytrack_osm)
57+
.setMessage(net.osmtracker.R.string.prefs_displaytrack_osm_summary_ask)
5858
.setNegativeButton(android.R.string.no, null)
59-
.setPositiveButton(org.osmtracker.R.string.displaytrack_map, new DialogInterface.OnClickListener() {
59+
.setPositiveButton(net.osmtracker.R.string.displaytrack_map, new DialogInterface.OnClickListener() {
6060
@Override
6161
public void onClick(DialogInterface dialog, int which) {
6262
PreferenceManager.getDefaultSharedPreferences(DisplayTrack.this).edit()

0 commit comments

Comments
 (0)