Skip to content

Conversation

@grote
Copy link
Member

@grote grote commented Dec 16, 2019

This also removes the last instance of generateResizedImage() which was
crashing NextCloud with OOM errors.

Fixes #4999

@grote grote force-pushed the thumbnail-fix branch 2 times, most recently from 0baa217 to 625bce7 Compare December 16, 2019 14:18
Copy link
Member

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

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

Just one issue where I am unsure if @grote is right or if we need to keep it (https://github.com/nextcloud/android/pull/5018/files#r358322910)

@codecov
Copy link

codecov bot commented Dec 16, 2019

Codecov Report

Merging #5018 into master will increase coverage by <.01%.
The diff coverage is 0%.

@@             Coverage Diff              @@
##             master    #5018      +/-   ##
============================================
+ Coverage     17.53%   17.54%   +<.01%     
  Complexity        3        3              
============================================
  Files           385      385              
  Lines         32679    32686       +7     
  Branches       4594     4601       +7     
============================================
+ Hits           5731     5734       +3     
- Misses        26018    26023       +5     
+ Partials        930      929       -1
Impacted Files Coverage Δ Complexity Δ
...ncloud/android/operations/RenameFileOperation.java 0% <0%> (ø) 0 <0> (ø) ⬇️
.../java/com/owncloud/android/utils/MimeTypeUtil.java 86.4% <0%> (-0.22%) 0 <0> (ø)
...ncloud/android/operations/UploadFileOperation.java 24.87% <0%> (-0.57%) 0 <0> (ø)
...loud/android/datamodel/FileDataStorageManager.java 36.19% <0%> (-0.35%) 0 <0> (ø)
...wncloud/android/files/services/FileDownloader.java 16.85% <0%> (-0.07%) 0 <0> (ø)
...ncloud/android/operations/RemoveFileOperation.java 43.33% <0%> (-4.95%) 0 <0> (ø)
...n/java/com/owncloud/android/utils/BitmapUtils.java 43.91% <0%> (-9.46%) 0% <0%> (ø)
...loud/android/datamodel/ThumbnailsCacheManager.java 32.29% <0%> (-1.46%) 0% <0%> (ø)
...oud/android/operations/RefreshFolderOperation.java 56.95% <0%> (-0.44%) 0% <0%> (ø)
... and 7 more

Copy link
Member

@tobiasKaminsky tobiasKaminsky left a comment

Choose a reason for hiding this comment

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

--> do not remove it, but check for mimetype and do this only on images.

Fixes nextcloud#4999

Signed-off-by: Torsten Grote <t@grobox.de>
@nextcloud-android-bot
Copy link
Collaborator

Codacy Here is an overview of what got changed by this pull request:

Issues
======
- Added 1
           

Complexity increasing per file
==============================
- src/main/java/com/owncloud/android/operations/RemoveFileOperation.java  1
- src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java  1
         

See the complete overview on Codacy

@nextcloud-android-bot
Copy link
Collaborator

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/12020.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.

@nextcloud-android-bot
Copy link
Collaborator

Codacy

328

Lint

TypemasterPR
Warnings7373
Errors00

SpotBugs (new)

Warning TypeNumber
Bad practice Warnings26
Correctness Warnings70
Internationalization Warnings13
Malicious code vulnerability Warnings5
Multithreaded correctness Warnings9
Performance Warnings106
Security Warnings44
Dodgy code Warnings136
Total409

SpotBugs (master)

Warning TypeNumber
Bad practice Warnings26
Correctness Warnings70
Internationalization Warnings13
Malicious code vulnerability Warnings5
Multithreaded correctness Warnings9
Performance Warnings106
Security Warnings44
Dodgy code Warnings136
Total409

@AndyScherzinger AndyScherzinger merged commit b4c3a7d into nextcloud:master Dec 19, 2019
@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.10.0 milestone Dec 19, 2019
@AndyScherzinger
Copy link
Member

Thanks for the fix @grote ❤️

tobiasKaminsky added a commit that referenced this pull request Dec 20, 2019
6af9523 Merge pull request #4890 from nextcloud/directEditing
b4c3a7d Merge pull request #5018 from grote/thumbnail-fix
b207671 fix during CI
d231370 Merge pull request #4829 from nextcloud/dependabot/gradle/tools.fastlane-screengrab-2.0.0
0d84a2d warning about used feature in newer SDK
b4ea014 use master branch
ec2cfef Direct editing support - abstract EditorWebView - support direct editing endpoint
f2627a2 enable caching
ddffaf7 use custom user agent for onlyOffice
0178499 remove unneeded static string
f25127d revert to master snapshot
95afe8c use editor id to use any editor
d05de98 use file path as parameter for open direct editing file
300abba make sure TextEditor is also only used ond >= Android 5, due to security reason of javascript interface
994817c get direct editing info from endpoint
b31cee5 prevent NPE
d1611f6 Direct editing support - abstract EditorWebView - support direct editing endpoint
516c464 override minSDK for lib
10a667b Bump screengrab from 1.2.0 to 2.0.0
9fbedb4 Merge pull request #4992 from nextcloud/uiComparison
751301c daily dev 20191219
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Only trigger media scanner for media files

4 participants