diff --git a/LastenradBayern/TINK.Android/MainActivity.cs b/LastenradBayern/TINK.Android/MainActivity.cs index d53dddf..1b7d31f 100644 --- a/LastenradBayern/TINK.Android/MainActivity.cs +++ b/LastenradBayern/TINK.Android/MainActivity.cs @@ -4,7 +4,6 @@ using Android.Content.PM; using Android.OS; using Android.Content; using Java.Interop; -using Plugin.Permissions; namespace TINK.Droid { @@ -52,13 +51,7 @@ namespace TINK.Droid { Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); } - else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions)) - { - // Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing. - // see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details. - PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults); - } - + base.OnRequestPermissionsResult(requestCode, permissions, grantResults); } diff --git a/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs b/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs index 342eb27..703727b 100644 --- a/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs +++ b/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs @@ -29,228 +29,6 @@ namespace TINK.Droid global::PCLCrypto.Resource.String.Hello = global::TINK.Droid.Resource.String.Hello; global::PCLStorage.Resource.String.ApplicationName = global::TINK.Droid.Resource.String.ApplicationName; global::PCLStorage.Resource.String.Hello = global::TINK.Droid.Resource.String.Hello; - global::Plugin.Permissions.Resource.Attribute.alpha = global::TINK.Droid.Resource.Attribute.alpha; - global::Plugin.Permissions.Resource.Attribute.coordinatorLayoutStyle = global::TINK.Droid.Resource.Attribute.coordinatorLayoutStyle; - global::Plugin.Permissions.Resource.Attribute.font = global::TINK.Droid.Resource.Attribute.font; - global::Plugin.Permissions.Resource.Attribute.fontProviderAuthority = global::TINK.Droid.Resource.Attribute.fontProviderAuthority; - global::Plugin.Permissions.Resource.Attribute.fontProviderCerts = global::TINK.Droid.Resource.Attribute.fontProviderCerts; - global::Plugin.Permissions.Resource.Attribute.fontProviderFetchStrategy = global::TINK.Droid.Resource.Attribute.fontProviderFetchStrategy; - global::Plugin.Permissions.Resource.Attribute.fontProviderFetchTimeout = global::TINK.Droid.Resource.Attribute.fontProviderFetchTimeout; - global::Plugin.Permissions.Resource.Attribute.fontProviderPackage = global::TINK.Droid.Resource.Attribute.fontProviderPackage; - global::Plugin.Permissions.Resource.Attribute.fontProviderQuery = global::TINK.Droid.Resource.Attribute.fontProviderQuery; - global::Plugin.Permissions.Resource.Attribute.fontStyle = global::TINK.Droid.Resource.Attribute.fontStyle; - global::Plugin.Permissions.Resource.Attribute.fontVariationSettings = global::TINK.Droid.Resource.Attribute.fontVariationSettings; - global::Plugin.Permissions.Resource.Attribute.fontWeight = global::TINK.Droid.Resource.Attribute.fontWeight; - global::Plugin.Permissions.Resource.Attribute.keylines = global::TINK.Droid.Resource.Attribute.keylines; - global::Plugin.Permissions.Resource.Attribute.layout_anchor = global::TINK.Droid.Resource.Attribute.layout_anchor; - global::Plugin.Permissions.Resource.Attribute.layout_anchorGravity = global::TINK.Droid.Resource.Attribute.layout_anchorGravity; - global::Plugin.Permissions.Resource.Attribute.layout_behavior = global::TINK.Droid.Resource.Attribute.layout_behavior; - global::Plugin.Permissions.Resource.Attribute.layout_dodgeInsetEdges = global::TINK.Droid.Resource.Attribute.layout_dodgeInsetEdges; - global::Plugin.Permissions.Resource.Attribute.layout_insetEdge = global::TINK.Droid.Resource.Attribute.layout_insetEdge; - global::Plugin.Permissions.Resource.Attribute.layout_keyline = global::TINK.Droid.Resource.Attribute.layout_keyline; - global::Plugin.Permissions.Resource.Attribute.statusBarBackground = global::TINK.Droid.Resource.Attribute.statusBarBackground; - global::Plugin.Permissions.Resource.Attribute.ttcIndex = global::TINK.Droid.Resource.Attribute.ttcIndex; - global::Plugin.Permissions.Resource.Color.browser_actions_bg_grey = global::TINK.Droid.Resource.Color.browser_actions_bg_grey; - global::Plugin.Permissions.Resource.Color.browser_actions_divider_color = global::TINK.Droid.Resource.Color.browser_actions_divider_color; - global::Plugin.Permissions.Resource.Color.browser_actions_text_color = global::TINK.Droid.Resource.Color.browser_actions_text_color; - global::Plugin.Permissions.Resource.Color.browser_actions_title_color = global::TINK.Droid.Resource.Color.browser_actions_title_color; - global::Plugin.Permissions.Resource.Color.notification_action_color_filter = global::TINK.Droid.Resource.Color.notification_action_color_filter; - global::Plugin.Permissions.Resource.Color.notification_icon_bg_color = global::TINK.Droid.Resource.Color.notification_icon_bg_color; - global::Plugin.Permissions.Resource.Color.ripple_material_light = global::TINK.Droid.Resource.Color.ripple_material_light; - global::Plugin.Permissions.Resource.Color.secondary_text_default_material_light = global::TINK.Droid.Resource.Color.secondary_text_default_material_light; - global::Plugin.Permissions.Resource.Dimension.browser_actions_context_menu_max_width = global::TINK.Droid.Resource.Dimension.browser_actions_context_menu_max_width; - global::Plugin.Permissions.Resource.Dimension.browser_actions_context_menu_min_padding = global::TINK.Droid.Resource.Dimension.browser_actions_context_menu_min_padding; - global::Plugin.Permissions.Resource.Dimension.compat_button_inset_horizontal_material = global::TINK.Droid.Resource.Dimension.compat_button_inset_horizontal_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_inset_vertical_material = global::TINK.Droid.Resource.Dimension.compat_button_inset_vertical_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_padding_horizontal_material = global::TINK.Droid.Resource.Dimension.compat_button_padding_horizontal_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_padding_vertical_material = global::TINK.Droid.Resource.Dimension.compat_button_padding_vertical_material; - global::Plugin.Permissions.Resource.Dimension.compat_control_corner_material = global::TINK.Droid.Resource.Dimension.compat_control_corner_material; - global::Plugin.Permissions.Resource.Dimension.compat_notification_large_icon_max_height = global::TINK.Droid.Resource.Dimension.compat_notification_large_icon_max_height; - global::Plugin.Permissions.Resource.Dimension.compat_notification_large_icon_max_width = global::TINK.Droid.Resource.Dimension.compat_notification_large_icon_max_width; - global::Plugin.Permissions.Resource.Dimension.notification_action_icon_size = global::TINK.Droid.Resource.Dimension.notification_action_icon_size; - global::Plugin.Permissions.Resource.Dimension.notification_action_text_size = global::TINK.Droid.Resource.Dimension.notification_action_text_size; - global::Plugin.Permissions.Resource.Dimension.notification_big_circle_margin = global::TINK.Droid.Resource.Dimension.notification_big_circle_margin; - global::Plugin.Permissions.Resource.Dimension.notification_content_margin_start = global::TINK.Droid.Resource.Dimension.notification_content_margin_start; - global::Plugin.Permissions.Resource.Dimension.notification_large_icon_height = global::TINK.Droid.Resource.Dimension.notification_large_icon_height; - global::Plugin.Permissions.Resource.Dimension.notification_large_icon_width = global::TINK.Droid.Resource.Dimension.notification_large_icon_width; - global::Plugin.Permissions.Resource.Dimension.notification_main_column_padding_top = global::TINK.Droid.Resource.Dimension.notification_main_column_padding_top; - global::Plugin.Permissions.Resource.Dimension.notification_media_narrow_margin = global::TINK.Droid.Resource.Dimension.notification_media_narrow_margin; - global::Plugin.Permissions.Resource.Dimension.notification_right_icon_size = global::TINK.Droid.Resource.Dimension.notification_right_icon_size; - global::Plugin.Permissions.Resource.Dimension.notification_right_side_padding_top = global::TINK.Droid.Resource.Dimension.notification_right_side_padding_top; - global::Plugin.Permissions.Resource.Dimension.notification_small_icon_background_padding = global::TINK.Droid.Resource.Dimension.notification_small_icon_background_padding; - global::Plugin.Permissions.Resource.Dimension.notification_small_icon_size_as_large = global::TINK.Droid.Resource.Dimension.notification_small_icon_size_as_large; - global::Plugin.Permissions.Resource.Dimension.notification_subtext_size = global::TINK.Droid.Resource.Dimension.notification_subtext_size; - global::Plugin.Permissions.Resource.Dimension.notification_top_pad = global::TINK.Droid.Resource.Dimension.notification_top_pad; - global::Plugin.Permissions.Resource.Dimension.notification_top_pad_large_text = global::TINK.Droid.Resource.Dimension.notification_top_pad_large_text; - global::Plugin.Permissions.Resource.Drawable.notification_action_background = global::TINK.Droid.Resource.Drawable.notification_action_background; - global::Plugin.Permissions.Resource.Drawable.notification_bg = global::TINK.Droid.Resource.Drawable.notification_bg; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low = global::TINK.Droid.Resource.Drawable.notification_bg_low; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low_normal = global::TINK.Droid.Resource.Drawable.notification_bg_low_normal; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low_pressed = global::TINK.Droid.Resource.Drawable.notification_bg_low_pressed; - global::Plugin.Permissions.Resource.Drawable.notification_bg_normal = global::TINK.Droid.Resource.Drawable.notification_bg_normal; - global::Plugin.Permissions.Resource.Drawable.notification_bg_normal_pressed = global::TINK.Droid.Resource.Drawable.notification_bg_normal_pressed; - global::Plugin.Permissions.Resource.Drawable.notification_icon_background = global::TINK.Droid.Resource.Drawable.notification_icon_background; - global::Plugin.Permissions.Resource.Drawable.notification_template_icon_bg = global::TINK.Droid.Resource.Drawable.notification_template_icon_bg; - global::Plugin.Permissions.Resource.Drawable.notification_template_icon_low_bg = global::TINK.Droid.Resource.Drawable.notification_template_icon_low_bg; - global::Plugin.Permissions.Resource.Drawable.notification_tile_bg = global::TINK.Droid.Resource.Drawable.notification_tile_bg; - global::Plugin.Permissions.Resource.Drawable.notify_panel_notification_icon_bg = global::TINK.Droid.Resource.Drawable.notify_panel_notification_icon_bg; - global::Plugin.Permissions.Resource.Id.accessibility_action_clickable_span = global::TINK.Droid.Resource.Id.accessibility_action_clickable_span; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_0 = global::TINK.Droid.Resource.Id.accessibility_custom_action_0; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_1 = global::TINK.Droid.Resource.Id.accessibility_custom_action_1; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_10 = global::TINK.Droid.Resource.Id.accessibility_custom_action_10; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_11 = global::TINK.Droid.Resource.Id.accessibility_custom_action_11; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_12 = global::TINK.Droid.Resource.Id.accessibility_custom_action_12; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_13 = global::TINK.Droid.Resource.Id.accessibility_custom_action_13; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_14 = global::TINK.Droid.Resource.Id.accessibility_custom_action_14; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_15 = global::TINK.Droid.Resource.Id.accessibility_custom_action_15; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_16 = global::TINK.Droid.Resource.Id.accessibility_custom_action_16; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_17 = global::TINK.Droid.Resource.Id.accessibility_custom_action_17; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_18 = global::TINK.Droid.Resource.Id.accessibility_custom_action_18; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_19 = global::TINK.Droid.Resource.Id.accessibility_custom_action_19; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_2 = global::TINK.Droid.Resource.Id.accessibility_custom_action_2; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_20 = global::TINK.Droid.Resource.Id.accessibility_custom_action_20; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_21 = global::TINK.Droid.Resource.Id.accessibility_custom_action_21; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_22 = global::TINK.Droid.Resource.Id.accessibility_custom_action_22; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_23 = global::TINK.Droid.Resource.Id.accessibility_custom_action_23; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_24 = global::TINK.Droid.Resource.Id.accessibility_custom_action_24; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_25 = global::TINK.Droid.Resource.Id.accessibility_custom_action_25; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_26 = global::TINK.Droid.Resource.Id.accessibility_custom_action_26; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_27 = global::TINK.Droid.Resource.Id.accessibility_custom_action_27; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_28 = global::TINK.Droid.Resource.Id.accessibility_custom_action_28; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_29 = global::TINK.Droid.Resource.Id.accessibility_custom_action_29; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_3 = global::TINK.Droid.Resource.Id.accessibility_custom_action_3; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_30 = global::TINK.Droid.Resource.Id.accessibility_custom_action_30; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_31 = global::TINK.Droid.Resource.Id.accessibility_custom_action_31; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_4 = global::TINK.Droid.Resource.Id.accessibility_custom_action_4; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_5 = global::TINK.Droid.Resource.Id.accessibility_custom_action_5; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_6 = global::TINK.Droid.Resource.Id.accessibility_custom_action_6; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_7 = global::TINK.Droid.Resource.Id.accessibility_custom_action_7; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_8 = global::TINK.Droid.Resource.Id.accessibility_custom_action_8; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_9 = global::TINK.Droid.Resource.Id.accessibility_custom_action_9; - global::Plugin.Permissions.Resource.Id.actions = global::TINK.Droid.Resource.Id.actions; - global::Plugin.Permissions.Resource.Id.action_container = global::TINK.Droid.Resource.Id.action_container; - global::Plugin.Permissions.Resource.Id.action_divider = global::TINK.Droid.Resource.Id.action_divider; - global::Plugin.Permissions.Resource.Id.action_image = global::TINK.Droid.Resource.Id.action_image; - global::Plugin.Permissions.Resource.Id.action_text = global::TINK.Droid.Resource.Id.action_text; - global::Plugin.Permissions.Resource.Id.all = global::TINK.Droid.Resource.Id.all; - global::Plugin.Permissions.Resource.Id.async = global::TINK.Droid.Resource.Id.async; - global::Plugin.Permissions.Resource.Id.blocking = global::TINK.Droid.Resource.Id.blocking; - global::Plugin.Permissions.Resource.Id.bottom = global::TINK.Droid.Resource.Id.bottom; - global::Plugin.Permissions.Resource.Id.browser_actions_header_text = global::TINK.Droid.Resource.Id.browser_actions_header_text; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_items = global::TINK.Droid.Resource.Id.browser_actions_menu_items; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_item_icon = global::TINK.Droid.Resource.Id.browser_actions_menu_item_icon; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_item_text = global::TINK.Droid.Resource.Id.browser_actions_menu_item_text; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_view = global::TINK.Droid.Resource.Id.browser_actions_menu_view; - global::Plugin.Permissions.Resource.Id.center = global::TINK.Droid.Resource.Id.center; - global::Plugin.Permissions.Resource.Id.center_horizontal = global::TINK.Droid.Resource.Id.center_horizontal; - global::Plugin.Permissions.Resource.Id.center_vertical = global::TINK.Droid.Resource.Id.center_vertical; - global::Plugin.Permissions.Resource.Id.chronometer = global::TINK.Droid.Resource.Id.chronometer; - global::Plugin.Permissions.Resource.Id.clip_horizontal = global::TINK.Droid.Resource.Id.clip_horizontal; - global::Plugin.Permissions.Resource.Id.clip_vertical = global::TINK.Droid.Resource.Id.clip_vertical; - global::Plugin.Permissions.Resource.Id.dialog_button = global::TINK.Droid.Resource.Id.dialog_button; - global::Plugin.Permissions.Resource.Id.end = global::TINK.Droid.Resource.Id.end; - global::Plugin.Permissions.Resource.Id.fill = global::TINK.Droid.Resource.Id.fill; - global::Plugin.Permissions.Resource.Id.fill_horizontal = global::TINK.Droid.Resource.Id.fill_horizontal; - global::Plugin.Permissions.Resource.Id.fill_vertical = global::TINK.Droid.Resource.Id.fill_vertical; - global::Plugin.Permissions.Resource.Id.forever = global::TINK.Droid.Resource.Id.forever; - global::Plugin.Permissions.Resource.Id.icon = global::TINK.Droid.Resource.Id.icon; - global::Plugin.Permissions.Resource.Id.icon_group = global::TINK.Droid.Resource.Id.icon_group; - global::Plugin.Permissions.Resource.Id.info = global::TINK.Droid.Resource.Id.info; - global::Plugin.Permissions.Resource.Id.italic = global::TINK.Droid.Resource.Id.italic; - global::Plugin.Permissions.Resource.Id.left = global::TINK.Droid.Resource.Id.left; - global::Plugin.Permissions.Resource.Id.line1 = global::TINK.Droid.Resource.Id.line1; - global::Plugin.Permissions.Resource.Id.line3 = global::TINK.Droid.Resource.Id.line3; - global::Plugin.Permissions.Resource.Id.none = global::TINK.Droid.Resource.Id.none; - global::Plugin.Permissions.Resource.Id.normal = global::TINK.Droid.Resource.Id.normal; - global::Plugin.Permissions.Resource.Id.notification_background = global::TINK.Droid.Resource.Id.notification_background; - global::Plugin.Permissions.Resource.Id.notification_main_column = global::TINK.Droid.Resource.Id.notification_main_column; - global::Plugin.Permissions.Resource.Id.notification_main_column_container = global::TINK.Droid.Resource.Id.notification_main_column_container; - global::Plugin.Permissions.Resource.Id.right = global::TINK.Droid.Resource.Id.right; - global::Plugin.Permissions.Resource.Id.right_icon = global::TINK.Droid.Resource.Id.right_icon; - global::Plugin.Permissions.Resource.Id.right_side = global::TINK.Droid.Resource.Id.right_side; - global::Plugin.Permissions.Resource.Id.start = global::TINK.Droid.Resource.Id.start; - global::Plugin.Permissions.Resource.Id.tag_accessibility_actions = global::TINK.Droid.Resource.Id.tag_accessibility_actions; - global::Plugin.Permissions.Resource.Id.tag_accessibility_clickable_spans = global::TINK.Droid.Resource.Id.tag_accessibility_clickable_spans; - global::Plugin.Permissions.Resource.Id.tag_accessibility_heading = global::TINK.Droid.Resource.Id.tag_accessibility_heading; - global::Plugin.Permissions.Resource.Id.tag_accessibility_pane_title = global::TINK.Droid.Resource.Id.tag_accessibility_pane_title; - global::Plugin.Permissions.Resource.Id.tag_screen_reader_focusable = global::TINK.Droid.Resource.Id.tag_screen_reader_focusable; - global::Plugin.Permissions.Resource.Id.tag_transition_group = global::TINK.Droid.Resource.Id.tag_transition_group; - global::Plugin.Permissions.Resource.Id.tag_unhandled_key_event_manager = global::TINK.Droid.Resource.Id.tag_unhandled_key_event_manager; - global::Plugin.Permissions.Resource.Id.tag_unhandled_key_listeners = global::TINK.Droid.Resource.Id.tag_unhandled_key_listeners; - global::Plugin.Permissions.Resource.Id.text = global::TINK.Droid.Resource.Id.text; - global::Plugin.Permissions.Resource.Id.text2 = global::TINK.Droid.Resource.Id.text2; - global::Plugin.Permissions.Resource.Id.time = global::TINK.Droid.Resource.Id.time; - global::Plugin.Permissions.Resource.Id.title = global::TINK.Droid.Resource.Id.title; - global::Plugin.Permissions.Resource.Id.top = global::TINK.Droid.Resource.Id.top; - global::Plugin.Permissions.Resource.Integer.status_bar_notification_info_maxnum = global::TINK.Droid.Resource.Integer.status_bar_notification_info_maxnum; - global::Plugin.Permissions.Resource.Layout.browser_actions_context_menu_page = global::TINK.Droid.Resource.Layout.browser_actions_context_menu_page; - global::Plugin.Permissions.Resource.Layout.browser_actions_context_menu_row = global::TINK.Droid.Resource.Layout.browser_actions_context_menu_row; - global::Plugin.Permissions.Resource.Layout.custom_dialog = global::TINK.Droid.Resource.Layout.custom_dialog; - global::Plugin.Permissions.Resource.Layout.notification_action = global::TINK.Droid.Resource.Layout.notification_action; - global::Plugin.Permissions.Resource.Layout.notification_action_tombstone = global::TINK.Droid.Resource.Layout.notification_action_tombstone; - global::Plugin.Permissions.Resource.Layout.notification_template_custom_big = global::TINK.Droid.Resource.Layout.notification_template_custom_big; - global::Plugin.Permissions.Resource.Layout.notification_template_icon_group = global::TINK.Droid.Resource.Layout.notification_template_icon_group; - global::Plugin.Permissions.Resource.Layout.notification_template_part_chronometer = global::TINK.Droid.Resource.Layout.notification_template_part_chronometer; - global::Plugin.Permissions.Resource.Layout.notification_template_part_time = global::TINK.Droid.Resource.Layout.notification_template_part_time; - global::Plugin.Permissions.Resource.String.status_bar_notification_info_overflow = global::TINK.Droid.Resource.String.status_bar_notification_info_overflow; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Info = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Info; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Line2 = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Line2; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Time = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Time; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Title = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Title; - global::Plugin.Permissions.Resource.Style.Widget_Compat_NotificationActionContainer = global::TINK.Droid.Resource.Style.Widget_Compat_NotificationActionContainer; - global::Plugin.Permissions.Resource.Style.Widget_Compat_NotificationActionText = global::TINK.Droid.Resource.Style.Widget_Compat_NotificationActionText; - global::Plugin.Permissions.Resource.Style.Widget_Support_CoordinatorLayout = global::TINK.Droid.Resource.Style.Widget_Support_CoordinatorLayout; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem = global::TINK.Droid.Resource.Styleable.ColorStateListItem; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_alpha = global::TINK.Droid.Resource.Styleable.ColorStateListItem_alpha; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_android_alpha = global::TINK.Droid.Resource.Styleable.ColorStateListItem_android_alpha; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_android_color = global::TINK.Droid.Resource.Styleable.ColorStateListItem_android_color; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout = global::TINK.Droid.Resource.Styleable.CoordinatorLayout; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_keylines = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_keylines; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_anchorGravity = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_anchorGravity; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_behavior = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_behavior; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_statusBarBackground = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_statusBarBackground; - global::Plugin.Permissions.Resource.Styleable.FontFamily = global::TINK.Droid.Resource.Styleable.FontFamily; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont = global::TINK.Droid.Resource.Styleable.FontFamilyFont; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_font = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_font; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontStyle = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontStyle; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontVariationSettings = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontVariationSettings; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontWeight = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontWeight; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_ttcIndex = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_ttcIndex; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_font = global::TINK.Droid.Resource.Styleable.FontFamilyFont_font; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontStyle = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontStyle; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontVariationSettings = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontVariationSettings; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontWeight = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontWeight; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_ttcIndex = global::TINK.Droid.Resource.Styleable.FontFamilyFont_ttcIndex; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderAuthority = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderAuthority; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderCerts = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderCerts; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderFetchStrategy; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderFetchTimeout; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderPackage = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderPackage; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderQuery = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderQuery; - global::Plugin.Permissions.Resource.Styleable.GradientColor = global::TINK.Droid.Resource.Styleable.GradientColor; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem = global::TINK.Droid.Resource.Styleable.GradientColorItem; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem_android_color = global::TINK.Droid.Resource.Styleable.GradientColorItem_android_color; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem_android_offset = global::TINK.Droid.Resource.Styleable.GradientColorItem_android_offset; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerX = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerY = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_endColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endX = global::TINK.Droid.Resource.Styleable.GradientColor_android_endX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endY = global::TINK.Droid.Resource.Styleable.GradientColor_android_endY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_gradientRadius = global::TINK.Droid.Resource.Styleable.GradientColor_android_gradientRadius; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_startColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startX = global::TINK.Droid.Resource.Styleable.GradientColor_android_startX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startY = global::TINK.Droid.Resource.Styleable.GradientColor_android_startY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_tileMode = global::TINK.Droid.Resource.Styleable.GradientColor_android_tileMode; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_type = global::TINK.Droid.Resource.Styleable.GradientColor_android_type; - global::Plugin.Permissions.Resource.Xml.xamarin_essentials_fileprovider_file_paths = global::TINK.Droid.Resource.Xml.xamarin_essentials_fileprovider_file_paths; global::Xamarin.Auth.Resource.Animation.slide_in_right = global::TINK.Droid.Resource.Animation.slide_in_right; global::Xamarin.Auth.Resource.Animation.slide_out_left = global::TINK.Droid.Resource.Animation.slide_out_left; global::Xamarin.Auth.Resource.Attribute.alpha = global::TINK.Droid.Resource.Attribute.alpha; diff --git a/LastenradBayern/TINK/App.xaml.cs b/LastenradBayern/TINK/App.xaml.cs index c53dd3f..2e42308 100644 --- a/LastenradBayern/TINK/App.xaml.cs +++ b/LastenradBayern/TINK/App.xaml.cs @@ -15,7 +15,6 @@ using MonkeyCache.FileStore; using Plugin.Connectivity; using System.Threading; using TINK.Model.Settings; -using Plugin.Permissions; using TINK.Services.BluetoothLock.Crypto; using TINK.Model.Services.Geolocation; using TINK.Services; @@ -152,7 +151,6 @@ namespace TINK DependencyService.Get(), specialFolders, new Cipher(), - null, // Permissions, no more used. #if ARENDI DependencyService.Get(), #else @@ -284,7 +282,7 @@ namespace TINK if (_PermissionsService != null) return _PermissionsService; - _PermissionsService = new Services.Permissions.Plugin.Permissions(); + _PermissionsService = new Services.Permissions.Essentials.Permissions(); return _PermissionsService; } } diff --git a/LastenradBayern/TINK/HtmlResouces/V02/InfoLicenses.html b/LastenradBayern/TINK/HtmlResouces/V02/InfoLicenses.html index 6c5e7aa..ed4f74c 100644 --- a/LastenradBayern/TINK/HtmlResouces/V02/InfoLicenses.html +++ b/LastenradBayern/TINK/HtmlResouces/V02/InfoLicenses.html @@ -33,7 +33,6 @@ PCLStorage von Daniel Plaisted Microsoft Public License (Ms-PL) Pinvoke von AArnott MIT- Lizenz für Pinvoke Plugin.BLE Adrian Seceleanu, Sven-Michael Stübe Apache License 2.0 - Plugin.Permissions von James Montemagno MIT Lizenz 2016 Polly von Michael Wolfenden, App vNext New BSD License Serilog von Serilog Contributors Apache License 2.0 Serilog.Sinks.Debug von Serilog Contributors Apache License 2.0 diff --git a/Meinkonrad/TINK.Android/MainActivity.cs b/Meinkonrad/TINK.Android/MainActivity.cs index 9c9af7f..6d41ea5 100644 --- a/Meinkonrad/TINK.Android/MainActivity.cs +++ b/Meinkonrad/TINK.Android/MainActivity.cs @@ -4,7 +4,6 @@ using Android.Content.PM; using Android.OS; using Android.Content; using Java.Interop; -using Plugin.Permissions; namespace TINK.Droid { @@ -52,12 +51,6 @@ namespace TINK.Droid { Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); } - else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions)) - { - // Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing. - // see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details. - PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults); - } base.OnRequestPermissionsResult(requestCode, permissions, grantResults); } diff --git a/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs b/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs index 342eb27..703727b 100644 --- a/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs +++ b/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs @@ -29,228 +29,6 @@ namespace TINK.Droid global::PCLCrypto.Resource.String.Hello = global::TINK.Droid.Resource.String.Hello; global::PCLStorage.Resource.String.ApplicationName = global::TINK.Droid.Resource.String.ApplicationName; global::PCLStorage.Resource.String.Hello = global::TINK.Droid.Resource.String.Hello; - global::Plugin.Permissions.Resource.Attribute.alpha = global::TINK.Droid.Resource.Attribute.alpha; - global::Plugin.Permissions.Resource.Attribute.coordinatorLayoutStyle = global::TINK.Droid.Resource.Attribute.coordinatorLayoutStyle; - global::Plugin.Permissions.Resource.Attribute.font = global::TINK.Droid.Resource.Attribute.font; - global::Plugin.Permissions.Resource.Attribute.fontProviderAuthority = global::TINK.Droid.Resource.Attribute.fontProviderAuthority; - global::Plugin.Permissions.Resource.Attribute.fontProviderCerts = global::TINK.Droid.Resource.Attribute.fontProviderCerts; - global::Plugin.Permissions.Resource.Attribute.fontProviderFetchStrategy = global::TINK.Droid.Resource.Attribute.fontProviderFetchStrategy; - global::Plugin.Permissions.Resource.Attribute.fontProviderFetchTimeout = global::TINK.Droid.Resource.Attribute.fontProviderFetchTimeout; - global::Plugin.Permissions.Resource.Attribute.fontProviderPackage = global::TINK.Droid.Resource.Attribute.fontProviderPackage; - global::Plugin.Permissions.Resource.Attribute.fontProviderQuery = global::TINK.Droid.Resource.Attribute.fontProviderQuery; - global::Plugin.Permissions.Resource.Attribute.fontStyle = global::TINK.Droid.Resource.Attribute.fontStyle; - global::Plugin.Permissions.Resource.Attribute.fontVariationSettings = global::TINK.Droid.Resource.Attribute.fontVariationSettings; - global::Plugin.Permissions.Resource.Attribute.fontWeight = global::TINK.Droid.Resource.Attribute.fontWeight; - global::Plugin.Permissions.Resource.Attribute.keylines = global::TINK.Droid.Resource.Attribute.keylines; - global::Plugin.Permissions.Resource.Attribute.layout_anchor = global::TINK.Droid.Resource.Attribute.layout_anchor; - global::Plugin.Permissions.Resource.Attribute.layout_anchorGravity = global::TINK.Droid.Resource.Attribute.layout_anchorGravity; - global::Plugin.Permissions.Resource.Attribute.layout_behavior = global::TINK.Droid.Resource.Attribute.layout_behavior; - global::Plugin.Permissions.Resource.Attribute.layout_dodgeInsetEdges = global::TINK.Droid.Resource.Attribute.layout_dodgeInsetEdges; - global::Plugin.Permissions.Resource.Attribute.layout_insetEdge = global::TINK.Droid.Resource.Attribute.layout_insetEdge; - global::Plugin.Permissions.Resource.Attribute.layout_keyline = global::TINK.Droid.Resource.Attribute.layout_keyline; - global::Plugin.Permissions.Resource.Attribute.statusBarBackground = global::TINK.Droid.Resource.Attribute.statusBarBackground; - global::Plugin.Permissions.Resource.Attribute.ttcIndex = global::TINK.Droid.Resource.Attribute.ttcIndex; - global::Plugin.Permissions.Resource.Color.browser_actions_bg_grey = global::TINK.Droid.Resource.Color.browser_actions_bg_grey; - global::Plugin.Permissions.Resource.Color.browser_actions_divider_color = global::TINK.Droid.Resource.Color.browser_actions_divider_color; - global::Plugin.Permissions.Resource.Color.browser_actions_text_color = global::TINK.Droid.Resource.Color.browser_actions_text_color; - global::Plugin.Permissions.Resource.Color.browser_actions_title_color = global::TINK.Droid.Resource.Color.browser_actions_title_color; - global::Plugin.Permissions.Resource.Color.notification_action_color_filter = global::TINK.Droid.Resource.Color.notification_action_color_filter; - global::Plugin.Permissions.Resource.Color.notification_icon_bg_color = global::TINK.Droid.Resource.Color.notification_icon_bg_color; - global::Plugin.Permissions.Resource.Color.ripple_material_light = global::TINK.Droid.Resource.Color.ripple_material_light; - global::Plugin.Permissions.Resource.Color.secondary_text_default_material_light = global::TINK.Droid.Resource.Color.secondary_text_default_material_light; - global::Plugin.Permissions.Resource.Dimension.browser_actions_context_menu_max_width = global::TINK.Droid.Resource.Dimension.browser_actions_context_menu_max_width; - global::Plugin.Permissions.Resource.Dimension.browser_actions_context_menu_min_padding = global::TINK.Droid.Resource.Dimension.browser_actions_context_menu_min_padding; - global::Plugin.Permissions.Resource.Dimension.compat_button_inset_horizontal_material = global::TINK.Droid.Resource.Dimension.compat_button_inset_horizontal_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_inset_vertical_material = global::TINK.Droid.Resource.Dimension.compat_button_inset_vertical_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_padding_horizontal_material = global::TINK.Droid.Resource.Dimension.compat_button_padding_horizontal_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_padding_vertical_material = global::TINK.Droid.Resource.Dimension.compat_button_padding_vertical_material; - global::Plugin.Permissions.Resource.Dimension.compat_control_corner_material = global::TINK.Droid.Resource.Dimension.compat_control_corner_material; - global::Plugin.Permissions.Resource.Dimension.compat_notification_large_icon_max_height = global::TINK.Droid.Resource.Dimension.compat_notification_large_icon_max_height; - global::Plugin.Permissions.Resource.Dimension.compat_notification_large_icon_max_width = global::TINK.Droid.Resource.Dimension.compat_notification_large_icon_max_width; - global::Plugin.Permissions.Resource.Dimension.notification_action_icon_size = global::TINK.Droid.Resource.Dimension.notification_action_icon_size; - global::Plugin.Permissions.Resource.Dimension.notification_action_text_size = global::TINK.Droid.Resource.Dimension.notification_action_text_size; - global::Plugin.Permissions.Resource.Dimension.notification_big_circle_margin = global::TINK.Droid.Resource.Dimension.notification_big_circle_margin; - global::Plugin.Permissions.Resource.Dimension.notification_content_margin_start = global::TINK.Droid.Resource.Dimension.notification_content_margin_start; - global::Plugin.Permissions.Resource.Dimension.notification_large_icon_height = global::TINK.Droid.Resource.Dimension.notification_large_icon_height; - global::Plugin.Permissions.Resource.Dimension.notification_large_icon_width = global::TINK.Droid.Resource.Dimension.notification_large_icon_width; - global::Plugin.Permissions.Resource.Dimension.notification_main_column_padding_top = global::TINK.Droid.Resource.Dimension.notification_main_column_padding_top; - global::Plugin.Permissions.Resource.Dimension.notification_media_narrow_margin = global::TINK.Droid.Resource.Dimension.notification_media_narrow_margin; - global::Plugin.Permissions.Resource.Dimension.notification_right_icon_size = global::TINK.Droid.Resource.Dimension.notification_right_icon_size; - global::Plugin.Permissions.Resource.Dimension.notification_right_side_padding_top = global::TINK.Droid.Resource.Dimension.notification_right_side_padding_top; - global::Plugin.Permissions.Resource.Dimension.notification_small_icon_background_padding = global::TINK.Droid.Resource.Dimension.notification_small_icon_background_padding; - global::Plugin.Permissions.Resource.Dimension.notification_small_icon_size_as_large = global::TINK.Droid.Resource.Dimension.notification_small_icon_size_as_large; - global::Plugin.Permissions.Resource.Dimension.notification_subtext_size = global::TINK.Droid.Resource.Dimension.notification_subtext_size; - global::Plugin.Permissions.Resource.Dimension.notification_top_pad = global::TINK.Droid.Resource.Dimension.notification_top_pad; - global::Plugin.Permissions.Resource.Dimension.notification_top_pad_large_text = global::TINK.Droid.Resource.Dimension.notification_top_pad_large_text; - global::Plugin.Permissions.Resource.Drawable.notification_action_background = global::TINK.Droid.Resource.Drawable.notification_action_background; - global::Plugin.Permissions.Resource.Drawable.notification_bg = global::TINK.Droid.Resource.Drawable.notification_bg; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low = global::TINK.Droid.Resource.Drawable.notification_bg_low; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low_normal = global::TINK.Droid.Resource.Drawable.notification_bg_low_normal; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low_pressed = global::TINK.Droid.Resource.Drawable.notification_bg_low_pressed; - global::Plugin.Permissions.Resource.Drawable.notification_bg_normal = global::TINK.Droid.Resource.Drawable.notification_bg_normal; - global::Plugin.Permissions.Resource.Drawable.notification_bg_normal_pressed = global::TINK.Droid.Resource.Drawable.notification_bg_normal_pressed; - global::Plugin.Permissions.Resource.Drawable.notification_icon_background = global::TINK.Droid.Resource.Drawable.notification_icon_background; - global::Plugin.Permissions.Resource.Drawable.notification_template_icon_bg = global::TINK.Droid.Resource.Drawable.notification_template_icon_bg; - global::Plugin.Permissions.Resource.Drawable.notification_template_icon_low_bg = global::TINK.Droid.Resource.Drawable.notification_template_icon_low_bg; - global::Plugin.Permissions.Resource.Drawable.notification_tile_bg = global::TINK.Droid.Resource.Drawable.notification_tile_bg; - global::Plugin.Permissions.Resource.Drawable.notify_panel_notification_icon_bg = global::TINK.Droid.Resource.Drawable.notify_panel_notification_icon_bg; - global::Plugin.Permissions.Resource.Id.accessibility_action_clickable_span = global::TINK.Droid.Resource.Id.accessibility_action_clickable_span; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_0 = global::TINK.Droid.Resource.Id.accessibility_custom_action_0; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_1 = global::TINK.Droid.Resource.Id.accessibility_custom_action_1; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_10 = global::TINK.Droid.Resource.Id.accessibility_custom_action_10; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_11 = global::TINK.Droid.Resource.Id.accessibility_custom_action_11; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_12 = global::TINK.Droid.Resource.Id.accessibility_custom_action_12; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_13 = global::TINK.Droid.Resource.Id.accessibility_custom_action_13; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_14 = global::TINK.Droid.Resource.Id.accessibility_custom_action_14; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_15 = global::TINK.Droid.Resource.Id.accessibility_custom_action_15; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_16 = global::TINK.Droid.Resource.Id.accessibility_custom_action_16; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_17 = global::TINK.Droid.Resource.Id.accessibility_custom_action_17; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_18 = global::TINK.Droid.Resource.Id.accessibility_custom_action_18; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_19 = global::TINK.Droid.Resource.Id.accessibility_custom_action_19; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_2 = global::TINK.Droid.Resource.Id.accessibility_custom_action_2; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_20 = global::TINK.Droid.Resource.Id.accessibility_custom_action_20; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_21 = global::TINK.Droid.Resource.Id.accessibility_custom_action_21; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_22 = global::TINK.Droid.Resource.Id.accessibility_custom_action_22; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_23 = global::TINK.Droid.Resource.Id.accessibility_custom_action_23; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_24 = global::TINK.Droid.Resource.Id.accessibility_custom_action_24; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_25 = global::TINK.Droid.Resource.Id.accessibility_custom_action_25; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_26 = global::TINK.Droid.Resource.Id.accessibility_custom_action_26; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_27 = global::TINK.Droid.Resource.Id.accessibility_custom_action_27; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_28 = global::TINK.Droid.Resource.Id.accessibility_custom_action_28; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_29 = global::TINK.Droid.Resource.Id.accessibility_custom_action_29; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_3 = global::TINK.Droid.Resource.Id.accessibility_custom_action_3; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_30 = global::TINK.Droid.Resource.Id.accessibility_custom_action_30; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_31 = global::TINK.Droid.Resource.Id.accessibility_custom_action_31; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_4 = global::TINK.Droid.Resource.Id.accessibility_custom_action_4; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_5 = global::TINK.Droid.Resource.Id.accessibility_custom_action_5; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_6 = global::TINK.Droid.Resource.Id.accessibility_custom_action_6; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_7 = global::TINK.Droid.Resource.Id.accessibility_custom_action_7; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_8 = global::TINK.Droid.Resource.Id.accessibility_custom_action_8; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_9 = global::TINK.Droid.Resource.Id.accessibility_custom_action_9; - global::Plugin.Permissions.Resource.Id.actions = global::TINK.Droid.Resource.Id.actions; - global::Plugin.Permissions.Resource.Id.action_container = global::TINK.Droid.Resource.Id.action_container; - global::Plugin.Permissions.Resource.Id.action_divider = global::TINK.Droid.Resource.Id.action_divider; - global::Plugin.Permissions.Resource.Id.action_image = global::TINK.Droid.Resource.Id.action_image; - global::Plugin.Permissions.Resource.Id.action_text = global::TINK.Droid.Resource.Id.action_text; - global::Plugin.Permissions.Resource.Id.all = global::TINK.Droid.Resource.Id.all; - global::Plugin.Permissions.Resource.Id.async = global::TINK.Droid.Resource.Id.async; - global::Plugin.Permissions.Resource.Id.blocking = global::TINK.Droid.Resource.Id.blocking; - global::Plugin.Permissions.Resource.Id.bottom = global::TINK.Droid.Resource.Id.bottom; - global::Plugin.Permissions.Resource.Id.browser_actions_header_text = global::TINK.Droid.Resource.Id.browser_actions_header_text; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_items = global::TINK.Droid.Resource.Id.browser_actions_menu_items; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_item_icon = global::TINK.Droid.Resource.Id.browser_actions_menu_item_icon; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_item_text = global::TINK.Droid.Resource.Id.browser_actions_menu_item_text; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_view = global::TINK.Droid.Resource.Id.browser_actions_menu_view; - global::Plugin.Permissions.Resource.Id.center = global::TINK.Droid.Resource.Id.center; - global::Plugin.Permissions.Resource.Id.center_horizontal = global::TINK.Droid.Resource.Id.center_horizontal; - global::Plugin.Permissions.Resource.Id.center_vertical = global::TINK.Droid.Resource.Id.center_vertical; - global::Plugin.Permissions.Resource.Id.chronometer = global::TINK.Droid.Resource.Id.chronometer; - global::Plugin.Permissions.Resource.Id.clip_horizontal = global::TINK.Droid.Resource.Id.clip_horizontal; - global::Plugin.Permissions.Resource.Id.clip_vertical = global::TINK.Droid.Resource.Id.clip_vertical; - global::Plugin.Permissions.Resource.Id.dialog_button = global::TINK.Droid.Resource.Id.dialog_button; - global::Plugin.Permissions.Resource.Id.end = global::TINK.Droid.Resource.Id.end; - global::Plugin.Permissions.Resource.Id.fill = global::TINK.Droid.Resource.Id.fill; - global::Plugin.Permissions.Resource.Id.fill_horizontal = global::TINK.Droid.Resource.Id.fill_horizontal; - global::Plugin.Permissions.Resource.Id.fill_vertical = global::TINK.Droid.Resource.Id.fill_vertical; - global::Plugin.Permissions.Resource.Id.forever = global::TINK.Droid.Resource.Id.forever; - global::Plugin.Permissions.Resource.Id.icon = global::TINK.Droid.Resource.Id.icon; - global::Plugin.Permissions.Resource.Id.icon_group = global::TINK.Droid.Resource.Id.icon_group; - global::Plugin.Permissions.Resource.Id.info = global::TINK.Droid.Resource.Id.info; - global::Plugin.Permissions.Resource.Id.italic = global::TINK.Droid.Resource.Id.italic; - global::Plugin.Permissions.Resource.Id.left = global::TINK.Droid.Resource.Id.left; - global::Plugin.Permissions.Resource.Id.line1 = global::TINK.Droid.Resource.Id.line1; - global::Plugin.Permissions.Resource.Id.line3 = global::TINK.Droid.Resource.Id.line3; - global::Plugin.Permissions.Resource.Id.none = global::TINK.Droid.Resource.Id.none; - global::Plugin.Permissions.Resource.Id.normal = global::TINK.Droid.Resource.Id.normal; - global::Plugin.Permissions.Resource.Id.notification_background = global::TINK.Droid.Resource.Id.notification_background; - global::Plugin.Permissions.Resource.Id.notification_main_column = global::TINK.Droid.Resource.Id.notification_main_column; - global::Plugin.Permissions.Resource.Id.notification_main_column_container = global::TINK.Droid.Resource.Id.notification_main_column_container; - global::Plugin.Permissions.Resource.Id.right = global::TINK.Droid.Resource.Id.right; - global::Plugin.Permissions.Resource.Id.right_icon = global::TINK.Droid.Resource.Id.right_icon; - global::Plugin.Permissions.Resource.Id.right_side = global::TINK.Droid.Resource.Id.right_side; - global::Plugin.Permissions.Resource.Id.start = global::TINK.Droid.Resource.Id.start; - global::Plugin.Permissions.Resource.Id.tag_accessibility_actions = global::TINK.Droid.Resource.Id.tag_accessibility_actions; - global::Plugin.Permissions.Resource.Id.tag_accessibility_clickable_spans = global::TINK.Droid.Resource.Id.tag_accessibility_clickable_spans; - global::Plugin.Permissions.Resource.Id.tag_accessibility_heading = global::TINK.Droid.Resource.Id.tag_accessibility_heading; - global::Plugin.Permissions.Resource.Id.tag_accessibility_pane_title = global::TINK.Droid.Resource.Id.tag_accessibility_pane_title; - global::Plugin.Permissions.Resource.Id.tag_screen_reader_focusable = global::TINK.Droid.Resource.Id.tag_screen_reader_focusable; - global::Plugin.Permissions.Resource.Id.tag_transition_group = global::TINK.Droid.Resource.Id.tag_transition_group; - global::Plugin.Permissions.Resource.Id.tag_unhandled_key_event_manager = global::TINK.Droid.Resource.Id.tag_unhandled_key_event_manager; - global::Plugin.Permissions.Resource.Id.tag_unhandled_key_listeners = global::TINK.Droid.Resource.Id.tag_unhandled_key_listeners; - global::Plugin.Permissions.Resource.Id.text = global::TINK.Droid.Resource.Id.text; - global::Plugin.Permissions.Resource.Id.text2 = global::TINK.Droid.Resource.Id.text2; - global::Plugin.Permissions.Resource.Id.time = global::TINK.Droid.Resource.Id.time; - global::Plugin.Permissions.Resource.Id.title = global::TINK.Droid.Resource.Id.title; - global::Plugin.Permissions.Resource.Id.top = global::TINK.Droid.Resource.Id.top; - global::Plugin.Permissions.Resource.Integer.status_bar_notification_info_maxnum = global::TINK.Droid.Resource.Integer.status_bar_notification_info_maxnum; - global::Plugin.Permissions.Resource.Layout.browser_actions_context_menu_page = global::TINK.Droid.Resource.Layout.browser_actions_context_menu_page; - global::Plugin.Permissions.Resource.Layout.browser_actions_context_menu_row = global::TINK.Droid.Resource.Layout.browser_actions_context_menu_row; - global::Plugin.Permissions.Resource.Layout.custom_dialog = global::TINK.Droid.Resource.Layout.custom_dialog; - global::Plugin.Permissions.Resource.Layout.notification_action = global::TINK.Droid.Resource.Layout.notification_action; - global::Plugin.Permissions.Resource.Layout.notification_action_tombstone = global::TINK.Droid.Resource.Layout.notification_action_tombstone; - global::Plugin.Permissions.Resource.Layout.notification_template_custom_big = global::TINK.Droid.Resource.Layout.notification_template_custom_big; - global::Plugin.Permissions.Resource.Layout.notification_template_icon_group = global::TINK.Droid.Resource.Layout.notification_template_icon_group; - global::Plugin.Permissions.Resource.Layout.notification_template_part_chronometer = global::TINK.Droid.Resource.Layout.notification_template_part_chronometer; - global::Plugin.Permissions.Resource.Layout.notification_template_part_time = global::TINK.Droid.Resource.Layout.notification_template_part_time; - global::Plugin.Permissions.Resource.String.status_bar_notification_info_overflow = global::TINK.Droid.Resource.String.status_bar_notification_info_overflow; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Info = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Info; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Line2 = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Line2; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Time = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Time; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Title = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Title; - global::Plugin.Permissions.Resource.Style.Widget_Compat_NotificationActionContainer = global::TINK.Droid.Resource.Style.Widget_Compat_NotificationActionContainer; - global::Plugin.Permissions.Resource.Style.Widget_Compat_NotificationActionText = global::TINK.Droid.Resource.Style.Widget_Compat_NotificationActionText; - global::Plugin.Permissions.Resource.Style.Widget_Support_CoordinatorLayout = global::TINK.Droid.Resource.Style.Widget_Support_CoordinatorLayout; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem = global::TINK.Droid.Resource.Styleable.ColorStateListItem; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_alpha = global::TINK.Droid.Resource.Styleable.ColorStateListItem_alpha; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_android_alpha = global::TINK.Droid.Resource.Styleable.ColorStateListItem_android_alpha; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_android_color = global::TINK.Droid.Resource.Styleable.ColorStateListItem_android_color; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout = global::TINK.Droid.Resource.Styleable.CoordinatorLayout; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_keylines = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_keylines; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_anchorGravity = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_anchorGravity; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_behavior = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_behavior; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_statusBarBackground = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_statusBarBackground; - global::Plugin.Permissions.Resource.Styleable.FontFamily = global::TINK.Droid.Resource.Styleable.FontFamily; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont = global::TINK.Droid.Resource.Styleable.FontFamilyFont; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_font = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_font; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontStyle = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontStyle; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontVariationSettings = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontVariationSettings; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontWeight = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontWeight; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_ttcIndex = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_ttcIndex; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_font = global::TINK.Droid.Resource.Styleable.FontFamilyFont_font; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontStyle = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontStyle; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontVariationSettings = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontVariationSettings; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontWeight = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontWeight; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_ttcIndex = global::TINK.Droid.Resource.Styleable.FontFamilyFont_ttcIndex; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderAuthority = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderAuthority; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderCerts = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderCerts; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderFetchStrategy; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderFetchTimeout; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderPackage = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderPackage; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderQuery = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderQuery; - global::Plugin.Permissions.Resource.Styleable.GradientColor = global::TINK.Droid.Resource.Styleable.GradientColor; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem = global::TINK.Droid.Resource.Styleable.GradientColorItem; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem_android_color = global::TINK.Droid.Resource.Styleable.GradientColorItem_android_color; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem_android_offset = global::TINK.Droid.Resource.Styleable.GradientColorItem_android_offset; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerX = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerY = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_endColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endX = global::TINK.Droid.Resource.Styleable.GradientColor_android_endX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endY = global::TINK.Droid.Resource.Styleable.GradientColor_android_endY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_gradientRadius = global::TINK.Droid.Resource.Styleable.GradientColor_android_gradientRadius; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_startColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startX = global::TINK.Droid.Resource.Styleable.GradientColor_android_startX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startY = global::TINK.Droid.Resource.Styleable.GradientColor_android_startY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_tileMode = global::TINK.Droid.Resource.Styleable.GradientColor_android_tileMode; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_type = global::TINK.Droid.Resource.Styleable.GradientColor_android_type; - global::Plugin.Permissions.Resource.Xml.xamarin_essentials_fileprovider_file_paths = global::TINK.Droid.Resource.Xml.xamarin_essentials_fileprovider_file_paths; global::Xamarin.Auth.Resource.Animation.slide_in_right = global::TINK.Droid.Resource.Animation.slide_in_right; global::Xamarin.Auth.Resource.Animation.slide_out_left = global::TINK.Droid.Resource.Animation.slide_out_left; global::Xamarin.Auth.Resource.Attribute.alpha = global::TINK.Droid.Resource.Attribute.alpha; diff --git a/Meinkonrad/TINK/App.xaml.cs b/Meinkonrad/TINK/App.xaml.cs index 1c42034..9e21703 100644 --- a/Meinkonrad/TINK/App.xaml.cs +++ b/Meinkonrad/TINK/App.xaml.cs @@ -151,7 +151,6 @@ namespace TINK DependencyService.Get(), specialFolders, new Cipher(), - null, // Permissions, no more used. #if ARENDI DependencyService.Get(), #else @@ -283,7 +282,7 @@ namespace TINK if (_PermissionsService != null) return _PermissionsService; - _PermissionsService = new Services.Permissions.Plugin.Permissions(); + _PermissionsService = new Services.Permissions.Essentials.Permissions(); return _PermissionsService; } } diff --git a/Meinkonrad/TINK/HtmlResouces/V02/InfoLicenses.html b/Meinkonrad/TINK/HtmlResouces/V02/InfoLicenses.html index 6c5e7aa..ed4f74c 100644 --- a/Meinkonrad/TINK/HtmlResouces/V02/InfoLicenses.html +++ b/Meinkonrad/TINK/HtmlResouces/V02/InfoLicenses.html @@ -33,7 +33,6 @@ PCLStorage von Daniel Plaisted Microsoft Public License (Ms-PL) Pinvoke von AArnott MIT- Lizenz für Pinvoke Plugin.BLE Adrian Seceleanu, Sven-Michael Stübe Apache License 2.0 - Plugin.Permissions von James Montemagno MIT Lizenz 2016 Polly von Michael Wolfenden, App vNext New BSD License Serilog von Serilog Contributors Apache License 2.0 Serilog.Sinks.Debug von Serilog Contributors Apache License 2.0 diff --git a/TINK/TINK.Android/MainActivity.cs b/TINK/TINK.Android/MainActivity.cs index 323d188..633720c 100644 --- a/TINK/TINK.Android/MainActivity.cs +++ b/TINK/TINK.Android/MainActivity.cs @@ -4,7 +4,6 @@ using Android.Content.PM; using Android.OS; using Android.Content; using Java.Interop; -using Plugin.Permissions; namespace TINK.Droid { @@ -52,12 +51,6 @@ namespace TINK.Droid { Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); } - else if (App.PermissionsService.GetType() == typeof(TINK.Services.Permissions.Plugin.Permissions)) - { - // Bug in 3.0.244 and earlier versions of sharee.bike app: Call of PermissionsImplementation.Current.OnRequestedPermission result was missing. - // see https://dev.azure.com/TeilRad/sharee.bike%20Buchungsplattform/_workitems/edit/136 for further details. - PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults); - } base.OnRequestPermissionsResult(requestCode, permissions, grantResults); } diff --git a/TINK/TINK.Android/Resources/Resource.Designer.cs b/TINK/TINK.Android/Resources/Resource.Designer.cs index 4ebd2fa..3a69163 100644 --- a/TINK/TINK.Android/Resources/Resource.Designer.cs +++ b/TINK/TINK.Android/Resources/Resource.Designer.cs @@ -29,228 +29,6 @@ namespace TINK.Droid global::PCLCrypto.Resource.String.Hello = global::TINK.Droid.Resource.String.Hello; global::PCLStorage.Resource.String.ApplicationName = global::TINK.Droid.Resource.String.ApplicationName; global::PCLStorage.Resource.String.Hello = global::TINK.Droid.Resource.String.Hello; - global::Plugin.Permissions.Resource.Attribute.alpha = global::TINK.Droid.Resource.Attribute.alpha; - global::Plugin.Permissions.Resource.Attribute.coordinatorLayoutStyle = global::TINK.Droid.Resource.Attribute.coordinatorLayoutStyle; - global::Plugin.Permissions.Resource.Attribute.font = global::TINK.Droid.Resource.Attribute.font; - global::Plugin.Permissions.Resource.Attribute.fontProviderAuthority = global::TINK.Droid.Resource.Attribute.fontProviderAuthority; - global::Plugin.Permissions.Resource.Attribute.fontProviderCerts = global::TINK.Droid.Resource.Attribute.fontProviderCerts; - global::Plugin.Permissions.Resource.Attribute.fontProviderFetchStrategy = global::TINK.Droid.Resource.Attribute.fontProviderFetchStrategy; - global::Plugin.Permissions.Resource.Attribute.fontProviderFetchTimeout = global::TINK.Droid.Resource.Attribute.fontProviderFetchTimeout; - global::Plugin.Permissions.Resource.Attribute.fontProviderPackage = global::TINK.Droid.Resource.Attribute.fontProviderPackage; - global::Plugin.Permissions.Resource.Attribute.fontProviderQuery = global::TINK.Droid.Resource.Attribute.fontProviderQuery; - global::Plugin.Permissions.Resource.Attribute.fontStyle = global::TINK.Droid.Resource.Attribute.fontStyle; - global::Plugin.Permissions.Resource.Attribute.fontVariationSettings = global::TINK.Droid.Resource.Attribute.fontVariationSettings; - global::Plugin.Permissions.Resource.Attribute.fontWeight = global::TINK.Droid.Resource.Attribute.fontWeight; - global::Plugin.Permissions.Resource.Attribute.keylines = global::TINK.Droid.Resource.Attribute.keylines; - global::Plugin.Permissions.Resource.Attribute.layout_anchor = global::TINK.Droid.Resource.Attribute.layout_anchor; - global::Plugin.Permissions.Resource.Attribute.layout_anchorGravity = global::TINK.Droid.Resource.Attribute.layout_anchorGravity; - global::Plugin.Permissions.Resource.Attribute.layout_behavior = global::TINK.Droid.Resource.Attribute.layout_behavior; - global::Plugin.Permissions.Resource.Attribute.layout_dodgeInsetEdges = global::TINK.Droid.Resource.Attribute.layout_dodgeInsetEdges; - global::Plugin.Permissions.Resource.Attribute.layout_insetEdge = global::TINK.Droid.Resource.Attribute.layout_insetEdge; - global::Plugin.Permissions.Resource.Attribute.layout_keyline = global::TINK.Droid.Resource.Attribute.layout_keyline; - global::Plugin.Permissions.Resource.Attribute.statusBarBackground = global::TINK.Droid.Resource.Attribute.statusBarBackground; - global::Plugin.Permissions.Resource.Attribute.ttcIndex = global::TINK.Droid.Resource.Attribute.ttcIndex; - global::Plugin.Permissions.Resource.Color.browser_actions_bg_grey = global::TINK.Droid.Resource.Color.browser_actions_bg_grey; - global::Plugin.Permissions.Resource.Color.browser_actions_divider_color = global::TINK.Droid.Resource.Color.browser_actions_divider_color; - global::Plugin.Permissions.Resource.Color.browser_actions_text_color = global::TINK.Droid.Resource.Color.browser_actions_text_color; - global::Plugin.Permissions.Resource.Color.browser_actions_title_color = global::TINK.Droid.Resource.Color.browser_actions_title_color; - global::Plugin.Permissions.Resource.Color.notification_action_color_filter = global::TINK.Droid.Resource.Color.notification_action_color_filter; - global::Plugin.Permissions.Resource.Color.notification_icon_bg_color = global::TINK.Droid.Resource.Color.notification_icon_bg_color; - global::Plugin.Permissions.Resource.Color.ripple_material_light = global::TINK.Droid.Resource.Color.ripple_material_light; - global::Plugin.Permissions.Resource.Color.secondary_text_default_material_light = global::TINK.Droid.Resource.Color.secondary_text_default_material_light; - global::Plugin.Permissions.Resource.Dimension.browser_actions_context_menu_max_width = global::TINK.Droid.Resource.Dimension.browser_actions_context_menu_max_width; - global::Plugin.Permissions.Resource.Dimension.browser_actions_context_menu_min_padding = global::TINK.Droid.Resource.Dimension.browser_actions_context_menu_min_padding; - global::Plugin.Permissions.Resource.Dimension.compat_button_inset_horizontal_material = global::TINK.Droid.Resource.Dimension.compat_button_inset_horizontal_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_inset_vertical_material = global::TINK.Droid.Resource.Dimension.compat_button_inset_vertical_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_padding_horizontal_material = global::TINK.Droid.Resource.Dimension.compat_button_padding_horizontal_material; - global::Plugin.Permissions.Resource.Dimension.compat_button_padding_vertical_material = global::TINK.Droid.Resource.Dimension.compat_button_padding_vertical_material; - global::Plugin.Permissions.Resource.Dimension.compat_control_corner_material = global::TINK.Droid.Resource.Dimension.compat_control_corner_material; - global::Plugin.Permissions.Resource.Dimension.compat_notification_large_icon_max_height = global::TINK.Droid.Resource.Dimension.compat_notification_large_icon_max_height; - global::Plugin.Permissions.Resource.Dimension.compat_notification_large_icon_max_width = global::TINK.Droid.Resource.Dimension.compat_notification_large_icon_max_width; - global::Plugin.Permissions.Resource.Dimension.notification_action_icon_size = global::TINK.Droid.Resource.Dimension.notification_action_icon_size; - global::Plugin.Permissions.Resource.Dimension.notification_action_text_size = global::TINK.Droid.Resource.Dimension.notification_action_text_size; - global::Plugin.Permissions.Resource.Dimension.notification_big_circle_margin = global::TINK.Droid.Resource.Dimension.notification_big_circle_margin; - global::Plugin.Permissions.Resource.Dimension.notification_content_margin_start = global::TINK.Droid.Resource.Dimension.notification_content_margin_start; - global::Plugin.Permissions.Resource.Dimension.notification_large_icon_height = global::TINK.Droid.Resource.Dimension.notification_large_icon_height; - global::Plugin.Permissions.Resource.Dimension.notification_large_icon_width = global::TINK.Droid.Resource.Dimension.notification_large_icon_width; - global::Plugin.Permissions.Resource.Dimension.notification_main_column_padding_top = global::TINK.Droid.Resource.Dimension.notification_main_column_padding_top; - global::Plugin.Permissions.Resource.Dimension.notification_media_narrow_margin = global::TINK.Droid.Resource.Dimension.notification_media_narrow_margin; - global::Plugin.Permissions.Resource.Dimension.notification_right_icon_size = global::TINK.Droid.Resource.Dimension.notification_right_icon_size; - global::Plugin.Permissions.Resource.Dimension.notification_right_side_padding_top = global::TINK.Droid.Resource.Dimension.notification_right_side_padding_top; - global::Plugin.Permissions.Resource.Dimension.notification_small_icon_background_padding = global::TINK.Droid.Resource.Dimension.notification_small_icon_background_padding; - global::Plugin.Permissions.Resource.Dimension.notification_small_icon_size_as_large = global::TINK.Droid.Resource.Dimension.notification_small_icon_size_as_large; - global::Plugin.Permissions.Resource.Dimension.notification_subtext_size = global::TINK.Droid.Resource.Dimension.notification_subtext_size; - global::Plugin.Permissions.Resource.Dimension.notification_top_pad = global::TINK.Droid.Resource.Dimension.notification_top_pad; - global::Plugin.Permissions.Resource.Dimension.notification_top_pad_large_text = global::TINK.Droid.Resource.Dimension.notification_top_pad_large_text; - global::Plugin.Permissions.Resource.Drawable.notification_action_background = global::TINK.Droid.Resource.Drawable.notification_action_background; - global::Plugin.Permissions.Resource.Drawable.notification_bg = global::TINK.Droid.Resource.Drawable.notification_bg; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low = global::TINK.Droid.Resource.Drawable.notification_bg_low; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low_normal = global::TINK.Droid.Resource.Drawable.notification_bg_low_normal; - global::Plugin.Permissions.Resource.Drawable.notification_bg_low_pressed = global::TINK.Droid.Resource.Drawable.notification_bg_low_pressed; - global::Plugin.Permissions.Resource.Drawable.notification_bg_normal = global::TINK.Droid.Resource.Drawable.notification_bg_normal; - global::Plugin.Permissions.Resource.Drawable.notification_bg_normal_pressed = global::TINK.Droid.Resource.Drawable.notification_bg_normal_pressed; - global::Plugin.Permissions.Resource.Drawable.notification_icon_background = global::TINK.Droid.Resource.Drawable.notification_icon_background; - global::Plugin.Permissions.Resource.Drawable.notification_template_icon_bg = global::TINK.Droid.Resource.Drawable.notification_template_icon_bg; - global::Plugin.Permissions.Resource.Drawable.notification_template_icon_low_bg = global::TINK.Droid.Resource.Drawable.notification_template_icon_low_bg; - global::Plugin.Permissions.Resource.Drawable.notification_tile_bg = global::TINK.Droid.Resource.Drawable.notification_tile_bg; - global::Plugin.Permissions.Resource.Drawable.notify_panel_notification_icon_bg = global::TINK.Droid.Resource.Drawable.notify_panel_notification_icon_bg; - global::Plugin.Permissions.Resource.Id.accessibility_action_clickable_span = global::TINK.Droid.Resource.Id.accessibility_action_clickable_span; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_0 = global::TINK.Droid.Resource.Id.accessibility_custom_action_0; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_1 = global::TINK.Droid.Resource.Id.accessibility_custom_action_1; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_10 = global::TINK.Droid.Resource.Id.accessibility_custom_action_10; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_11 = global::TINK.Droid.Resource.Id.accessibility_custom_action_11; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_12 = global::TINK.Droid.Resource.Id.accessibility_custom_action_12; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_13 = global::TINK.Droid.Resource.Id.accessibility_custom_action_13; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_14 = global::TINK.Droid.Resource.Id.accessibility_custom_action_14; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_15 = global::TINK.Droid.Resource.Id.accessibility_custom_action_15; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_16 = global::TINK.Droid.Resource.Id.accessibility_custom_action_16; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_17 = global::TINK.Droid.Resource.Id.accessibility_custom_action_17; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_18 = global::TINK.Droid.Resource.Id.accessibility_custom_action_18; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_19 = global::TINK.Droid.Resource.Id.accessibility_custom_action_19; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_2 = global::TINK.Droid.Resource.Id.accessibility_custom_action_2; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_20 = global::TINK.Droid.Resource.Id.accessibility_custom_action_20; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_21 = global::TINK.Droid.Resource.Id.accessibility_custom_action_21; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_22 = global::TINK.Droid.Resource.Id.accessibility_custom_action_22; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_23 = global::TINK.Droid.Resource.Id.accessibility_custom_action_23; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_24 = global::TINK.Droid.Resource.Id.accessibility_custom_action_24; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_25 = global::TINK.Droid.Resource.Id.accessibility_custom_action_25; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_26 = global::TINK.Droid.Resource.Id.accessibility_custom_action_26; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_27 = global::TINK.Droid.Resource.Id.accessibility_custom_action_27; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_28 = global::TINK.Droid.Resource.Id.accessibility_custom_action_28; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_29 = global::TINK.Droid.Resource.Id.accessibility_custom_action_29; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_3 = global::TINK.Droid.Resource.Id.accessibility_custom_action_3; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_30 = global::TINK.Droid.Resource.Id.accessibility_custom_action_30; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_31 = global::TINK.Droid.Resource.Id.accessibility_custom_action_31; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_4 = global::TINK.Droid.Resource.Id.accessibility_custom_action_4; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_5 = global::TINK.Droid.Resource.Id.accessibility_custom_action_5; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_6 = global::TINK.Droid.Resource.Id.accessibility_custom_action_6; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_7 = global::TINK.Droid.Resource.Id.accessibility_custom_action_7; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_8 = global::TINK.Droid.Resource.Id.accessibility_custom_action_8; - global::Plugin.Permissions.Resource.Id.accessibility_custom_action_9 = global::TINK.Droid.Resource.Id.accessibility_custom_action_9; - global::Plugin.Permissions.Resource.Id.actions = global::TINK.Droid.Resource.Id.actions; - global::Plugin.Permissions.Resource.Id.action_container = global::TINK.Droid.Resource.Id.action_container; - global::Plugin.Permissions.Resource.Id.action_divider = global::TINK.Droid.Resource.Id.action_divider; - global::Plugin.Permissions.Resource.Id.action_image = global::TINK.Droid.Resource.Id.action_image; - global::Plugin.Permissions.Resource.Id.action_text = global::TINK.Droid.Resource.Id.action_text; - global::Plugin.Permissions.Resource.Id.all = global::TINK.Droid.Resource.Id.all; - global::Plugin.Permissions.Resource.Id.async = global::TINK.Droid.Resource.Id.async; - global::Plugin.Permissions.Resource.Id.blocking = global::TINK.Droid.Resource.Id.blocking; - global::Plugin.Permissions.Resource.Id.bottom = global::TINK.Droid.Resource.Id.bottom; - global::Plugin.Permissions.Resource.Id.browser_actions_header_text = global::TINK.Droid.Resource.Id.browser_actions_header_text; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_items = global::TINK.Droid.Resource.Id.browser_actions_menu_items; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_item_icon = global::TINK.Droid.Resource.Id.browser_actions_menu_item_icon; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_item_text = global::TINK.Droid.Resource.Id.browser_actions_menu_item_text; - global::Plugin.Permissions.Resource.Id.browser_actions_menu_view = global::TINK.Droid.Resource.Id.browser_actions_menu_view; - global::Plugin.Permissions.Resource.Id.center = global::TINK.Droid.Resource.Id.center; - global::Plugin.Permissions.Resource.Id.center_horizontal = global::TINK.Droid.Resource.Id.center_horizontal; - global::Plugin.Permissions.Resource.Id.center_vertical = global::TINK.Droid.Resource.Id.center_vertical; - global::Plugin.Permissions.Resource.Id.chronometer = global::TINK.Droid.Resource.Id.chronometer; - global::Plugin.Permissions.Resource.Id.clip_horizontal = global::TINK.Droid.Resource.Id.clip_horizontal; - global::Plugin.Permissions.Resource.Id.clip_vertical = global::TINK.Droid.Resource.Id.clip_vertical; - global::Plugin.Permissions.Resource.Id.dialog_button = global::TINK.Droid.Resource.Id.dialog_button; - global::Plugin.Permissions.Resource.Id.end = global::TINK.Droid.Resource.Id.end; - global::Plugin.Permissions.Resource.Id.fill = global::TINK.Droid.Resource.Id.fill; - global::Plugin.Permissions.Resource.Id.fill_horizontal = global::TINK.Droid.Resource.Id.fill_horizontal; - global::Plugin.Permissions.Resource.Id.fill_vertical = global::TINK.Droid.Resource.Id.fill_vertical; - global::Plugin.Permissions.Resource.Id.forever = global::TINK.Droid.Resource.Id.forever; - global::Plugin.Permissions.Resource.Id.icon = global::TINK.Droid.Resource.Id.icon; - global::Plugin.Permissions.Resource.Id.icon_group = global::TINK.Droid.Resource.Id.icon_group; - global::Plugin.Permissions.Resource.Id.info = global::TINK.Droid.Resource.Id.info; - global::Plugin.Permissions.Resource.Id.italic = global::TINK.Droid.Resource.Id.italic; - global::Plugin.Permissions.Resource.Id.left = global::TINK.Droid.Resource.Id.left; - global::Plugin.Permissions.Resource.Id.line1 = global::TINK.Droid.Resource.Id.line1; - global::Plugin.Permissions.Resource.Id.line3 = global::TINK.Droid.Resource.Id.line3; - global::Plugin.Permissions.Resource.Id.none = global::TINK.Droid.Resource.Id.none; - global::Plugin.Permissions.Resource.Id.normal = global::TINK.Droid.Resource.Id.normal; - global::Plugin.Permissions.Resource.Id.notification_background = global::TINK.Droid.Resource.Id.notification_background; - global::Plugin.Permissions.Resource.Id.notification_main_column = global::TINK.Droid.Resource.Id.notification_main_column; - global::Plugin.Permissions.Resource.Id.notification_main_column_container = global::TINK.Droid.Resource.Id.notification_main_column_container; - global::Plugin.Permissions.Resource.Id.right = global::TINK.Droid.Resource.Id.right; - global::Plugin.Permissions.Resource.Id.right_icon = global::TINK.Droid.Resource.Id.right_icon; - global::Plugin.Permissions.Resource.Id.right_side = global::TINK.Droid.Resource.Id.right_side; - global::Plugin.Permissions.Resource.Id.start = global::TINK.Droid.Resource.Id.start; - global::Plugin.Permissions.Resource.Id.tag_accessibility_actions = global::TINK.Droid.Resource.Id.tag_accessibility_actions; - global::Plugin.Permissions.Resource.Id.tag_accessibility_clickable_spans = global::TINK.Droid.Resource.Id.tag_accessibility_clickable_spans; - global::Plugin.Permissions.Resource.Id.tag_accessibility_heading = global::TINK.Droid.Resource.Id.tag_accessibility_heading; - global::Plugin.Permissions.Resource.Id.tag_accessibility_pane_title = global::TINK.Droid.Resource.Id.tag_accessibility_pane_title; - global::Plugin.Permissions.Resource.Id.tag_screen_reader_focusable = global::TINK.Droid.Resource.Id.tag_screen_reader_focusable; - global::Plugin.Permissions.Resource.Id.tag_transition_group = global::TINK.Droid.Resource.Id.tag_transition_group; - global::Plugin.Permissions.Resource.Id.tag_unhandled_key_event_manager = global::TINK.Droid.Resource.Id.tag_unhandled_key_event_manager; - global::Plugin.Permissions.Resource.Id.tag_unhandled_key_listeners = global::TINK.Droid.Resource.Id.tag_unhandled_key_listeners; - global::Plugin.Permissions.Resource.Id.text = global::TINK.Droid.Resource.Id.text; - global::Plugin.Permissions.Resource.Id.text2 = global::TINK.Droid.Resource.Id.text2; - global::Plugin.Permissions.Resource.Id.time = global::TINK.Droid.Resource.Id.time; - global::Plugin.Permissions.Resource.Id.title = global::TINK.Droid.Resource.Id.title; - global::Plugin.Permissions.Resource.Id.top = global::TINK.Droid.Resource.Id.top; - global::Plugin.Permissions.Resource.Integer.status_bar_notification_info_maxnum = global::TINK.Droid.Resource.Integer.status_bar_notification_info_maxnum; - global::Plugin.Permissions.Resource.Layout.browser_actions_context_menu_page = global::TINK.Droid.Resource.Layout.browser_actions_context_menu_page; - global::Plugin.Permissions.Resource.Layout.browser_actions_context_menu_row = global::TINK.Droid.Resource.Layout.browser_actions_context_menu_row; - global::Plugin.Permissions.Resource.Layout.custom_dialog = global::TINK.Droid.Resource.Layout.custom_dialog; - global::Plugin.Permissions.Resource.Layout.notification_action = global::TINK.Droid.Resource.Layout.notification_action; - global::Plugin.Permissions.Resource.Layout.notification_action_tombstone = global::TINK.Droid.Resource.Layout.notification_action_tombstone; - global::Plugin.Permissions.Resource.Layout.notification_template_custom_big = global::TINK.Droid.Resource.Layout.notification_template_custom_big; - global::Plugin.Permissions.Resource.Layout.notification_template_icon_group = global::TINK.Droid.Resource.Layout.notification_template_icon_group; - global::Plugin.Permissions.Resource.Layout.notification_template_part_chronometer = global::TINK.Droid.Resource.Layout.notification_template_part_chronometer; - global::Plugin.Permissions.Resource.Layout.notification_template_part_time = global::TINK.Droid.Resource.Layout.notification_template_part_time; - global::Plugin.Permissions.Resource.String.status_bar_notification_info_overflow = global::TINK.Droid.Resource.String.status_bar_notification_info_overflow; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Info = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Info; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Line2 = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Line2; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Time = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Time; - global::Plugin.Permissions.Resource.Style.TextAppearance_Compat_Notification_Title = global::TINK.Droid.Resource.Style.TextAppearance_Compat_Notification_Title; - global::Plugin.Permissions.Resource.Style.Widget_Compat_NotificationActionContainer = global::TINK.Droid.Resource.Style.Widget_Compat_NotificationActionContainer; - global::Plugin.Permissions.Resource.Style.Widget_Compat_NotificationActionText = global::TINK.Droid.Resource.Style.Widget_Compat_NotificationActionText; - global::Plugin.Permissions.Resource.Style.Widget_Support_CoordinatorLayout = global::TINK.Droid.Resource.Style.Widget_Support_CoordinatorLayout; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem = global::TINK.Droid.Resource.Styleable.ColorStateListItem; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_alpha = global::TINK.Droid.Resource.Styleable.ColorStateListItem_alpha; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_android_alpha = global::TINK.Droid.Resource.Styleable.ColorStateListItem_android_alpha; - global::Plugin.Permissions.Resource.Styleable.ColorStateListItem_android_color = global::TINK.Droid.Resource.Styleable.ColorStateListItem_android_color; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout = global::TINK.Droid.Resource.Styleable.CoordinatorLayout; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_keylines = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_keylines; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_android_layout_gravity; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_anchor; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_anchorGravity = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_anchorGravity; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_behavior = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_behavior; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_dodgeInsetEdges; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_insetEdge; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_Layout_layout_keyline; - global::Plugin.Permissions.Resource.Styleable.CoordinatorLayout_statusBarBackground = global::TINK.Droid.Resource.Styleable.CoordinatorLayout_statusBarBackground; - global::Plugin.Permissions.Resource.Styleable.FontFamily = global::TINK.Droid.Resource.Styleable.FontFamily; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont = global::TINK.Droid.Resource.Styleable.FontFamilyFont; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_font = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_font; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontStyle = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontStyle; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontVariationSettings = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontVariationSettings; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_fontWeight = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_fontWeight; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_android_ttcIndex = global::TINK.Droid.Resource.Styleable.FontFamilyFont_android_ttcIndex; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_font = global::TINK.Droid.Resource.Styleable.FontFamilyFont_font; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontStyle = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontStyle; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontVariationSettings = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontVariationSettings; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_fontWeight = global::TINK.Droid.Resource.Styleable.FontFamilyFont_fontWeight; - global::Plugin.Permissions.Resource.Styleable.FontFamilyFont_ttcIndex = global::TINK.Droid.Resource.Styleable.FontFamilyFont_ttcIndex; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderAuthority = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderAuthority; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderCerts = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderCerts; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderFetchStrategy; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderFetchTimeout; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderPackage = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderPackage; - global::Plugin.Permissions.Resource.Styleable.FontFamily_fontProviderQuery = global::TINK.Droid.Resource.Styleable.FontFamily_fontProviderQuery; - global::Plugin.Permissions.Resource.Styleable.GradientColor = global::TINK.Droid.Resource.Styleable.GradientColor; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem = global::TINK.Droid.Resource.Styleable.GradientColorItem; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem_android_color = global::TINK.Droid.Resource.Styleable.GradientColorItem_android_color; - global::Plugin.Permissions.Resource.Styleable.GradientColorItem_android_offset = global::TINK.Droid.Resource.Styleable.GradientColorItem_android_offset; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerX = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_centerY = global::TINK.Droid.Resource.Styleable.GradientColor_android_centerY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_endColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endX = global::TINK.Droid.Resource.Styleable.GradientColor_android_endX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_endY = global::TINK.Droid.Resource.Styleable.GradientColor_android_endY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_gradientRadius = global::TINK.Droid.Resource.Styleable.GradientColor_android_gradientRadius; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startColor = global::TINK.Droid.Resource.Styleable.GradientColor_android_startColor; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startX = global::TINK.Droid.Resource.Styleable.GradientColor_android_startX; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_startY = global::TINK.Droid.Resource.Styleable.GradientColor_android_startY; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_tileMode = global::TINK.Droid.Resource.Styleable.GradientColor_android_tileMode; - global::Plugin.Permissions.Resource.Styleable.GradientColor_android_type = global::TINK.Droid.Resource.Styleable.GradientColor_android_type; - global::Plugin.Permissions.Resource.Xml.xamarin_essentials_fileprovider_file_paths = global::TINK.Droid.Resource.Xml.xamarin_essentials_fileprovider_file_paths; global::Xamarin.Auth.Resource.Animation.slide_in_right = global::TINK.Droid.Resource.Animation.slide_in_right; global::Xamarin.Auth.Resource.Animation.slide_out_left = global::TINK.Droid.Resource.Animation.slide_out_left; global::Xamarin.Auth.Resource.Attribute.alpha = global::TINK.Droid.Resource.Attribute.alpha; diff --git a/TINK/TINK/App.xaml.cs b/TINK/TINK/App.xaml.cs index 30e0111..e406bac 100644 --- a/TINK/TINK/App.xaml.cs +++ b/TINK/TINK/App.xaml.cs @@ -151,7 +151,6 @@ namespace TINK DependencyService.Get(), specialFolders, new Cipher(), - null, // Permissions, no more used. #if ARENDI DependencyService.Get(), #else @@ -283,7 +282,7 @@ namespace TINK if (_PermissionsService != null) return _PermissionsService; - _PermissionsService = new Services.Permissions.Plugin.Permissions(); + _PermissionsService = new Services.Permissions.Essentials.Permissions(); return _PermissionsService; } } diff --git a/TINK/TINK/HtmlResouces/V02/InfoLicenses.html b/TINK/TINK/HtmlResouces/V02/InfoLicenses.html index 6c5e7aa..ed4f74c 100644 --- a/TINK/TINK/HtmlResouces/V02/InfoLicenses.html +++ b/TINK/TINK/HtmlResouces/V02/InfoLicenses.html @@ -33,7 +33,6 @@ PCLStorage von Daniel Plaisted Microsoft Public License (Ms-PL) Pinvoke von AArnott MIT- Lizenz für Pinvoke Plugin.BLE Adrian Seceleanu, Sven-Michael Stübe Apache License 2.0 - Plugin.Permissions von James Montemagno MIT Lizenz 2016 Polly von Michael Wolfenden, App vNext New BSD License Serilog von Serilog Contributors Apache License 2.0 Serilog.Sinks.Debug von Serilog Contributors Apache License 2.0 diff --git a/TINK/TINK/View/Map/MapPage.xaml.cs b/TINK/TINK/View/Map/MapPage.xaml.cs index 5c336a3..4e9fc41 100644 --- a/TINK/TINK/View/Map/MapPage.xaml.cs +++ b/TINK/TINK/View/Map/MapPage.xaml.cs @@ -21,6 +21,9 @@ namespace TINK.View.Map /// View model to notify about whether page appears or hides. private MapPageViewModel MapPageViewModel { get; set; } + /// Initialization status to ensure initialization logic is not called multiple times. + private bool isInitializationStarted = false; + /// /// Constructs map page instance. /// @@ -125,30 +128,27 @@ namespace TINK.View.Map public INavigationMasterDetail NavigationMasterDetail { private get; set; } #endif + /// - /// Invoked when page is shown. + /// Invoked when page is shown. /// Starts update process. /// protected async override void OnAppearing() { + // Don't repeat the initialization if it has been completed already. + if (isInitializationStarted) return; + isInitializationStarted = true; + // Pass reference to member Navigation to show bikes at station x dialog. try { - Log.ForContext().Verbose("Constructing map page view model."); - #if TRYNOTBACKSTYLE MapPageViewModel = new MapPageViewModel(); #else - MapPageViewModel = new MapPageViewModel( - App.ModelRoot, - App.PermissionsService, - App.BluetoothService, - App.GeolocationServicesContainer.Active, - (mapspan) => MyMap.MoveToRegion(mapspan), - this, - Navigation); + MapPageViewModel = CreateMapPageViewModel(); #endif - } catch (Exception exception) + } + catch (Exception exception) { Log.ForContext().Error("Constructing map page view model failed. {Exception}", exception); @@ -171,15 +171,7 @@ namespace TINK.View.Map try { - if (Device.RuntimePlatform == Device.iOS) - { - TINKButton.BackgroundColor = Color.LightGray; - TINKButton.BorderColor = Color.Black; - TINKButton.Margin = new Thickness(10, 10, 10, 10); - KonradButton.BackgroundColor = Color.LightGray; - KonradButton.BorderColor = Color.Black; - KonradButton.Margin = new Thickness(10, 10, 10, 10); - } + ApplyCustomiOSStyling(); } catch (Exception exception) { @@ -201,10 +193,7 @@ namespace TINK.View.Map try { // Pre move and scanle maps to avoid initial display of map in Rome. - Log.ForContext().Verbose("Moving and scaling map."); - MapPageViewModel.MoveAndScale( - (mapSpan) => MyMap.MoveToRegion(mapSpan), - App.ModelRoot.MapSpan); + PremoveAndScaleMap(); } catch(Exception exception) { @@ -224,8 +213,54 @@ namespace TINK.View.Map } } + /// - /// Invoked when pages is closed/ hidden. + /// Premoves the Map to a certain location. + /// + private void PremoveAndScaleMap() + { + Log.ForContext().Verbose("Moving and scaling map."); + MapPageViewModel.MoveAndScale( + (mapSpan) => MyMap.MoveToRegion(mapSpan), + App.ModelRoot.MapSpan); + } + + + /// + /// Creates the Map Page's view model. + /// + private MapPageViewModel CreateMapPageViewModel() + { + Log.ForContext().Verbose("Constructing map page view model."); + return new MapPageViewModel( + App.ModelRoot, + App.PermissionsService, + App.BluetoothService, + App.GeolocationServicesContainer.Active, + (mapspan) => MyMap.MoveToRegion(mapspan), + this, + Navigation); + } + + + /// + /// Applies iOS specific styling to branded Buttons. + /// + private void ApplyCustomiOSStyling() + { + if (Device.RuntimePlatform == Device.iOS) + { + TINKButton.BackgroundColor = Color.LightGray; + TINKButton.BorderColor = Color.Black; + TINKButton.Margin = new Thickness(10, 10, 10, 10); + KonradButton.BackgroundColor = Color.LightGray; + KonradButton.BorderColor = Color.Black; + KonradButton.Margin = new Thickness(10, 10, 10, 10); + } + } + + /// + /// Invoked when pages is closed/ hidden. /// Stops update process. /// protected override async void OnDisappearing() @@ -235,8 +270,7 @@ namespace TINK.View.Map // View model might be null. await MapPageViewModel?.OnDisappearing(); } - base.OnDisappearing(); } } -} \ No newline at end of file +} diff --git a/TINKLib/Model/TinkApp.cs b/TINKLib/Model/TinkApp.cs index 9ef2f73..9333740 100644 --- a/TINKLib/Model/TinkApp.cs +++ b/TINKLib/Model/TinkApp.cs @@ -15,7 +15,6 @@ using System.Threading; using TINK.Services.BluetoothLock; using TINK.Model.Services.Geolocation; using TINK.Model.Services.CopriApi.ServerUris; -using Plugin.Permissions.Abstractions; using TINK.Services.BluetoothLock.Crypto; using TINK.ViewModel.Map; using TINK.ViewModel.Settings; @@ -156,7 +155,6 @@ namespace TINK.Model ISmartDevice device, ISpecialFolder specialFolder, ICipher cipher, - IPermissions permissions = null, object arendiCentral = null, Func isConnectedFunc = null, Action postAction = null, diff --git a/TINKLib/Services/Permissions/Plugin/Permissions.cs b/TINKLib/Services/Permissions/Plugin/Permissions.cs deleted file mode 100644 index 11c4182..0000000 --- a/TINKLib/Services/Permissions/Plugin/Permissions.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Threading.Tasks; - - -namespace TINK.Services.Permissions.Plugin -{ - using global::Plugin.Permissions; - - public class Permissions : ILocationPermission - { - /// Checks the permission status. - public async Task CheckStatusAsync() - { - switch (await CrossPermissions.Current.CheckPermissionStatusAsync()) - { - case global::Plugin.Permissions.Abstractions.PermissionStatus.Denied: - return Status.Denied; - - case global::Plugin.Permissions.Abstractions.PermissionStatus.Granted: - return Status.Granted; - - case global::Plugin.Permissions.Abstractions.PermissionStatus.Unknown: - return Status.Unknown; - - default: - // Comprises - // - PermissionStatus.Disabled and - // - PermissionStatus.Restricted. - return Status.DeniedRequiresSettingsUI; - } - } - - /// Requests location permission. - /// Permission status after request. - public async Task RequestAsync() - { - switch (await CrossPermissions.Current.RequestPermissionAsync()) - { - case global::Plugin.Permissions.Abstractions.PermissionStatus.Denied: - return Status.Denied; - - case global::Plugin.Permissions.Abstractions.PermissionStatus.Granted: - return Status.Granted; - - case global::Plugin.Permissions.Abstractions.PermissionStatus.Unknown: - return Status.Unknown; - - default: - // Comprises - // - PermissionStatus.Disabled and - // - PermissionStatus.Restricted. - return Status.DeniedRequiresSettingsUI; - } - } - - /// Opens app settings dialog. - public bool OpenAppSettings() - => CrossPermissions.Current.OpenAppSettings(); - } -} diff --git a/TINKLib/TINKLib.csproj b/TINKLib/TINKLib.csproj index b10ddc6..c383593 100644 --- a/TINKLib/TINKLib.csproj +++ b/TINKLib/TINKLib.csproj @@ -28,7 +28,6 @@ - @@ -51,7 +50,6 @@ - diff --git a/TINKLib/ViewModel/Map/MapPageViewModel.cs b/TINKLib/ViewModel/Map/MapPageViewModel.cs index 8efa9dd..086405f 100644 --- a/TINKLib/ViewModel/Map/MapPageViewModel.cs +++ b/TINKLib/ViewModel/Map/MapPageViewModel.cs @@ -207,7 +207,7 @@ namespace TINK.ViewModel.Map var l_oPin = new Pin { - + Position = new Xamarin.Forms.GoogleMaps.Position(station.Position.Latitude, station.Position.Longitude), Label = long.TryParse(station.Id, out long stationId) && stationId > CUSTOM_ICONS_COUNT ? station.GetStationName() @@ -231,13 +231,13 @@ namespace TINK.ViewModel.Map for (int pinIndex = 0; pinIndex < stationsColorList.Count; pinIndex++) { - var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId) + var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId) && stationId <= CUSTOM_ICONS_COUNT ? $"{stationId}" // there is a station marker with index letter for given station id : "Open"; // there is no station marker. Use open marker. var colorPartPrefix = GetRessourceNameColorPart(stationsColorList[pinIndex]); - + var l_iName = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}"; try { @@ -292,7 +292,7 @@ namespace TINK.ViewModel.Map } /// - /// Invoked when page is shown. + /// Invoked when page is shown. /// Starts update process. /// /// Holds map page filter settings. @@ -307,105 +307,25 @@ namespace TINK.ViewModel.Map Polling = TinkApp.Polling; Log.ForContext().Information( - $"{(Polling != null && Polling.IsActivated ? $"Map page is appearing. Update periode is {Polling.Periode.TotalSeconds} sec." : "Map page is appearing. Polling is off.")}" + + $"{(Polling != null && Polling.IsActivated ? $"Map page is appearing. Update periode is {Polling.Periode.TotalSeconds} sec." : "Map page is appearing. Polling is off.")}" + $"Current UI language is {Thread.CurrentThread.CurrentUICulture.Name}."); - // Update map page filter + // Update map page filter ActiveFilterMap = TinkApp.GroupFilterMapPage; ActionText = AppResources.ActivityTextRequestingLocationPermissions; - - // Check location permission - var status = await PermissionsService.CheckStatusAsync(); - if (TinkApp.CenterMapToCurrentLocation - && !GeolocationService.IsSimulation - && status != Status.Granted) - { - var permissionResult = await PermissionsService.RequestAsync(); - - if (permissionResult != Status.Granted) - { - var dialogResult = await ViewService.DisplayAlert( - AppResources.MessageTitleHint, - AppResources.MessageCenterMapLocationPermissionOpenDialog, - AppResources.MessageAnswerYes, - AppResources.MessageAnswerNo); - - if (dialogResult) - { - // User decided to give access to locations permissions. - PermissionsService.OpenAppSettings(); - ActionText = ""; - IsRunning = false; - IsMapPageEnabled = true; - return; - } - } - } + Status status = await RequestLocationPermission(); ActionText = AppResources.ActivityTextMapLoadingStationsAndBikes; IsConnected = TinkApp.GetIsConnected(); - var resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync(); + + Result resultStationsAndBikes = await TinkApp.GetConnector(IsConnected).Query.GetBikesAndStationsAsync(); TinkApp.Stations = resultStationsAndBikes.Response.StationsAll; - if (Pins.Count > 0 && Pins.Count != resultStationsAndBikes.Response.StationsAll.Count) - { - // Either - // - user logged in/ logged out which might lead to more/ less stations beeing available - // - new stations were added/ existing ones remove - Pins.Clear(); - } + await SetStationsOnMap(resultStationsAndBikes.Response.StationsAll); + await HandleAuthCookieNotDefinedException(resultStationsAndBikes.Exception); - // Check if there are alreay any pins to the map - // i.e detecte first call of member OnAppearing after construction - if (Pins.Count <= 0) - { - Log.ForContext().Debug($"{(ActiveFilterMap.GetGroup().Any() ? $"Active map filter is {string.Join(",", ActiveFilterMap.GetGroup())}." : "Map filter is off.")}"); - - // Map was not yet initialized. - // Get stations from Copri - Log.ForContext().Verbose("No pins detected on page."); - if (resultStationsAndBikes.Response.StationsAll.CopriVersion < CopriCallsStatic.UnsupportedVersionLower) - { - await ViewService.DisplayAlert( - AppResources.MessageWaring, - string.Format(AppResources.MessageCopriVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)), - AppResources.MessageAnswerOk); - - Log.ForContext().Error($"Outdated version of app detected. Version expected is {resultStationsAndBikes.Response.StationsAll.CopriVersion}."); - } - - if (resultStationsAndBikes.Response.StationsAll.CopriVersion >= CopriCallsStatic.UnsupportedVersionUpper) - { - await ViewService.DisplayAlert( - AppResources.MessageWaring, - string.Format(AppResources.MessageAppVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)), - AppResources.MessageAnswerOk); - - Log.ForContext().Error($"Outdated version of app detected. Version expected is {resultStationsAndBikes.Response.StationsAll.CopriVersion}."); - } - - // Set pins to their positions on map. - InitializePins(resultStationsAndBikes.Response.StationsAll); - - Log.ForContext().Verbose("Update of pins done."); - } - - - if (resultStationsAndBikes.Exception?.GetType() == typeof(AuthcookieNotDefinedException)) - { - Log.ForContext().Error("Map page is shown (probable for the first time after startup of app) and COPRI auth cookie is not defined. {@l_oException}", resultStationsAndBikes.Exception); - - // COPRI reports an auth cookie error. - await ViewService.DisplayAlert( - AppResources.MessageWaring, - AppResources.MessageMapPageErrorAuthcookieUndefined, - AppResources.MessageAnswerOk); - - await TinkApp.GetConnector(IsConnected).Command.DoLogout(); - TinkApp.ActiveUser.Logout(); - } // Update pin colors. Log.ForContext().Verbose("Starting update pins color..."); @@ -417,33 +337,14 @@ namespace TINK.ViewModel.Map // Update pins color form count of bikes located at station. UpdatePinsColor(colors); + Log.ForContext().Verbose("Update pins color done."); + // Move and scale before getting stations and bikes which takes some time. ActionText = AppResources.ActivityTextCenterMap; - if (TinkApp.CenterMapToCurrentLocation) - { - Location currentLocation = null; - try - { - currentLocation = await GeolocationService.GetAsync(); - } - catch (Exception ex) - { - Log.ForContext().Error("Getting location failed. {Exception}", ex); - } - - TinkApp.MapSpan = MapSpan.FromCenterAndRadius( - new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude), - TinkApp.MapSpan.Radius); - - TinkApp.Save(); - } - - MoveAndScale(m_oMoveToRegionDelegate, TinkApp.MapSpan); + await MoveMapToCurrentPositionOfUser(status); m_oViewUpdateManager = CreateUpdateTask(); - Log.ForContext().Verbose("Update pins color done."); - try { // Update bikes at station or my bikes depending on context. @@ -474,6 +375,144 @@ namespace TINK.ViewModel.Map } } + + /// + /// Invoked when the auth cookie is not defined. + /// + private async Task HandleAuthCookieNotDefinedException(Exception exception) + { + if (exception?.GetType() == typeof(AuthcookieNotDefinedException)) + { + Log.ForContext().Error("Map page is shown (probable for the first time after startup of app) and COPRI auth cookie is not defined. {@l_oException}", exception); + + // COPRI reports an auth cookie error. + await ViewService.DisplayAlert( + AppResources.MessageWaring, + AppResources.MessageMapPageErrorAuthcookieUndefined, + AppResources.MessageAnswerOk); + + await TinkApp.GetConnector(IsConnected).Command.DoLogout(); + TinkApp.ActiveUser.Logout(); + } + } + + /// + /// Sets the available stations on the map. + /// + private async Task SetStationsOnMap(StationDictionary stations) + { + if (Pins.Count > 0 && Pins.Count != stations.Count) + { + // Either + // - user logged in/ logged out which might lead to more/ less stations beeing available + // - new stations were added/ existing ones remove + Pins.Clear(); + } + + // Check if there are alreay any pins to the map + // i.e detecte first call of member OnAppearing after construction + if (Pins.Count <= 0) + { + Log.ForContext().Debug($"{(ActiveFilterMap.GetGroup().Any() ? $"Active map filter is {string.Join(",", ActiveFilterMap.GetGroup())}." : "Map filter is off.")}"); + + // Map was not yet initialized. + // Get stations from Copri + Log.ForContext().Verbose("No pins detected on page."); + if (stations.CopriVersion < CopriCallsStatic.UnsupportedVersionLower) + { + await ViewService.DisplayAlert( + AppResources.MessageWaring, + string.Format(AppResources.MessageCopriVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)), + AppResources.MessageAnswerOk); + + Log.ForContext().Error($"Outdated version of app detected. Version expected is {stations.CopriVersion}."); + } + + if (stations.CopriVersion >= CopriCallsStatic.UnsupportedVersionUpper) + { + await ViewService.DisplayAlert( + AppResources.MessageWaring, + string.Format(AppResources.MessageAppVersionIsOutdated, ContactPageViewModel.GetAppName(TinkApp.Uris.ActiveUri)), + AppResources.MessageAnswerOk); + + Log.ForContext().Error($"Outdated version of app detected. Version expected is {stations.CopriVersion}."); + } + + // Set pins to their positions on map. + InitializePins(stations); + + Log.ForContext().Verbose("Update of pins done."); + } + + } + + /// + /// Moves the map to the current position of the user. + /// If location permission hasn't been granted, the position is not adjusted. + /// + private async Task MoveMapToCurrentPositionOfUser(Status status) + { + if (status == Status.Granted) + { + ActionText = AppResources.ActivityTextCenterMap; + if (TinkApp.CenterMapToCurrentLocation) + { + Location currentLocation = null; + try + { + currentLocation = await GeolocationService.GetAsync(); + } + catch (Exception ex) + { + Log.ForContext().Error("Getting location failed. {Exception}", ex); + } + + TinkApp.MapSpan = MapSpan.FromCenterAndRadius( + new Xamarin.Forms.GoogleMaps.Position(currentLocation.Latitude, currentLocation.Longitude), + TinkApp.MapSpan.Radius); + + TinkApp.Save(); + } + MoveAndScale(m_oMoveToRegionDelegate, TinkApp.MapSpan); + } + } + + /// + /// Requests the location permission from the user. + /// If the user declines, a dialog prompot is shown, telling the user to toggle the permission in the device settings. + /// + /// The permission status. + private async Task RequestLocationPermission() + { + // Check location permission + var status = await PermissionsService.CheckStatusAsync(); + if (TinkApp.CenterMapToCurrentLocation + && !GeolocationService.IsSimulation + && status != Status.Granted) + { + status = await PermissionsService.RequestAsync(); + + if (status != Status.Granted) + { + var dialogResult = await ViewService.DisplayAlert( + AppResources.MessageTitleHint, + AppResources.MessageCenterMapLocationPermissionOpenDialog, + AppResources.MessageAnswerYes, + AppResources.MessageAnswerNo); + + if (dialogResult) + { + // User decided to give access to locations permissions. + PermissionsService.OpenAppSettings(); + ActionText = ""; + IsRunning = false; + IsMapPageEnabled = true; + } + } + } + return status; + } + /// Moves map and scales visible region depending on active filter. public static void MoveAndScale( Action moveToRegionDelegate, @@ -517,7 +556,7 @@ namespace TINK.ViewModel.Map Log.ForContext().Error("Getting bikes and stations in polling context failed with exception {Exception}.", exception); } - // Check if there are alreay any pins to the map. + // Check if there are alreay any pins to the map. // If no initialze pins. if (Pins.Count <= 0) { @@ -562,7 +601,7 @@ namespace TINK.ViewModel.Map } /// - /// Invoked when pages is closed/ hidden. + /// Invoked when pages is closed/ hidden. /// Stops update process. /// public async Task OnDisappearing() @@ -583,7 +622,7 @@ namespace TINK.ViewModel.Map // Lock action to prevent multiple instances of "BikeAtStation" being opened. IsMapPageEnabled = false; - TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId) + TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId) ?? new Station(selectedStationId, new List(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task. #if TRYNOTBACKSTYLE @@ -839,7 +878,7 @@ namespace TINK.ViewModel.Map if (permissionResult != Status.Granted) { var dialogResult = await ViewService.DisplayAlert( - AppResources.MessageTitleHint, + AppResources.MessageTitleHint, AppResources.MessageBikesManagementLocationPermission, "Ja", "Nein"); @@ -854,14 +893,14 @@ namespace TINK.ViewModel.Map } } - // Do not use property .State to get bluetooth state due - // to issue https://hausource.visualstudio.com/TINK/_workitems/edit/116 / + // Do not use property .State to get bluetooth state due + // to issue https://hausource.visualstudio.com/TINK/_workitems/edit/116 / // see https://github.com/xabre/xamarin-bluetooth-le/issues/112#issuecomment-380994887 if (await BluetoothService.GetBluetoothState() != Plugin.BLE.Abstractions.Contracts.BluetoothState.On) { await ViewService.DisplayAlert( AppResources.MessageTitleHint, - AppResources.MessageBikesManagementBluetoothActivation, + AppResources.MessageBikesManagementBluetoothActivation, AppResources.MessageAnswerOk); IsMapPageEnabled = true; ActionText = ""; @@ -939,4 +978,4 @@ namespace TINK.ViewModel.Map public bool IsToggleVisible => tinkKonradToggleViewModel.IsToggleVisible; } -} \ No newline at end of file +} diff --git a/TestFramework/Services/Permissions/PermissionsMock.cs b/TestFramework/Services/Permissions/PermissionsMock.cs deleted file mode 100644 index 66744a8..0000000 --- a/TestFramework/Services/Permissions/PermissionsMock.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Plugin.Permissions; -using Plugin.Permissions.Abstractions; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace TestFramework.Services.Permissions -{ - public class PermissionsMock : IPermissions - { - public async Task CheckPermissionStatusAsync() where T : BasePermission, new() - { - return await Task.FromResult(Plugin.Permissions.Abstractions.PermissionStatus.Granted); - } - - public Task CheckPermissionStatusAsync(Permission permission) - { - throw new NotImplementedException(); - } - - public bool OpenAppSettings() - { - throw new NotImplementedException(); - } - - public Task RequestPermissionAsync() where T : BasePermission, new() - { - throw new NotImplementedException(); - } - - public Task> RequestPermissionsAsync(params Permission[] permissions) - { - throw new NotImplementedException(); - } - - public Task ShouldShowRequestPermissionRationaleAsync(Permission permission) - { - throw new NotImplementedException(); - } - } -} diff --git a/TestFramework/TestFramework.csproj b/TestFramework/TestFramework.csproj index be7ff01..42651f6 100644 --- a/TestFramework/TestFramework.csproj +++ b/TestFramework/TestFramework.csproj @@ -25,7 +25,6 @@ - diff --git a/TestSharee/UseCase/Startup/TestTinkApp.cs b/TestSharee/UseCase/Startup/TestTinkApp.cs index ee0320f..86911f7 100644 --- a/TestSharee/UseCase/Startup/TestTinkApp.cs +++ b/TestSharee/UseCase/Startup/TestTinkApp.cs @@ -51,7 +51,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), // Current app version lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to @@ -104,7 +103,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to @@ -165,7 +163,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to @@ -220,7 +217,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to @@ -276,7 +272,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), #if ARENDI Substitute.For(), #endif @@ -319,7 +314,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), #if ARENDI // Requires LockItArendi library. Substitute.For(), #endif @@ -364,7 +358,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), #if ARENDI // Requires LockItArendi library. Substitute.For(), #endif diff --git a/TestShareeLib/Model/TestTinkApp.cs b/TestShareeLib/Model/TestTinkApp.cs index f55cca7..1391221 100644 --- a/TestShareeLib/Model/TestTinkApp.cs +++ b/TestShareeLib/Model/TestTinkApp.cs @@ -9,8 +9,6 @@ using TINK.Model.Services.Geolocation; using TINK.Services.BluetoothLock; using TINK.Model.Device; using TINK.Model.User.Account; -using Plugin.Permissions.Abstractions; - using TestShareeLib.Repository; using TestFramework.Repository; @@ -26,7 +24,6 @@ namespace TestTINKLib.Fixtures.UseCases.Logout var locksService = Substitute.For(); var device = Substitute.For(); var specialFolder = Substitute.For(); - var permissions = Substitute.For(); var account = Substitute.For(); accountStore.Load().Returns(account); @@ -42,14 +39,13 @@ namespace TestTINKLib.Fixtures.UseCases.Logout activeUri: new Uri(CopriServerUriList.TINK_DEVEL)), accountStore, (isConnected, uri, sessionCookie, mail, expiresAfter) => string.IsNullOrEmpty(sessionCookie) - ? new ConnectorCache(sessionCookie, mail, new CopriCallsMemory001()) - : new ConnectorCache(sessionCookie, mail, new CopriCallsMemory001(sessionCookie)), + ? new ConnectorCache(sessionCookie, mail, new TestShareeLib.Repository.CopriCallsMemory001()) + : new ConnectorCache(sessionCookie, mail, new TestShareeLib.Repository.CopriCallsMemory001(sessionCookie)), Substitute.For>(), locksService, device, specialFolder, null, // Cipher - permissions, isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to diff --git a/TestShareeLib/Model/TestTinkAppLogin.cs b/TestShareeLib/Model/TestTinkAppLogin.cs index 267bcf0..c6f9ec5 100644 --- a/TestShareeLib/Model/TestTinkAppLogin.cs +++ b/TestShareeLib/Model/TestTinkAppLogin.cs @@ -9,7 +9,6 @@ using TINK.Model.Services.Geolocation; using TINK.Services.BluetoothLock; using TINK.Model.Device; using TINK.Model.User.Account; -using Plugin.Permissions.Abstractions; using System.Threading.Tasks; using TestFramework.Repository; @@ -25,7 +24,6 @@ namespace TestShareeLib.UseCases.Login var locksService = Substitute.For(); var device = Substitute.For(); var specialFolder = Substitute.For(); - var permissions = Substitute.For(); // No user logged in is initial state to verify. var l_oTinkApp = new TinkApp( @@ -42,7 +40,6 @@ namespace TestShareeLib.UseCases.Login device, specialFolder, null, // Cipher - permissions, isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), lastVersion: new Version(3, 0, 173) /* Current app version. Must be larger or equal 3.0.173 to lastVersion*/); diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs index 3e43de7..a24e7c7 100644 --- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs +++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs @@ -23,7 +23,6 @@ using TestFramework.Repository; using TestFramework.Model.User.Account; using TestFramework.Model.Services.Geolocation; using TestFramework.Services.BluetoothLock; -using TestFramework.Services.Permissions; using TestFramework.Services.CopriApi.Connector; namespace TestTINKLib.Fixtures.ObjectTests.Account @@ -49,7 +48,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -88,7 +86,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -128,7 +125,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -167,7 +163,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, // Offline postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -217,7 +212,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, // Offline postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs index 5df22f7..2c0559a 100644 --- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs +++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs @@ -19,7 +19,6 @@ using TestFramework.Services.BluetoothLock; using TestFramework.Model.Services.Geolocation; using TestFramework.Model.User.Account; using TestFramework.Model.Device; -using TestFramework.Services.Permissions; using TestFramework.Repository; using TestFramework.Services.CopriApi.Connector; @@ -48,7 +47,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -125,7 +123,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -199,7 +196,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), // Current app version lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to @@ -268,7 +264,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), // Current app version lastVersion: new Version(3, 0, 173)); @@ -337,7 +332,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, currentVersion: new Version(3, 2, 0, 115), // Current app version lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to @@ -420,7 +414,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, currentVersion: new Version(3, 2, 0, 115), // Current app version lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to @@ -504,7 +497,6 @@ namespace TestShareeLib.UseCases.Startup new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, currentVersion: new Version(3, 2, 0, 115), // Current app version lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikesAtStationPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikesAtStationPageViewModel.cs index 77ee378..51e358a 100644 --- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikesAtStationPageViewModel.cs +++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikesAtStationPageViewModel.cs @@ -28,7 +28,6 @@ using TestFramework.Model.Device; using TestFramework.Repository; using TestFramework.Model.User.Account; using TestFramework.Model.Services.Geolocation; -using TestFramework.Services.Permissions; using TestFramework.Services.CopriApi.Connector; namespace TestTINKLib.Fixtures.ObjectTests.ViewModel @@ -62,7 +61,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -134,7 +132,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -211,7 +208,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -312,7 +308,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -419,7 +414,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -523,7 +517,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -625,7 +618,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -719,7 +711,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -792,7 +783,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -864,7 +854,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -937,7 +926,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, // Not connected. postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -1019,7 +1007,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, // Not connected. postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -1105,7 +1092,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, // Not connected. postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs index d5e02fe..56d29e0 100644 --- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs +++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs @@ -28,7 +28,6 @@ using TestFramework.Model.Device; using TestFramework.Repository; using TestFramework.Model.User.Account; using TestFramework.Model.Services.Geolocation; -using TestFramework.Services.Permissions; namespace TestTINKLib.Fixtures.ObjectTests.ViewModel { @@ -77,7 +76,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -168,7 +166,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -267,7 +264,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -361,7 +357,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -453,7 +448,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions, isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -539,7 +533,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -600,7 +593,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions isConnectedFunc: () => false, // Offline postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -675,7 +667,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => false, // Offline postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version @@ -753,7 +744,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel new DeviceMock(), new SpecialFolderMock(), null, // Cipher - null, // Permissions. isConnectedFunc: () => false, // Offline postAction: (d, obj) => d(obj), currentVersion: new Version(3, 2, 0, 115), // Current app version diff --git a/TestTINKLib/Fixtures/UseCases/ConnectedOffline/TestTinkApp.cs b/TestTINKLib/Fixtures/UseCases/ConnectedOffline/TestTinkApp.cs index 958bad3..0d43458 100644 --- a/TestTINKLib/Fixtures/UseCases/ConnectedOffline/TestTinkApp.cs +++ b/TestTINKLib/Fixtures/UseCases/ConnectedOffline/TestTinkApp.cs @@ -10,7 +10,6 @@ namespace TestTINKLib.Fixtures.UseCases.ConnectedOffline using TestFramework.Model.Services.Geolocation; using TestFramework.Model.User.Account; using TestFramework.Services.BluetoothLock; - using TestFramework.Services.Permissions; using TINK.Model.Connector; using TINK.Model.Services.Geolocation; using TINK.Services; @@ -33,7 +32,6 @@ namespace TestTINKLib.Fixtures.UseCases.ConnectedOffline new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), // Current app version lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to diff --git a/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs b/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs index 7479d7f..39ad7e3 100644 --- a/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs +++ b/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs @@ -13,7 +13,6 @@ using TestFramework.Model.Device; using TestFramework.Model.User.Account; using TestFramework.Model.Services.Geolocation; using TestFramework.Services.BluetoothLock; -using TestFramework.Services.Permissions; namespace TestTINKLib.Fixtures.UseCases.SelectStation { @@ -45,7 +44,6 @@ namespace TestTINKLib.Fixtures.UseCases.SelectStation new DeviceMock(), new SpecialFolderMock(), null, // Cipher - new PermissionsMock(), isConnectedFunc: () => true, currentVersion: new Version(3, 2, 0, 115), lastVersion: new Version(3, 0, 173)); // Current app version. Must be larger or equal 3.0.173 to diff --git a/TestTINKLib/TestTINKLib.csproj b/TestTINKLib/TestTINKLib.csproj index e41ea41..8530f45 100644 --- a/TestTINKLib/TestTINKLib.csproj +++ b/TestTINKLib/TestTINKLib.csproj @@ -210,4 +210,4 @@ - \ No newline at end of file +