Skip to content

Commit 81b9525

Browse files
xsaco07aton1698
authored andcommitted
v0.7.2 (#224)
* New preference: Minimum distance between subsequent track points * Open keyboard automatically when creating a note Fixes issue #62 * update gradle and build tools versions * The bug that deletes the saved tags before save the trace is solved * New translations from Transifex * Do not allow empty string in min_logging_distance * Solving the issue #115 (#179) Adding new icon in the bottom space in the main screen * Changing app version to 0.7.1 * Fix travis CI (#202) * Fix ExportTrackTaskTest and Travis CI * Update gradle4.6-all checksum * Update travis config file * add travis config sudo:true * Fix issue 183 * Fix the problem when download a new layout after the export gpx directory changed * fix display of background maps (#203) * Add load method which sets HTTP User Agent to the app package name * Ask for permissions before display track * Clean unused code in DisplayTrack * Request storage permission when exporting tracks any time * Add missing breaks - permissions requested propertly when exporting all traces * Request permissions when upload a trace to OSM * scale-up map to be better readable on high DPI displays * Set track width in map view to 0.5mm * Fix issue #189, adding multiple tags to track (#204) * Comment map tiles sources in preferences * Use always the default map tile source MAPNIK * Include the track's tags into the GPX file (#166) * Include the tags in the GPX file * Fix: The "<tags>" was missing; actually, according to the GPX specification, a separate namespaces should be used for such custom tags. I don't do it for the time being to be compliant with other appearances of "<extensions>" in this app. * Fixed null issue when tags are empty * slight format adjustments * Export track description into GPX * replace <extensions><tags>... by <metadata><keywords>... * Export multiple tags as multiple <keyword> elements instead of comma separated list. Seems to be more in line with GPX specs. * - place <desc> also withing <metadata> - trim leading/trailing whitespaces from tags in GPX * Request GPS permission before start TrackLogger Activity, fix issue #207 (#213) * Update the target sdk to 28 and the version code to 45 * Fix android9 and issues (#218) * Target sdk 28 needs FOREGROUND_SERVICE permission in manifest. Fixes issue #214 * Fix wrong imports and function calls from them * Fix background map for Android 9.0 to launch beta2 v0.7.2 * Fix some dependencies in manifest and gradle - WIP * Change dependencies, delete usage of http-android * Update version code * Comment tests that stop travis * Delete test class files
1 parent 1ee6840 commit 81b9525

File tree

17 files changed

+439
-533
lines changed

17 files changed

+439
-533
lines changed

.travis.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
1-
sudo: false
1+
sudo: true
22

33
language: android
44
jdk: oraclejdk8
55

66
android:
77
components:
8+
- build-tools-28.0.3
9+
- android-28
810
- tools
9-
- platform-tools
10-
- tools
11-
- build-tools-27.0.3
12-
- android-16
13-
- android-19
14-
- sys-img-armeabi-v7a-android-19
11+
- android-21
12+
- sys-img-armeabi-v7a-android-21
13+
14+
licenses:
15+
- android-sdk-license-.+
16+
- '.+'
17+
18+
before_install:
19+
- mkdir "$ANDROID_HOME/licenses" || true
20+
- yes | sdkmanager "platforms;android-27"
1521

1622
before_script:
17-
- echo no | android create avd --force -n test -c 100M -t android-19 --abi armeabi-v7a
23+
- echo no | android create avd --force -n test -c 100M -t android-21 --abi armeabi-v7a
1824
- emulator -avd test -no-audio -no-window &
1925
- android-wait-for-emulator
2026
- adb shell input keyevent 82 &

app/build.gradle

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 27
4+
5+
useLibrary 'org.apache.http.legacy'
6+
compileSdkVersion 28
57
buildToolsVersion = '28.0.3'
68

79
defaultConfig {
810
applicationId "net.osmtracker"
911
minSdkVersion 16
10-
targetSdkVersion 27
12+
targetSdkVersion 28
1113
multiDexEnabled true
1214

1315
testApplicationId "net.osmtracker.test"
@@ -49,17 +51,36 @@ android {
4951
abortOnError false
5052
}
5153
}
54+
55+
defaultConfig {
56+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
57+
}
58+
5259
}
5360

5461
dependencies {
62+
5563
implementation 'org.apache.james:apache-mime4j-core:0.7.2'
56-
implementation 'org.apache.httpcomponents:httpclient:4.2.1'
57-
implementation 'org.apache.httpcomponents:httpcore:4.2.1'
58-
implementation 'org.apache.httpcomponents:httpmime:4.2.1'
59-
implementation 'org.osmdroid:osmdroid-android:5.6.5'
64+
65+
implementation ('org.apache.httpcomponents:httpmime:4.3.6')
66+
//implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
67+
68+
implementation 'org.osmdroid:osmdroid-android:6.1.0'
69+
implementation 'org.apache.httpcomponents:httpcore:4.4.10'
70+
6071
implementation 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
6172
implementation 'org.slf4j:slf4j-android:1.7.25'
62-
implementation "com.android.support:support-compat:27.1.1"
73+
implementation "com.android.support:support-compat:28.0.0"
74+
75+
// Required for local unit tests (JUnit 4 framework)
76+
testImplementation 'junit:junit:4.12'
77+
78+
// Required for instrumented tests
79+
androidTestImplementation "com.android.support.test:runner:1.0.2"
80+
androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
81+
androidTestImplementation "com.android.support.test:rules:1.0.2"
82+
83+
compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
6384
}
6485

6586
task copyNorwegianValues(type: Copy) {

app/src/androidTest/assets/gpx/gpx-test.gpx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="OSMTracker for Android™ - https://github.com/nguillaumin/osmtracker-android" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd ">
2+
<gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="OSMTracker for Android™ - https://github.com/labexp/osmtracker-android" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd ">
33
<wpt lat="34.12" lon="18.45">
44
<ele>5812.2</ele>
55
<time>2012-03-12T16:46:38Z</time>

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

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

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)