Skip to content

Commit 1c2b372

Browse files
committed
Hopefully this fixes the build issues, and fixed a bug in the filutils based on iPaulPro/aFileChooser#100
1 parent b131a33 commit 1c2b372

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,11 @@ allprojects {
1616
google()
1717
jcenter()
1818
mavenLocal()
19+
mavenCentral()
20+
maven{
21+
22+
23+
url'https://jitpack.io'
24+
}
1925
}
20-
}
26+
}

mapcache/build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ task androidAppVersion {
5151
dependencies {
5252
api 'com.android.support:appcompat-v7:27.1.1'
5353
//api "mil.nga.geopackage.map:geopackage-android-map:3.0.1" // comment out to build locally
54-
// api project(':geopackage-map') // uncomment me to build locally
55-
// api project(':geopackage-core')
56-
// api project(':geopackage-android')
54+
//api project(':geopackage-map') // uncomment me to build locally
55+
// api project(':geopackage-core')
56+
// api project(':geopackage-android')
5757
api 'mil.nga.sf:sf-proj:2.0.0'
5858
api 'mil.nga.sf:sf-wkb:2.0.0'
5959
api 'mil.nga.sf:sf-geojson:2.0.0'
@@ -63,6 +63,12 @@ dependencies {
6363
api 'ar.com.hjg:pngj:2.1.0'
6464
api 'com.android.support:multidex:1.0.3'
6565
testImplementation 'com.android.support:multidex:1.0.3'
66+
implementation project(':geopackage-core-3.0.1')
67+
implementation project(':geopackage-android-3.0.1')
68+
implementation project(':geopackage-android-map-3.0.1')
69+
api 'com.google.android.gms:play-services-analytics:7.3.0'
70+
api 'com.google.android.gms:play-services-maps:15.0.1'
71+
compile 'com.google.maps.android:android-maps-utils:0.5'
6672
}
6773

6874
configure extensions.android, {

mapcache/src/main/AndroidManifest.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="mil.nga.mapcache"
4-
android:installLocation="auto">
4+
android:installLocation="auto"
5+
xmlns:tools="http://schemas.android.com/tools">
56

67
<uses-permission android:name="android.permission.INTERNET" />
78
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -70,11 +71,12 @@
7071

7172
<meta-data
7273
android:name="com.google.android.maps.v2.API_KEY"
73-
android:value="@string/GOOGLE_MAPS_ANDROID_API_KEY" />
74+
android:value="AIzaSyAwhzBXDyp41lLLdOKhNF-czCtD73dWSFs" />
7475

7576
<meta-data
7677
android:name="com.google.android.gms.version"
77-
android:value="@integer/google_play_services_version" />
78+
android:value="@integer/google_play_services_version"
79+
/>
7880

7981
</application>
8082

mapcache/src/main/java/com/ipaulpro/afilechooser/utils/FileUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ else if (isExternalStorageDocument(uri)) {
342342
else if (isDownloadsDocument(uri)) {
343343

344344
final String id = getDocumentId(uri);
345+
if (id.startsWith("raw:"))
346+
return id.replaceFirst("raw:", "");
345347
final Uri contentUri = ContentUris.withAppendedId(
346348
Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
347349

settings.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
include ':mapcache'
2-
// uncomment below to build locally
3-
//include ':geopackage-sdk'
4-
//project(':geopackage-sdk').projectDir = new File('../geopackage-android/geopackage-sdk')
5-
//include ':geopackage-map'
6-
//project(':geopackage-map').projectDir = new File('../geopackage-android-map/geopackage-map')
1+
include ':mapcache', ':geopackage-core-3.0.1', ':geopackage-android-3.0.1', ':geopackage-android-map-3.0.1'

0 commit comments

Comments
 (0)