Skip to content

Fix #10405 Context check for ImagePreviewFragment#10430

Merged
AlvaroBrey merged 1 commit intonextcloud:masterfrom
Tiam-Abderezai:bugfix/10405/check_context_in_PreviewImageFragment
Aug 3, 2022
Merged

Fix #10405 Context check for ImagePreviewFragment#10430
AlvaroBrey merged 1 commit intonextcloud:masterfrom
Tiam-Abderezai:bugfix/10405/check_context_in_PreviewImageFragment

Conversation

@Tiam-Abderezai
Copy link
Contributor

@Tiam-Abderezai Tiam-Abderezai commented Jun 23, 2022 •
edited by AlvaroBrey
Loading

Show only error snackbar if context is available

  • Tests written, or not not needed

@AlvaroBrey
Copy link
Member

AlvaroBrey commented Jul 7, 2022

/rebase

@AlvaroBrey AlvaroBrey self-requested a review July 7, 2022 08:08
@AlvaroBrey AlvaroBrey linked an issue Jul 7, 2022 that may be closed by this pull request
Crash when Clicking through Images #10405
Closed
@AlvaroBrey
Copy link
Member

AlvaroBrey commented Jul 8, 2022

@Tiam-Abderezai can you rebase this on master, please?

@Tiam-Abderezai Tiam-Abderezai force-pushed the bugfix/10405/check_context_in_PreviewImageFragment branch from 130f4c7 to bf7be67 Compare July 9, 2022 15:06
@Tiam-Abderezai
Copy link
Contributor Author

Tiam-Abderezai commented Jul 9, 2022 •
edited
Loading

@AlvaroBrey Please forgive me, I'm not certain if my attempt was successful. Can you please provide me with instructions to achieve this? I assure you it won't happen again.

I did the following (if not mistaken):

1.) fetched the latest from remote master to local master
2.) pulled latest from local master into local fix branch
3.) rebased from local fix branch into remote master branch
4.) pushed changes from local fix to remote fix branch
5.) merged from remote fix to remote master

I doubt it worked, I'd appreciate if you could help me understand the steps.

@codecov
Copy link

codecov bot commented Jul 9, 2022 •
edited
Loading

Codecov Report

Merging #10430 (bf7be67) into master (ee5b444) will increase coverage by 26.01%.
The diff coverage is 19.91%.

❗ Current head bf7be67 differs from pull request most recent head e38e70f. Consider uploading reports for the commit e38e70f to get more accurate results

@@              Coverage Diff              @@
##             master   #10430       +/-   ##
=============================================
+ Coverage      3.29%   29.31%   +26.01%     
- Complexity      428     3005     +2577     
=============================================
  Files           540      540               
  Lines         40194    40193        -1     
  Branches       5554     5552        -2     
=============================================
+ Hits           1325    11781    +10456     
+ Misses        38788    26589    -12199     
- Partials         81     1823     +1742
Impacted Files Coverage Δ
...extcloud/client/errorhandling/ShowErrorActivity.kt 0.00% <ø> (ø)
.../com/nextcloud/client/jobs/BackgroundJobFactory.kt 56.19% <0.00%> (+29.75%) ⬆️
.../com/nextcloud/client/jobs/BackgroundJobManager.kt 0.00% <ø> (ø)
.../nextcloud/client/jobs/BackgroundJobManagerImpl.kt 61.63% <0.00%> (+61.63%) ⬆️
.../java/com/nextcloud/client/jobs/FilesExportWork.kt 0.00% <0.00%> (ø)
.../java/com/nextcloud/client/jobs/OfflineSyncWork.kt 20.31% <0.00%> (+20.31%) ⬆️
...n/java/com/nextcloud/client/mixins/SessionMixin.kt 67.44% <ø> (+39.53%) ⬆️
.../android/authentication/AuthenticatorActivity.java 38.75% <0.00%> (+36.09%) ⬆️
...loud/android/datamodel/FileDataStorageManager.java 58.21% <0.00%> (+58.13%) ⬆️
...wncloud/android/files/services/FileDownloader.java 16.49% <0.00%> (+16.49%) ⬆️
... and 360 more

@AlvaroBrey
Copy link
Member

AlvaroBrey commented Jul 11, 2022 •
edited
Loading

Can you please provide me with instructions to achieve this?

git remote add upstream git@github.com:nextcloud/android.git
git fetch upstream
git checkout <your branch name>
git rebase upstream/master
git push --force-with-lease

@Tiam-Abderezai Tiam-Abderezai force-pushed the bugfix/10405/check_context_in_PreviewImageFragment branch from bf7be67 to 0db31e1 Compare July 11, 2022 15:21
@Tiam-Abderezai
Copy link
Contributor Author

Tiam-Abderezai commented Jul 11, 2022

@AlvaroBrey Thank you. I followed your steps. Please review.

@AlvaroBrey
Copy link
Member

AlvaroBrey commented Jul 12, 2022

Hey @Tiam-Abderezai, thank you! Please fix DCO and we'll merge this. Info: https://github.com/nextcloud/android/pull/10430/checks?check_run_id=7285373379

@Tiam-Abderezai Tiam-Abderezai force-pushed the bugfix/10405/check_context_in_PreviewImageFragment branch from 0db31e1 to 439da1f Compare July 31, 2022 09:45
@Tiam-Abderezai
Fix nextcloud#10405
e38e70f 
Show only error snackbar if context is available
Signed-off-by: Tiam Abderezai <tiam.abderezai@gmail.com>

Signed-off-by: Tiam <tiam.abderezai@gmail.com>
@Tiam-Abderezai Tiam-Abderezai force-pushed the bugfix/10405/check_context_in_PreviewImageFragment branch from 439da1f to e38e70f Compare July 31, 2022 09:52
@Tiam-Abderezai
Copy link
Contributor Author

Tiam-Abderezai commented Jul 31, 2022

@AlvaroBrey fixed the DCO issue.

@nextcloud-android-bot
Copy link
Collaborator

nextcloud-android-bot commented Aug 3, 2022

master-IT test failed: https://www.kaminsky.me/nc-dev/android-integrationTests/5642-IT-master-14-22

@AlvaroBrey AlvaroBrey merged commit ac948df into nextcloud:master Aug 3, 2022
@AlvaroBrey
Copy link
Member

AlvaroBrey commented Aug 3, 2022

Thanks @Tiam-Abderezai !

@AlvaroBrey
Copy link
Member

AlvaroBrey commented Aug 3, 2022

/backport to stable-3.21

@AlvaroBrey AlvaroBrey added this to the Nextcloud App 3.22.0 milestone Aug 3, 2022
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Aug 3, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AlvaroBrey AlvaroBrey Awaiting requested review from AlvaroBrey

Assignees

No one assigned

Labels

3. to review

Projects

None yet

Milestone

Nextcloud App 3.22.0

Development

Successfully merging this pull request may close these issues.

Crash when Clicking through Images

3 participants

@Tiam-Abderezai @AlvaroBrey @nextcloud-android-bot

Comments