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.

Sign up for GitHub

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

Jump to bottom

[fix/biometrical-unlock-setup] Fix: Setup Passcode with Biometrical Unlock #1112

Merged
merged 2 commits into from
Mar 24, 2022
Merged

[fix/biometrical-unlock-setup] Fix: Setup Passcode with Biometrical Unlock #1112

merged 2 commits into from
Mar 24, 2022

Conversation

hosy
Copy link
Collaborator

@hosy hosy commented Mar 23, 2022

Description

Fix for passcode setup with biometrical unlock enabled:

  • biometrical unlock button no longer appear in setup view
  • after passcode was successfully setup, show biometrical unlock for permissions dialog

Related Issue

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

Motivation and Context

  • do not show UI elements, which are not available in a context
  • show permission dialog in setup context

How Has This Been Tested?

  • Test setting up passcode with biometrical unlock in unbranded client
  • Test in branded client (use the code below in Branding.plist)
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>branding.organization-name</key>
<string>Demo</string>
<key>branding.profile-bookmark-name</key>
<string>Demo</string>
<key>branding.profile-url</key>
<string>https://demo.owncloud.com/</string>
<key>passcode.use-biometrical-unlock</key>
<true/>
<key>passcode.enforced</key>
<true/>
</dict>
</plist>

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.
  • Added an issue with details about all relevant changes in the iOS documentation repository.
  • 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
#5086 fix for passcode setup with biometrical unlock enabled:
6e40da1 
- biometrical unlock button no longer appear in setup view
- after passcode was successfully setup, show biometrical unlock for permissions dialog
@hosy hosy requested review from felix-schwarz and jesmrec March 23, 2022 20:35
@hosy hosy mentioned this pull request Mar 24, 2022
Merged
6 tasks
@jesmrec
Copy link
Contributor

jesmrec commented Mar 24, 2022 •
edited
Loading

QA:

tested with the regular app by using the configuration:

<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>passcode.enforced</key>
	<string>xxxx</string>
	<key>passcode.use-biometrical-unlock</key>
	<xxxx/>
</dict>
</plist>
Passcode enforced = true Passcode enforced = false
use-biometrical-unlock = true Passcode is enforced ✅
Happy face not displayed ✅
Biometrical unlocked ✅		 Passcode is not enforced ✅
Happy face not displayed ✅
Biometrical unlocked ✅
use-biometrical-unlock = false Passcode is enforced ✅
Happy face not displayed ✅
Biometrical asked ✅		 Passcode is not enforced ✅
Happy face not displayed ✅
Biometrical asked ✅

Tested with iPhoneXR iOS15, iPadAir iPadOS14

For me, it works fine and the problem is fixed

Don't forget the Calens entry!!

CC @hosy

