Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix/branding-login-retry] Retry Section for Branded Login Error #1047

Merged
merged 10 commits into from
Nov 12, 2021

Conversation

hosy
Copy link
Collaborator

@hosy hosy commented Oct 8, 2021

Description

This PR adds a retry section to the branded login, e.g. if a server url could not be reached. In some cases (passcode setup) the error alert could not be presented. This solves the problem and furthermore it adds a Retry button to proceed with the login again.

Related Issue

https://github.com/owncloud/enterprise/issues/4786

Motivation and Context

How Has This Been Tested?

  • test in branded app
  • set a unreachable server url into the Branding.plist as server url
  • enable passcode enforced

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • Added changelog files for the fixed issues in folder changelog/unreleased

@hosy hosy self-assigned this Oct 8, 2021
@michaelstingl michaelstingl added this to the 11.7.2-Fix milestone Oct 12, 2021
… app retries to establish the connection before a error message will be shown
@jesmrec
Copy link
Contributor

jesmrec commented Oct 19, 2021

I saw the following weird behaviour, due to the retrying view. Server is available, is http (warnings arising) and cause several glitches, apart of some latency in the connection process:

RPReplay_Final1634659921.MP4

@hosy
Copy link
Collaborator Author

hosy commented Oct 20, 2021

@jesmrec problem should be fixed now with latest commit

@jesmrec
Copy link
Contributor

jesmrec commented Oct 20, 2021

@hosy with fix 4389d7d8, i had to retry twice to have a clear view:

RPReplay_Final1634716691.MP4

@hosy
Copy link
Collaborator Author

hosy commented Oct 20, 2021

@jesmrec now this edge case should be fixed too.

@jesmrec
Copy link
Contributor

jesmrec commented Oct 20, 2021

Yes, now the bad effects are gone.

I tried to reproduce the retry option by using the "Network link conditioner" feature of iOS, using the "very bad network" and "100% loss" options. I couldn't get it.

- retries minimum of 3 times
….swift

Co-authored-by: Felix Schwarz <fs-git@iospirit.com>
@hosy
Copy link
Collaborator Author

hosy commented Nov 11, 2021

@jesmrec was this one already tested by you? I thought we got positive feedback from the customer?

@jesmrec
Copy link
Contributor

jesmrec commented Nov 11, 2021

i think so, but maybe other one should confirm the customer feelings. I was working on this:

  • iPhoneXR with iOS15 -> everything was fine

  • iPadAir with iOS14 -> i got a bad behaviour that no other one was able to reproduce with any other device and version, so it was moved forward. Here, i can take another look (does this branch contain the same as the mashup branch?), just in case the problem it's gone. If it persists, maybe the customer feeling should prevail. Open to discussion

@hosy
Copy link
Collaborator Author

hosy commented Nov 11, 2021

@jesmrec yes, we figured out, that this was a special problem on your device, with a specific branding configuration. So we can move forward.

@hosy hosy merged commit 728cf67 into milestone/11.7.2 Nov 12, 2021
@delete-merged-branch delete-merged-branch bot deleted the fix/branding-login-retry branch November 12, 2021 12:28
hosy added a commit that referenced this pull request Dec 1, 2021
* added additional build information to the Branding.plist file:
- ios-app and ios-sdk commit hash
- copy the Branding.plist with additional app and build information as file name

