From e2356d05dabef82d8622ff05a27e4d26f7e00ed5 Mon Sep 17 00:00:00 2001 From: Chumva Date: Thu, 10 Oct 2019 14:58:50 +0300 Subject: [PATCH] Fix customization nav drawer items --- OsmAnd/src/net/osmand/aidl/OsmandAidlService.java | 9 +++++---- OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java index b183462bfc..0b7409b321 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlService.java @@ -1278,16 +1278,17 @@ public class OsmandAidlService extends Service implements AidlCallbackListener { }; private void setCustomization(OsmandAidlApi api, CustomizationInfoParams params) { - OsmandSettingsParams settingsParams = params.getSettingsParams(); - if (settingsParams != null) { - api.customizeOsmandSettings(settingsParams.getSharedPreferencesName(), settingsParams.getBundle()); - } NavDrawerHeaderParams navDrawerHeaderParams = params.getNavDrawerHeaderParams(); NavDrawerFooterParams navDrawerFooterParams = params.getNavDrawerFooterParams(); SetNavDrawerItemsParams navDrawerItemsParams = params.getNavDrawerItemsParams(); setNavDrawerParams(api, navDrawerHeaderParams, navDrawerFooterParams, navDrawerItemsParams); + OsmandSettingsParams settingsParams = params.getSettingsParams(); + if (settingsParams != null) { + api.customizeOsmandSettings(settingsParams.getSharedPreferencesName(), settingsParams.getBundle()); + } + ArrayList visibilityWidgetsParams = params.getVisibilityWidgetsParams(); ArrayList availabilityWidgetsParams = params.getAvailabilityWidgetsParams(); diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java index 518987b1c5..fc6b5b3d45 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java @@ -1228,16 +1228,17 @@ public class OsmandAidlServiceV2 extends Service implements AidlCallbackListener }; private void setCustomization(OsmandAidlApi api, CustomizationInfoParams params) { - OsmandSettingsParams settingsParams = params.getSettingsParams(); - if (settingsParams != null) { - api.customizeOsmandSettings(settingsParams.getSharedPreferencesName(), settingsParams.getBundle()); - } NavDrawerHeaderParams navDrawerHeaderParams = params.getNavDrawerHeaderParams(); NavDrawerFooterParams navDrawerFooterParams = params.getNavDrawerFooterParams(); SetNavDrawerItemsParams navDrawerItemsParams = params.getNavDrawerItemsParams(); setNavDrawerParams(api, navDrawerHeaderParams, navDrawerFooterParams, navDrawerItemsParams); + OsmandSettingsParams settingsParams = params.getSettingsParams(); + if (settingsParams != null) { + api.customizeOsmandSettings(settingsParams.getSharedPreferencesName(), settingsParams.getBundle()); + } + ArrayList visibilityWidgetsParams = params.getVisibilityWidgetsParams(); ArrayList availabilityWidgetsParams = params.getAvailabilityWidgetsParams();