@jesmrec jesmrec added the Approved by QA Approved by QA label Mar 24, 2022
@hosy hosy merged commit fde7e56 into milestone/11.10 Mar 24, 2022
@jesmrec jesmrec mentioned this pull request Mar 25, 2022
Closed
34 tasks
hosy added a commit that referenced this pull request Mar 29, 2022
@felix-schwarz @hosy
[milestone/11.9.1] Milestone 11.9.1 (#1111)
70cdc22 
* - BookmarkViewController: re-add infinite PROPFIND code previously removed due to a merge error
- update CHANGELOG.md
- bump build and version numbers
- update ios-sdk to increase timeout for start of response to infinite PROPFIND from 30 seconds to 6 minutes

* Calens changelog updated

* [feature/fastlane-app-group-identifier] Set App Group Identifier by Fastlane via Branding.plist (#1099)

* new version number 11.9.0, enabled beta build and warning

* [feature/infinite-propfind] Infinite PROPFIND support (#1002)

* - ProgressIndicatorViewController : extend with Progress object and cancellation support / monitoring
- BookmarkViewController: add infinite PROPFIND prepopulation step after account creation
- update SDK to provide infinite PROPFIND support

* Configuration documentation updated

* - update SDK to gain access to streaming infinite PROPFIND
- switch from receive+parse to stream+parse for infinite PROPFIND

* - update SDK to gain access to new supportsInfinitePropfind capability
- BookmarkViewController: make prepopulation configurable, using new capability and new class setting
- ProgressIndicatorViewController: add support for new title label view

* - BookmarkViewController: fix property name typo
- scheme: add new options to test streaming and split bookmark prepopulation

* Configuration documentation updated

* 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"

* - adjust to final capabilities naming for infinite PROPFIND support

* upgraded app version numbers

Co-authored-by: felix-schwarz <[email protected]>
Co-authored-by: Matthias Hühne <[email protected]>
Co-authored-by: Matthias Hühne <[email protected]>

* [feature/poll-efficiency] Poll for changes efficiency enhancements (#1043)

* - change text in the footer below private links in accordance with owncloud/enterprise#4726

* - SDK update

* - ClientRootViewController: start OCFileProviderServiceStandby only
	- after the connection status is online (== authentication successful)
	- OR 5 seconds after receiving the core from the Core Manager
- fix theoretical bug in ClientRootViewController where OCFileProviderServiceStandby could be started and not stopped if Core Manager returned a core with error

* - bump version to 11.7.2 / build 202

* - FileProviderExtension:
	- handle case where OCDatabase is not available or not open (previously led to a hang/crash as the FP waited for a DB call to return)
	- disable malloc stack logging as it leads to immediate crashes when debugging the file provider

* - update SDK to new version with support for coordinated scan for changes

* - bump build number to 203

Co-authored-by: Matthias Hühne <[email protected]>

* Configuration documentation updated

* [fix/media-playback-url] Fix WebDAV endpoint URL for media playback after restoration (#1093)

* - fix owncloud/enterprise#4924 via SDK update

* Configuration documentation updated

Co-authored-by: Matthias Hühne <[email protected]>
Co-authored-by: hosy <[email protected]>

* [feature/webfinger] Webfinger / server location (#1059)

* - change text in the footer below private links in accordance with owncloud/enterprise#4726

* - SDK update

* 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 <[email protected]>

* [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

* - StaticLoginSetupViewController: add support for OCServerLocator, requesting a username if it is enabled
- add additional debug options to ownCloud.xcscheme
- update SDK to gain access to OCServerLocator

* updated APP_VERSION number

* reverted merge conflict changes

* using correct SDK commit

* using latest development sdk commit

Co-authored-by: Matthias Hühne <[email protected]>
Co-authored-by: Matthias Hühne <[email protected]>

* changed app version number

* #4918 added the possiblity, to set a custom app group identifier via Branding.plist parameter "build.app-group-identifier", which will be set by fastlane to all needed key/value pairs. This is needed, if customer using a own resigning script, which does not handle setting the app group identifier.

* added documentation and changelog entry

* Calens changelog updated

* - add additional parameter build.oc-app-group-identifier that only changes the OCAppGroupIdentifier and OCKeychainAccessGroupIdentifier keys in Info.plist

* - add ownCloud/Resources/Info.plist to list of files to replace OCAppGroupIdentifier and OCKeychainAccessGroupIdentifier in

* added documentation for the new build key

* added missing translation string

* [feature/rename-accounts] Rename Account without Authentication Flow (#1097)

* #972 rename account name only (bookmark) is possible without re-authentication flow

* added changelog entry

* moved duplicated code into a function for reuse

* fixed issue link in changelog entry

* Calens changelog updated

* fixed code review finding

* fixed QA findings 1,2,3
- show UI to delete authentication data in edit mode
- only proceed without authentication, if authentication data is not nil

* show delete authentication data UI in all edit mode calls

Co-authored-by: hosy <[email protected]>

* #5008 (2) only show "Settings" toolbar, if no account is configured, otherwise "Settings" would appear twice

* [feature/biometrical-button] Biometrical Authentication Button (#1098)

* #1004 added biometrical unlock button, which appears by default as fallback, if biometrical unlock does not work (in file provider or not detected)

* - added fallback image for face-id too
- added changelog entry

* Calens changelog updated

* - fixed visibility of biometrical button in edit mode and, if feature is not enabled
- removed unneeded code

* - AppLockManager: add new property biometricCancelLabel to provide a label for the Cancel-option when presenting biometric authentication
- FileProviderUI / DocumentActionViewController: use new property to display "Cancel" instead of "Enter code" for biometric authentication

Co-authored-by: hosy <[email protected]>
Co-authored-by: Felix Schwarz <[email protected]>

* Calens changelog updated

* Calens changelog updated

* Calens changelog updated

* fixed merge conflicts

* Calens changelog updated

* fixed syntax error

* fixed syntax error

* added missing changelog entry

* Calens changelog updated

Co-authored-by: Felix Schwarz <[email protected]>
Co-authored-by: felix-schwarz <[email protected]>
Co-authored-by: hosy <[email protected]>
Co-authored-by: Matthias Hühne <>

* updated changelog and release notes

* Calens changelog updated

* - SDK update to improve handling of token refresh "responses" while offline
- add scheme env variable to turn on/off auth race condition simulator

* - ios-sdk update: fix dead-lock
- BookmarkViewController: fix finding (1) in #1109

* - update commit to latest develop commit including OCBookmarkManager deadlock fix

* - change SDK to latest develop version

* [fix/biometrical-unlock-setup] Fix: Setup Passcode with Biometrical Unlock (#1112)

* #5086 fix for passcode setup with biometrical unlock enabled:
- biometrical unlock button no longer appear in setup view
- after passcode was successfully setup, show biometrical unlock for permissions dialog

* removed unneeded comment

* added changelog and release notes

* Calens changelog updated

* reverted to Xcode 12 version

* - update to SDK release 11.9.1 (master)

* changed folder name for changelog release

* Calens changelog updated

Co-authored-by: felix-schwarz <[email protected]>
Co-authored-by: Matthias Hühne <[email protected]>
Co-authored-by: hosy <[email protected]>
Co-authored-by: Matthias Hühne <>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jesmrec jesmrec jesmrec approved these changes

@felix-schwarz felix-schwarz felix-schwarz approved these changes

Assignees
No one assigned
Labels
Approved by QA Approved by QA
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hosy @jesmrec @felix-schwarz