Commit graph

65897 commits

Author SHA1 Message Date
Dima-1
ada0a8d300 Merge branch 'imp_exp_local_maps_offline' into imp_exp_osm_note 2020-10-23 15:30:37 +03:00
Dima-1
93458b41ca Merge branch 'master' into imp_exp_osm_note
# Conflicts:
#	OsmAnd/src/net/osmand/plus/settings/backend/ExportSettingsType.java
#	OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsItemType.java
2020-10-23 15:06:16 +03:00
Vitaliy
193e75c62d
Merge pull request #10015 from osmandapp/plugins_settings
Remove outdated plugin settings screens
2020-10-22 23:04:32 +03:00
Vitaliy
05b1eadf69 Merge branch 'master' into plugins_settings
# Conflicts:
#	OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
2020-10-22 22:55:44 +03:00
max-klaus
181d0d048f
Merge pull request #10044 from osmandapp/import_export_data
Import export tracks and av notes
2020-10-22 19:35:07 +03:00
Vitaliy
77289a53aa Fix file name for global export 2020-10-22 15:15:34 +03:00
Vitaliy
260adb89c1 Add global settings import 2020-10-22 13:32:28 +03:00
Dima-1
f146edc72c Import/export offline maps 2020-10-22 11:29:41 +03:00
vshcherb
24c1cf1bc9
Merge pull request #10043 from eighthave/patch-1
support incoming content:// URIs pointing to OBF files
2020-10-21 20:07:09 +02:00
Vitaliy
46c5c04a01 Add global settings and multiple profiles export 2020-10-21 17:52:27 +03:00
androiddevkkotlin
50ff060486 Favorites: Allow to share the same name if favorites belong to different groups 2020-10-21 16:45:00 +03:00
Dima-1
3bee12f626 Merge branch 'master' into imp_exp_osm_note 2020-10-21 15:56:41 +03:00
Dima-1
d89d48474a Import OSM Edit tags 2020-10-21 15:41:36 +03:00
Vitaliy
4272eaf93c remove unnecessary changes 2020-10-21 11:43:17 +03:00
Vitaliy
257d27277b remove unnecessary changes 2020-10-21 10:41:07 +03:00
Vitaliy
799d6481b6 remove unnecessary changes 2020-10-21 10:38:16 +03:00
Vitaliy
4f5f22fdc2 fix empty space 2020-10-21 10:34:11 +03:00
Vitaliy
d6bc456600 Remove outdated osm plugin activity 2020-10-21 01:25:01 +03:00
Vitaliy
433b2b8739 Add OAuth prefs to new osm plugin settings screen 2020-10-21 01:06:35 +03:00
Dima-1
1d6a0b39b7 Import OSM Edit 2020-10-20 18:48:41 +03:00
Vitaliy
9b3eeecf89 Remove outdated plugin settings screens 2020-10-20 14:59:57 +03:00
Vitaliy
3abbffa491 Fix profile button visibility for plugin settings 2020-10-20 14:39:55 +03:00
Vitaliy
7670733f38
Merge pull request #10045 from osmandapp/Favorites_duplication
Favorites duplication with same name
2020-10-20 04:26:34 +03:00
androiddevkkotlin
e21066eefe Favorites duplication with same name 2020-10-19 22:15:00 +03:00
Dima-1
4021d38635 Import OSM Note 2020-10-19 18:36:13 +03:00
androiddevkkotlin
aecff42374 Method rename 2020-10-19 16:05:15 +03:00
Hans-Christoph Steiner
7e5d9b381b
support incoming content:// URIs pointing to OBF files
The whole "handle import" plumbing is already in place to handle both file:// and content:// URIs for OBF files.  The `ObfImportTask` gets an `InputStream` from the `ContentResolver` already.  `handleContentImport` defers to the `handleFileImport` for which helper to instantiate.  Supporting content:// URIs here means this import can happen via `FileProvider` and other `ContentProvider` instances.

My use case is offline sharing of OBF files as handled by F-Droid Nearby Swap.  Users can select which installed OBF files to share, then nearby users can connect to the device via Bluetooth or local WiFi to get the files.
2020-10-19 12:11:10 +00:00
Hardy
2af22671a9
remove accidental commit 2020-10-18 21:14:44 +02:00
Vitaliy
834080be31 Merge branch 'master' into plugins_settings 2020-10-18 22:09:38 +03:00
Hardy
8ef0ac74d3
Merge pull request #10039 from osmandapp/hardy_testing
update test branch
2020-10-18 21:07:17 +02:00
vshcherb
ffbf3477ba
Merge pull request #10038 from osmandapp/Category-names-poi
[bug] category names in user defined search converted to lowercase
2020-10-18 19:36:00 +02:00
Victor Shcherb
684f2b95d7 Fix java/C++ rendering rules property - should match types 2020-10-18 11:55:23 +02:00
androiddevkkotlin
63f06c3d39 [bug] category names in user defined search converted to lowercase 2020-10-18 12:52:16 +03:00
Victor Shcherb
0bc9008b9f Change order 2020-10-18 02:37:52 +02:00
Victor Shcherb
07c297a95a Fix parse complex properties 2020-10-18 02:28:44 +02:00
Victor Shcherb
28fdd139fb Fix empty progress 2020-10-17 15:15:08 +02:00
xmd5a
146e97f3dc Fix phrase (fix https://github.com/osmandapp/OsmAnd/issues/9992) 2020-10-16 21:23:36 +03:00
Dima-1
d676cb3d55 Export OSM Note, OSM Edit 2020-10-16 19:21:03 +03:00
Victor Shcherb
3b892f875a Merge 2020-10-16 14:44:26 +02:00
xmd5a
71401a2b25 Add phrases 2020-10-16 13:15:05 +03:00
xmd5a
97849a86ad Add phrase 2020-10-16 13:10:10 +03:00
Vitaliy
dafcc711d0
Merge pull request #10032 from osmandapp/Text-field-jumps-and-loose-underline
Update poi_tag_list_item.xml
2020-10-16 12:07:03 +03:00
androiddevkkotlin
082007f810 return height 2020-10-16 11:57:50 +03:00
androiddevkkotlin
5e2678f4d7 Update poi_tag_list_item.xml
Text field jumps and loose underline
2020-10-16 11:41:20 +03:00
Vitaliy
a7af2a3cf0 Fix subfolders for files import 2020-10-16 01:16:42 +03:00
Vitaliy
fe83d70d66 Add tracks to import/export 2020-10-16 00:48:32 +03:00
Vitaliy
1308d16e97 Add multimedia notes to import/export 2020-10-16 00:13:30 +03:00
androiddevkkotlin
de6ba4d14e Delete shadow.xml 2020-10-15 23:23:12 +03:00
androiddevkkotlin
e91252033a Update TrackAppearanceFragment.java
ShadowAnimation
2020-10-15 23:21:55 +03:00
Vitaliy
997c2d00b1
Merge pull request #10031 from osmandapp/Broken-text-fields
Broken text fields in Create POI screen
2020-10-15 22:21:32 +03:00