* [feature/biometrical-mdm-setting ]Suggest Biometrical Unlock (#1046)

* Suggest biometrical unlock, after setting up passcode

* - do not show Cancel button, if password is enforced
- update biometrical UI switch value in settings view
- fixed bug, dismissing the view, if biometrical is not available

* moved extension into ownCloudAppShared folder

* Branding: (#1045)

- add new `branding.user-defaults-default-values` class settings key to allow registration of alternative defaults for user defaults

* - fix bug where a quick access entry showed no items when selected a second time. (#1044)

* used better wording for "Cellular transfers"

* - in branded clients: removed UISwitch to enable/disable deletion of available offline files in manage screen
- fixed text center layout in table view cell

* fixed UI issue in sharing view

* #4801 "Log out"  text changes

* #4801 text changes for "Prevent gestures"

* - ThemeTableViewCell, StaticTableViewRow: new .plain message style (#1053)

- add new view controller to present license texts for each component individually

* [feature/modular-localization] Modular localization (#1054)

* - Branding class:
	- move logic for VendorServices.appName to Branding.appDisplayName
	- change app.name variable value to that of Branding.appDisplayName
- switch String.localized from NSLocalizedString() to OCLocale.localize()
- SwiftLint: adapt to latest SwiftLint version

* - add .localized(replacements) function to provide easy access to custom variables support in OCLocale

* - update SDK

* [feature/mdm-auto-connect] Skip Account Screen via MDM (#1056)

* #4801 Skip "Manage" screen / automatically open "Files" screen after login via MDM parameter account.auto-connect

* - SceneDelegate: use .first (which returns nil in case there are no bookmarks) instead of bookmark(at: 0) (which crashes in case there are no bookmarks because the array is empty and the method tries to access an item at index 0)

* added auto-connect after every setup, not only the first setup

Co-authored-by: Felix Schwarz <fs-git@iospirit.com>

* [feature/mdm-biometrical-unlock]  MDM setting for Biometrical Unlock (#1058)

* #4818 control via MDM to auto enable biometrical unlock

* overwrites user defaults with MDM settings and use existing getter/setter; renamed MDM key to use-biometrical-unlock

* - use user defaults for use-biometrical-unlock
- show Face ID authorization immediately after enabling Face ID

* [feature/hide-background-location-settings] Do not show Background Location section by default (#1051)

* #1050 The Background Uploads section should be only shown, if Auto Upload Photos/Videos was enabled. Otherwise the setting section Background Uploads confuses the user, why the disabled options in this section could not be enabled.

* fixed removing table view section

* [fix/branding refinement] Branding: Color and UI Improvements (#1057)

* Fixed branding issues

* - fixed default searchBar background and placeholder text color for branded builds
- show single account server list, if only one account is configured for branded and unbranded builds

* - fixed default (unselected) tab bar color
- added table view section border to branded account table view

* - fixed rounded border for text fields in branded login UI
- removed table row separator in branding login view
- fixed colors in contrast mode, if tint color is white
- fixed UIAlertView tint color

* fixed tint color in UIAlertController in dark mode for branding colors

* fixed color value again

* fixed tint color in single account server list cell view

* fixed missing profile UI

* removed optional branding values (only two color values are now needed for a complete branding, all other values are optional)

* fixed border color in single account server view, if navigationbar background color is white

* added gomplate template for Branding.plist creation to the iOS repo
adopted template for new Parameter and removed default values i template

* fixed some color issues, if tint color is white

* fixed setting custom UISearchBar backgroundColor on iOS 12

* set profile url as prefilled default value into setup url field

* added a new color style loginStatusBarStyle to set a custom status bar style for the login view

* if the key app.version-number exists, fastlane will use this value as app and extension short version number, which gives the possibility to set custom version numbers

* Fixed CR findings:
- added a protocol for setting the custom status bar style, instead of using static class names
- using the correct SDK method for round rect

* fixed merge error

* [fix/branding-login-retry] Retry Section for Branded Login Error (#1047)

* add a error section with a retry button in branded login view

* #4786 added a retry interval of 10 seconds. In this time interval the app retries to establish the connection before a error message will be shown

* only retry for network issues

* only show retry section on network issues

* - changed retry time interval to 30 seconds
- retries minimum of 3 times

* Update ownCloud/Static Login/Interface/StaticLoginSetupViewController.swift

Co-authored-by: Felix Schwarz <fs-git@iospirit.com>

* fixed connection retry and show retry section UI

* HTTP pipeline is ready to schedule HTTP requests before the Static Login View Controller is brought up. Moved it before setting up the UIWindow

* removed connection retries output and put it into the log

Co-authored-by: Felix Schwarz <fs-git@iospirit.com>

* [fix/single-accouont-display-name] Show Display Name in Branded Single Account View (#1049)

* username could be like a uuid, which is not user readable. Instead now showing the displayName and if not available, the userName

* fixed syntax error

* fixed compile error

* first draft for retrieving the user display name for the header view

* retrieving the users display name by init a connection and reloading the table view

* - new version and build number
- new release notes entry

* [feature/appstore-buildflag] Remove App Store / IAP code via build flag (#1052)

* - add support and documentation for DISABLE_APPSTORE_LICENSING build flag

* - ReleaseNotesHostViewController: remove unused reference to StoreKit
- OCLicenseDuration: make sure SKProductSubscriptionPeriod conversion code is excluded when using the DISABLE_APPSTORE_LICENSING build flag

* [fix/clear-lock] Clear lock when determining unlock expiry (#1061)

* - AppLockmanager: clear unlock and lastApplicationBackgroundedDate in case an unlock has expired, to protect against subsequent attempts setting the device time to an earlier date

* - AppLockManager: clear unlocked state if device time is earlier than lastBackgrounded time

* - fix logic bug and improve structure

* - AppLockManager: now returns correct unlock status when detecting that time was turned back

* [feature/custom-app-scheme] Custom app/auth schemes (#1060)

* - add support and documentation for DISABLE_APPSTORE_LICENSING build flag

* - ReleaseNotesHostViewController: remove unused reference to StoreKit
- OCLicenseDuration: make sure SKProductSubscriptionPeriod conversion code is excluded when using the DISABLE_APPSTORE_LICENSING build flag

* - add support for app.custom-app-scheme and app.custom-auth-scheme to Fastfile
- add documentation for new custom scheme Branding.plist parameters

* - remove test values from Branding.plist

* - move build options from `app.` space to `build.` space and rename options accordingly
- add legacy support for previously used Branding.plist build customization option names
- add `BuildOptions` class to `ownCloudApp` framework to make build customization options visible in documentation

* - ensure BuildOptions class is actually loaded/initialized

* - update Xcode to 12.5.1 for GitHub workflow configuration-documentation.yml

* - adapt code in `ImportPasteboardAction.swift` to also compile in Xcode 12.4

* Configuration documentation updated

Co-authored-by: felix-schwarz <felix-schwarz@users.noreply.github.com>
Co-authored-by: Matthias Hühne <mhuehne@owncloud.com>

* - switch to ios-sdk milestone/11.7.2

* add an accesibility id for the access files row, so that it can be matched by the autom tests

* quote shell command, because it can contain spaces in path name

* added public release notes for version 11.8.0

* fixed regression test findings

* fixed toolbar visibility on iPad, if should not be shown

* updated in-app changelog and added calens changelog entries

* Calens changelog updated

* - change SDK to 11.8 release

* - updated fastlane release notes
- changed changelog folder name

* Calens changelog updated

Co-authored-by: Felix Schwarz <fs-git@iospirit.com>
Co-authored-by: felix-schwarz <felix-schwarz@users.noreply.github.com>
Co-authored-by: Jesus Recio <jrecio@izertis.com>
Co-authored-by: hosy <hosy@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants