Skip to content

E2e ux #11031

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
Merged
merged 15 commits into from
Nov 25, 2022
Merged

E2e ux #11031

merged 15 commits into from
Nov 25, 2022

Conversation

@tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Nov 14, 2022 •
edited
Loading

Fix #10980
Needs: nextcloud/android-library#1000

  • Tests written, or not not needed

@codecov
Copy link

codecov bot commented Nov 14, 2022 •
edited
Loading

Codecov Report

Merging #11031 (393e34d) into master (1c4a106) will increase coverage by 27.70%.
The diff coverage is 14.28%.

Additional details and impacted files 
@@              Coverage Diff              @@
##             master   #11031       +/-   ##
=============================================
+ Coverage      3.19%   30.90%   +27.70%     
- Complexity      419     3276     +2857     
=============================================
  Files           563      564        +1     
  Lines         41511    41616      +105     
  Branches       5643     5657       +14     
=============================================
+ Hits           1328    12863    +11535     
+ Misses        40098    26816    -13282     
- Partials         85     1937     +1852
Impacted Files Coverage Δ
...com/nextcloud/client/database/NextcloudDatabase.kt 100.00% <ø> (+100.00%) ⬆️
...xtcloud/client/database/entity/CapabilityEntity.kt 0.00% <0.00%> (ø)
...va/com/nextcloud/client/jobs/AccountRemovalWork.kt 0.00% <0.00%> (ø)
...ain/java/com/owncloud/android/db/ProviderMeta.java 100.00% <ø> (+100.00%) ⬆️
...oud/android/ui/activity/SetupEncryptionActivity.kt 0.00% <0.00%> (ø)
...droid/ui/dialog/SetupEncryptionDialogFragment.java 0.00% <0.00%> (ø)
...va/com/owncloud/android/utils/EncryptionUtils.java 82.83% <0.00%> (+82.83%) ⬆️
...owncloud/android/ui/activity/SettingsActivity.java 42.40% <32.75%> (+42.40%) ⬆️
...loud/android/datamodel/FileDataStorageManager.java 61.98% <100.00%> (+61.90%) ⬆️
.../java/com/owncloud/android/datamodel/GalleryRow.kt 50.00% <0.00%> (ø)
... and 291 more

@tobiasKaminsky tobiasKaminsky mentioned this pull request Nov 15, 2022
Closed
@tobiasKaminsky tobiasKaminsky marked this pull request as ready for review November 16, 2022 13:23
AlvaroBrey
AlvaroBrey requested changes Nov 16, 2022
View reviewed changes
Copy link
Member

@AlvaroBrey AlvaroBrey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like the text under the preference is too long. I'd rather show a dialog with that text, which when clicking "OK" starts the other e2e setup steps. Additionally, see comments below

@tobiasKaminsky
Copy link
Member Author

tobiasKaminsky commented Nov 16, 2022

I feel like the text under the preference is too long. I'd rather show a dialog with that text, which when clicking "OK" starts the other e2e setup steps.

True, but idea from designer is that user can directly understand what is done, and do not first has to think if clicking on it might directly enable it.

AlvaroBrey
AlvaroBrey reviewed Nov 17, 2022
View reviewed changes
@AlvaroBrey
Copy link
Member

AlvaroBrey commented Nov 17, 2022

Screenshot tests need updating

@AlvaroBrey AlvaroBrey self-requested a review November 18, 2022 10:52
@tobiasKaminsky tobiasKaminsky mentioned this pull request Nov 18, 2022
Merged
AlvaroBrey
AlvaroBrey reviewed Nov 18, 2022
View reviewed changes
@AlvaroBrey
Copy link
Member

AlvaroBrey commented Nov 18, 2022

/rebase

@Aizmansor

This comment was marked as spam.

Sign in to view
surinder-tsys added a commit to nextmcloud/android that referenced this pull request Nov 22, 2022
@surinder-tsys
E2EE setup with removing passphrase locally applied as per NC PR: nex…
e0cec17 
…tcloud#11031 & library PR: nextcloud/android-library#1000
surinder-tsys added a commit to surinder-tsys/android-library that referenced this pull request Nov 22, 2022
@surinder-tsys
E2EE setup with removing passphrase locally applied as per NC PR: nex…
24b5afc 
…tcloud/android#11031 & library PR: nextcloud#1000
@AlvaroBrey
Copy link
Member

AlvaroBrey commented Nov 22, 2022

/rebase

tobiasKaminsky and others added 15 commits November 24, 2022 15:40
@tobiasKaminsky @AlvaroBrey
Better show different states of E2E
5b4aba1 
Co-authored-by: Álvaro Brey <[email protected]>
Signed-off-by: Tobias Kaminsky <[email protected]>
Signed-off-by: tobiasKaminsky <[email protected]>
@tobiasKaminsky @AlvaroBrey
Update app/src/main/res/values/strings.xml
9f1f21e 
Co-authored-by: Álvaro Brey <[email protected]>
Signed-off-by: Tobias Kaminsky <[email protected]>
@AlvaroBrey @tobiasKaminsky
Update screenshots for SettingsActivity
fc446b1 
Signed-off-by: Álvaro Brey <[email protected]>
@AlvaroBrey @tobiasKaminsky
Close SetupEncryptionActivity when dialog is dismissed
6568d1d 
Signed-off-by: Álvaro Brey <[email protected]>
@AlvaroBrey @tobiasKaminsky
SetupEncryptionActivity: finish activity when error happens
09aac00 
Signed-off-by: Álvaro Brey <[email protected]>
@AlvaroBrey @tobiasKaminsky
SetupEncryptionActivity: give transparent background to make it more …
b1b05f7 
…seamless

Signed-off-by: Álvaro Brey <[email protected]>
@AlvaroBrey @tobiasKaminsky
SetupEncryptionDialogFragment: use builtin onCancel for setting cance…
1b945b6 
…l result

This captures back button as well

Signed-off-by: Álvaro Brey <[email protected]>
@tobiasKaminsky
properly handle stage 2: key exists, but e2e is not setup on this device
e3a7453 
Signed-off-by: tobiasKaminsky <[email protected]>
@AlvaroBrey @tobiasKaminsky
SettingsActivity: fix conditional to show e2e encrypt option
6b4d6a6 
Signed-off-by: Álvaro Brey <[email protected]>
@AlvaroBrey @tobiasKaminsky
Pass through SetupEncryptionDF result to SettingsActivity
0d09825 
Signed-off-by: Álvaro Brey <[email protected]>
@AlvaroBrey @tobiasKaminsky
Restore database v65 schema from master
30d38de 
Mistakenly changed!

Signed-off-by: Álvaro Brey <[email protected]>
@AlvaroBrey @tobiasKaminsky
NextcloudDatabase: enable automigration for new db version
b110735 
Signed-off-by: Álvaro Brey <[email protected]>
@tobiasKaminsky
hide e2e options after removing local e2e setup
f49252c 
Signed-off-by: tobiasKaminsky <[email protected]>
@tobiasKaminsky
revert to master library
3f82d37 
Signed-off-by: tobiasKaminsky <[email protected]>
@tobiasKaminsky
restart SettingsActivity after changing e2e settings
393e34d 
Signed-off-by: tobiasKaminsky <[email protected]>
@github-actions
Copy link

github-actions bot commented Nov 24, 2022

Codacy

Lint

TypemasterPR
Warnings8282
Errors00

SpotBugs

CategoryBaseNew
Bad practice2727
Correctness4545
Dodgy code342336
Internationalization99
Multithreaded correctness99
Performance5858
Security1818
Total508502

@github-actions
Copy link

github-actions bot commented Nov 24, 2022

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/11031.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@github-actions
Copy link

github-actions bot commented Nov 24, 2022

blue-Light-Screenshot test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/11031-Screenshot-blue-Light-15-15

@tobiasKaminsky tobiasKaminsky merged commit 161bc98 into master Nov 25, 2022
@delete-merged-branch delete-merged-branch bot deleted the e2eUX branch November 25, 2022 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AlvaroBrey AlvaroBrey AlvaroBrey approved these changes

Assignees

No one assigned

Labels

3. to review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

E2E: better UX

4 participants

@tobiasKaminsky @AlvaroBrey @Aizmansor