From 3c99117dbbff7929c19232f01a51f80826a03cd2 Mon Sep 17 00:00:00 2001 From: jkoan Date: Fri, 30 Oct 2020 08:40:13 +0100 Subject: fix:build:android:Add extra security check for gradle. Just add the security check as mentioned in https://gitlab.com/fdroid/fdroiddata/-/issues/1843 --- gradle/wrapper/gradle-wrapper.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 25f587d12..7292aa85e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,3 +3,4 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip +distributionSha256Sum=33214524e686838c88a88e14e8b30e2323589cc9698186bc8e0594758b132b31 -- cgit v1.2.1 From 6819fe255df971f78e8a011b6374f1e9c7740d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20H=C3=B6hn?= Date: Sat, 31 Oct 2020 13:41:52 +0100 Subject: fix:core:osd:Altitude in metric with imperial defined * cleaned version of the patch by 1096 * fix issue of sanity check --- navit/osd/core/osd_core.c | 57 +++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index cfbb0655c..40ea4350d 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -8,13 +8,13 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. + * Boston, MA 02110-1301, USA. */ #include "config.h" @@ -450,7 +450,7 @@ static void osd_route_guard_init(struct osd_priv_common *opc, struct navit *nav) while ((map=mapset_next(msh, 1))) { struct attr attr; if(map_get_attr(map, attr_name, &attr, NULL)) { - if( ! strcmp(this->map_name, attr.u.str) ) { + if(!strcmp(this->map_name, attr.u.str) ) { mr=map_rect_new(map, NULL); if (mr) { while ((item=map_rect_get_item(mr))) { @@ -740,7 +740,7 @@ static void draw_aligned_osd_text(char *buffer, int align, struct osd_item *osd_ } while (*last) { - if (! g_ascii_isspace(*last)) { + if (!g_ascii_isspace(*last)) { lines++; break; } @@ -830,7 +830,7 @@ static void osd_odometer_draw(struct osd_priv_common *opc, struct navit *nav, st int secs; int imperial=0; - char buffer [256+1]=""; + char buffer[256+1]=""; char buffer2[256+1]=""; if(nav) { @@ -903,7 +903,7 @@ static void osd_odometer_draw(struct osd_priv_common *opc, struct navit *nav, st time_buffer = g_strdup_printf("%02d:%02d:%02d",hours,mins,secs); } - buffer [0] = 0; + buffer[0] = 0; buffer2[0] = 0; if(this->text) { str_replace(buffer,this->text,"${avg_spd}",spd_buffer); @@ -2473,11 +2473,11 @@ static void osd_speed_cam_draw(struct osd_priv_common *opc, struct navit *navit, } if(this_->text) { - char buffer [256]=""; + char buffer[256]=""; char buffer2[256]=""; char dir_str[16]; char spd_str[16]; - buffer [0] = 0; + buffer[0] = 0; buffer2[0] = 0; osd_fill_with_bgcolor(&opc->osd_item); @@ -2692,7 +2692,7 @@ static void osd_speed_warner_draw(struct osd_priv_common *opc, struct navit *nav img = this->img_active; } } else { - osd_color = this-> grey; + osd_color = this->grey; img = this->img_off; this->announce_state = eNoWarn; } @@ -2898,6 +2898,19 @@ static char *osd_text_format_attr(struct attr *attr, char *format, int imperial) case attr_position_speed: return format_speed(*attr->u.numd,"",format,imperial); case attr_position_height: + /** + * johnk 8/13/2020 + * if format is "feet" then return feet + * else + * if format is "imperial" + * return meters or feet as controlled by "imperial" + * return meters + */ + if (format && + (!strcmp(format, "feet") || (!strcmp(format, "imperial") && imperial == 1))) { + return (format_float_0(*attr->u.numd * FEET_PER_METER) ); + } + return (format_float_0(*attr->u.numd) ); case attr_position_direction: return format_float_0(*attr->u.numd); case attr_position_magnetic_direction: @@ -2966,7 +2979,7 @@ static char *osd_text_format_attr(struct attr *attr, char *format, int imperial) if (!strcmp(format,"value") || !strcmp(format,"unit")) { char *ret,*tmp=format_distance(attr->u.num," ",imperial); char *pos=strchr(tmp,' '); - if (! pos) + if (!pos) return tmp; *pos++='\0'; if (!strcmp(format,"value")) @@ -2982,7 +2995,7 @@ static char *osd_text_format_attr(struct attr *attr, char *format, int imperial) } else { if (strstr(format, "local;") == format) { textt = iso8601_to_secs(attr->u.str); - memcpy ((void *) &tm, (void *) localtime(&textt), sizeof(tm)); + memcpy((void *) &tm, (void *) localtime(&textt), sizeof(tm)); strftime(buffer, sizeof(buffer), (char *)(format + 6), &tm); } else if ((sscanf(format, "%*c%2d:%2d;", &(text_tm.tm_hour), &(text_tm.tm_min)) == 2) && (strchr("+-", format[0]))) { if (strchr("-", format[0])) { @@ -2990,7 +3003,7 @@ static char *osd_text_format_attr(struct attr *attr, char *format, int imperial) } else { textt = iso8601_to_secs(attr->u.str) + text_tm.tm_hour * 3600 + text_tm.tm_min * 60; } - memcpy ((void *) &tm, (void *) gmtime(&textt), sizeof(tm)); + memcpy((void *) &tm, (void *) gmtime(&textt), sizeof(tm)); strftime(buffer, sizeof(buffer), &format[strcspn(format, ";") + 1], &tm); } else { sscanf(attr->u.str, "%4d-%2d-%2dT%2d:%2d:%2d", &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday), &(tm.tm_hour), &(tm.tm_min), @@ -3214,7 +3227,7 @@ static void osd_text_draw(struct osd_priv_common *opc, struct navit *navit, stru } while (*last) { - if (! g_ascii_isspace(*last)) { + if (!g_ascii_isspace(*last)) { lines++; break; } @@ -3336,7 +3349,7 @@ static void osd_text_prepare(struct osd_priv_common *opc, struct navit *nav) { } end=strstr(start,"}"); - if (! end) + if (!end) break; *end++='\0'; @@ -3525,7 +3538,7 @@ static void osd_gps_status_draw(struct osd_priv_common *opc, struct navit *navit if (gr_image) { p.x = (opc->osd_item.w - gr_image->width) / 2; p.y = (opc->osd_item.h - gr_image->height) / 2; - graphics_draw_image(opc->osd_item.gr, opc->osd_item. graphic_fg, &p, gr_image); + graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_fg, &p, gr_image); graphics_image_free(opc->osd_item.gr, gr_image); } g_free(image); @@ -3611,7 +3624,7 @@ static void osd_volume_draw(struct osd_priv_common *opc, struct navit *navit, st if (gr_image) { p.x = (opc->osd_item.w - gr_image->width) / 2; p.y = (opc->osd_item.h - gr_image->height) / 2; - graphics_draw_image(opc->osd_item.gr, opc->osd_item. graphic_fg, &p, gr_image); + graphics_draw_image(opc->osd_item.gr, opc->osd_item.graphic_fg, &p, gr_image); graphics_image_free(opc->osd_item.gr, gr_image); } g_free(image); @@ -3643,7 +3656,7 @@ static void osd_volume_init(struct osd_priv_common *opc, struct navit *nav) { struct volume *this = (struct volume *)opc->data; osd_set_std_graphic(nav, &opc->osd_item, (struct osd_priv *)opc); - navit_add_callback(nav, this->click_cb = callback_new_attr_1(callback_cast (osd_volume_click), attr_button, opc)); + navit_add_callback(nav, this->click_cb = callback_new_attr_1(callback_cast(osd_volume_click), attr_button, opc)); osd_volume_draw(opc, nav, NULL); } @@ -3827,7 +3840,7 @@ static struct osd_priv *osd_scale_new(struct navit *nav, struct osd_methods *met osd_set_std_attr(attrs, &opc->osd_item, TRANSPARENT_BG | ITEM_HAS_TEXT); - navit_add_callback(nav, this->navit_init_cb = callback_new_attr_1(callback_cast (osd_scale_init), attr_graphics_ready, + navit_add_callback(nav, this->navit_init_cb = callback_new_attr_1(callback_cast(osd_scale_init), attr_graphics_ready, opc)); return (struct osd_priv *) opc; @@ -3891,17 +3904,17 @@ static void osd_auxmap_init(struct osd_priv_common *opc, struct navit *nav) { struct color red= {0xffff,0x0,0x0,0xffff}; this->nav=nav; - if (! navit_get_attr(nav, attr_graphics, &attr, NULL)) + if (!navit_get_attr(nav, attr_graphics, &attr, NULL)) return; gra=attr.u.graphics; graphics_add_callback(gra, callback_new_attr_1(callback_cast(osd_auxmap_draw), attr_postdraw, opc)); - if (! navit_get_attr(nav, attr_transformation, &attr, NULL)) + if (!navit_get_attr(nav, attr_transformation, &attr, NULL)) return; this->ntrans=attr.u.transformation; - if (! navit_get_attr(nav, attr_displaylist, &attr, NULL)) + if (!navit_get_attr(nav, attr_displaylist, &attr, NULL) ) return; this->displaylist=attr.u.displaylist; - if (! navit_get_attr(nav, attr_layout, &attr, NULL)) + if (!navit_get_attr(nav, attr_layout, &attr, NULL)) return; this->layout=attr.u.layout; osd_set_std_graphic(nav, &opc->osd_item, NULL); -- cgit v1.2.1 From 12478f599efa93ae70deeedf0049e261d5d766ec Mon Sep 17 00:00:00 2001 From: jkoan Date: Sun, 25 Oct 2020 17:13:06 +0100 Subject: fix:build:core:Fix two issues where the wrong enum type is used, but both have the same value of 0 --- navit/command.c | 2 +- navit/map/binfile/binfile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/navit/command.c b/navit/command.c index cc498b1a7..f2c6c0bb0 100644 --- a/navit/command.c +++ b/navit/command.c @@ -158,7 +158,7 @@ static void result_free(struct result *res) { attr_free_content(&res->attr); res->allocated=0; } else { - res->attr.type=type_none; + res->attr.type=attr_none; res->attr.u.data=NULL; } } diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c index 6108154b6..ab65dcaf5 100644 --- a/navit/map/binfile/binfile.c +++ b/navit/map/binfile/binfile.c @@ -565,7 +565,7 @@ static int binfile_attr_get(void *priv_data, enum attr_type attr_type, struct at size_rem-=subsize+1; i++; } - mr->attrs[i].type=type_none; + mr->attrs[i].type=attr_none; mr->attrs[i].u.data=NULL; attr->u.attrs=mr->attrs; } else { -- cgit v1.2.1 From 3ab88d4794003dfce1f340b83e4ccf9f50ba4ef7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 3 Nov 2020 14:04:38 -0700 Subject: Fix:plugin/j1850: Replace graphic_fg_white with graphic_fg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Looks like this was missed in: 46f67d8937cfef6158eeee6e5ed039d29fc1b8f7 Fixes: j1850.c:319:46: error: ‘struct osd_item’ has no member named ‘graphic_fg_white’ Signed-off-by: James Hilliard --- navit/plugin/j1850/j1850.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/navit/plugin/j1850/j1850.c b/navit/plugin/j1850/j1850.c index 69a9b8fa5..bdef8a4fa 100644 --- a/navit/plugin/j1850/j1850.c +++ b/navit/plugin/j1850/j1850.c @@ -316,7 +316,7 @@ static void osd_j1850_init(struct j1850 *this, struct navit *nav) { graphics_gc_set_linewidth(this->white, this->width); - graphics_gc_set_linewidth(this->osd_item.graphic_fg_white, this->width); + graphics_gc_set_linewidth(this->osd_item.graphic_fg, this->width); event_add_timeout(500, 1, callback_new_1(callback_cast(osd_j1850_draw), this)); -- cgit v1.2.1 From bd72e1d06c27c2627ae48ce9777bf7aadd42f320 Mon Sep 17 00:00:00 2001 From: mvglasow Date: Mon, 3 Aug 2020 19:53:27 +0200 Subject: Fix:build:Prevent try_compile() from choking on CXX Signed-off-by: mvglasow --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f392e1f92..24be236e4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.2) set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.navitproject.navit") set(MACOSX_BUNDLE_BUNDLE_NAME "Navit") message(STATUS "Building with CMake V${CMAKE_VERSION}") -project(navit C) +project(navit C CXX) # Workaround for CMake issue 8345 / 9220, see http://trac.navit-project.org/ticket/1041 if(DEFINED CMAKE_CXX_COMPILER AND CMAKE_CXX_COMPILER MATCHES "^$") -- cgit v1.2.1 From 805a55515d53aac767b4665c985eb01a4117400b Mon Sep 17 00:00:00 2001 From: mvglasow Date: Sun, 8 Nov 2020 19:42:18 +0200 Subject: Add:port/android:Adaptive app icon Signed-off-by: mvglasow --- navit/android/AndroidManifest.xml | 2 +- .../res/drawable-hdpi/ic_launcher_background.png | Bin 0 -> 613 bytes .../res/drawable-hdpi/ic_launcher_foreground.png | Bin 0 -> 3358 bytes .../res/drawable-ldpi/ic_launcher_background.png | Bin 0 -> 377 bytes .../res/drawable-ldpi/ic_launcher_foreground.png | Bin 0 -> 1558 bytes .../res/drawable-mdpi/ic_launcher_background.png | Bin 0 -> 443 bytes .../res/drawable-mdpi/ic_launcher_foreground.png | Bin 0 -> 1976 bytes .../res/drawable-xhdpi/ic_launcher_background.png | Bin 0 -> 771 bytes .../res/drawable-xhdpi/ic_launcher_foreground.png | Bin 0 -> 4582 bytes .../res/drawable-xxhdpi/ic_launcher_background.png | Bin 0 -> 1242 bytes .../res/drawable-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 7210 bytes .../android/res/mipmap-anydpi-v26/ic_launcher.xml | 5 + navit/android/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 4562 bytes navit/android/res/mipmap-ldpi/ic_launcher.png | Bin 0 -> 2092 bytes navit/android/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2868 bytes navit/android/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 6201 bytes navit/android/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 9396 bytes navit/icons/ic_launcher_background.svg | 140 +++++++++++++++++++++ navit/icons/ic_launcher_foreground.svg | 140 +++++++++++++++++++++ 19 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 navit/android/res/drawable-hdpi/ic_launcher_background.png create mode 100644 navit/android/res/drawable-hdpi/ic_launcher_foreground.png create mode 100644 navit/android/res/drawable-ldpi/ic_launcher_background.png create mode 100644 navit/android/res/drawable-ldpi/ic_launcher_foreground.png create mode 100644 navit/android/res/drawable-mdpi/ic_launcher_background.png create mode 100644 navit/android/res/drawable-mdpi/ic_launcher_foreground.png create mode 100644 navit/android/res/drawable-xhdpi/ic_launcher_background.png create mode 100644 navit/android/res/drawable-xhdpi/ic_launcher_foreground.png create mode 100644 navit/android/res/drawable-xxhdpi/ic_launcher_background.png create mode 100644 navit/android/res/drawable-xxhdpi/ic_launcher_foreground.png create mode 100644 navit/android/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 navit/android/res/mipmap-hdpi/ic_launcher.png create mode 100644 navit/android/res/mipmap-ldpi/ic_launcher.png create mode 100644 navit/android/res/mipmap-mdpi/ic_launcher.png create mode 100644 navit/android/res/mipmap-xhdpi/ic_launcher.png create mode 100644 navit/android/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 navit/icons/ic_launcher_background.svg create mode 100644 navit/icons/ic_launcher_foreground.svg diff --git a/navit/android/AndroidManifest.xml b/navit/android/AndroidManifest.xml index 004ccb707..b9e646097 100644 --- a/navit/android/AndroidManifest.xml +++ b/navit/android/AndroidManifest.xml @@ -17,7 +17,7 @@ android:usesCleartextTraffic="true" android:allowBackup="true" android:fullBackupContent="@xml/navit_backup_rules" - android:icon="@drawable/icon" + android:icon="@mipmap/ic_launcher" android:name=".NavitAppConfig"> + + + + diff --git a/navit/android/res/mipmap-hdpi/ic_launcher.png b/navit/android/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..ce18b5780 Binary files /dev/null and b/navit/android/res/mipmap-hdpi/ic_launcher.png differ diff --git a/navit/android/res/mipmap-ldpi/ic_launcher.png b/navit/android/res/mipmap-ldpi/ic_launcher.png new file mode 100644 index 000000000..183e2f829 Binary files /dev/null and b/navit/android/res/mipmap-ldpi/ic_launcher.png differ diff --git a/navit/android/res/mipmap-mdpi/ic_launcher.png b/navit/android/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..1bde1888e Binary files /dev/null and b/navit/android/res/mipmap-mdpi/ic_launcher.png differ diff --git a/navit/android/res/mipmap-xhdpi/ic_launcher.png b/navit/android/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..041c61c03 Binary files /dev/null and b/navit/android/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/navit/android/res/mipmap-xxhdpi/ic_launcher.png b/navit/android/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..ad89bd0b5 Binary files /dev/null and b/navit/android/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/navit/icons/ic_launcher_background.svg b/navit/icons/ic_launcher_background.svg new file mode 100644 index 000000000..ab3fe6bd9 --- /dev/null +++ b/navit/icons/ic_launcher_background.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/navit/icons/ic_launcher_foreground.svg b/navit/icons/ic_launcher_foreground.svg new file mode 100644 index 000000000..ef4b12452 --- /dev/null +++ b/navit/icons/ic_launcher_foreground.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + -- cgit v1.2.1 From 310570bacdd06319f6a38246902aedd986ecc8ce Mon Sep 17 00:00:00 2001 From: jkoan Date: Wed, 14 Oct 2020 12:29:35 +0200 Subject: fix:android:Add possibility to use background position usage --- navit/android/src/org/navitproject/navit/Navit.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/navit/android/src/org/navitproject/navit/Navit.java b/navit/android/src/org/navitproject/navit/Navit.java index bacc15213..a9cad9be5 100644 --- a/navit/android/src/org/navitproject/navit/Navit.java +++ b/navit/android/src/org/navitproject/navit/Navit.java @@ -248,10 +248,15 @@ public class Navit extends Activity { private void verifyPermissions() { if (ContextCompat.checkSelfPermission(this, - Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { + Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) { + return; + } else if (ContextCompat.checkSelfPermission(this, + Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED) { + return; + } else { Log.d(TAG,"ask for permission(s)"); ActivityCompat.requestPermissions(this, new String[] { - Manifest.permission.ACCESS_FINE_LOCATION}, MY_PERMISSIONS_REQ_FINE_LOC); + Manifest.permission.ACCESS_BACKGROUND_LOCATION}, MY_PERMISSIONS_REQ_FINE_LOC); } } -- cgit v1.2.1