Fixed crash during folder creation (autosync) #5465

Kilian-Perisset · 2020-02-13T11:55:49Z

Hi,
I fixed bug relative to folder picker, because mFile was always returning null.

codecov · 2020-02-13T12:33:41Z

Codecov Report

Merging #5465 into master will increase coverage by 0.31%.
The diff coverage is 41.17%.

@@             Coverage Diff              @@
##             master    #5465      +/-   ##
============================================
+ Coverage     21.78%   22.09%   +0.31%     
  Complexity        3        3              
============================================
  Files           398      398              
  Lines         33326    33362      +36     
  Branches       4674     4680       +6     
============================================
+ Hits           7259     7373     +114     
+ Misses        24888    24802      -86     
- Partials       1179     1187       +8

Impacted Files	Coverage Δ	Complexity Δ
...loud/android/ui/activity/FolderPickerActivity.java	`32.57% <41.17%> (+32.57%)`	`0 <0> (ø)`	⬇️
...va/com/owncloud/android/ui/SquareLinearLayout.java	`0% <0%> (-50%)`	`0% <0%> (ø)`
...d/android/operations/GetCapabilitiesOperation.java	`75% <0%> (-12.5%)`	`0% <0%> (ø)`
...xtcloud/client/account/UserAccountManagerImpl.java	`60.68% <0%> (-1.73%)`	`0% <0%> (ø)`
...wncloud/android/jobs/MediaFoldersDetectionJob.java	`23.27% <0%> (-1.5%)`	`0% <0%> (ø)`
.../third_parties/daveKoeller/AlphanumComparator.java	`82.14% <0%> (-1.2%)`	`0% <0%> (ø)`
...owncloud/android/ui/adapter/OCFileListAdapter.java	`35.42% <0%> (-0.72%)`	`0% <0%> (ø)`
.../java/com/owncloud/android/utils/DisplayUtils.java	`30.9% <0%> (-0.43%)`	`0% <0%> (ø)`
...in/java/com/owncloud/android/utils/ThemeUtils.java	`52.69% <0%> (-0.39%)`	`0% <0%> (ø)`
...cloud/android/ui/activity/FileDisplayActivity.java	`22.97% <0%> (-0.32%)`	`0% <0%> (ø)`
... and 18 more

nextcloud-android-bot · 2020-02-13T13:08:53Z

Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

AndyScherzinger · 2020-02-13T13:27:09Z

src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityTest.java

@@ -0,0 +1,71 @@
+package com.owncloud.android.ui.activity;


@Shagequi can you add the license header please :)

Sure, will be done

AndyScherzinger · 2020-02-13T13:28:11Z

src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

@@ -302,7 +299,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
        boolean retval = true;
        switch (item.getItemId()) {
            case R.id.action_create_dir: {
-                CreateFolderDialogFragment dialog = CreateFolderDialogFragment.newInstance(getCurrentFolder());
+                OCFile currentFolder = getCurrentFolder();
+                CreateFolderDialogFragment dialog = CreateFolderDialogFragment.newInstance(currentFolder);


no need to split this into two statements, could be reverted (or did I miss a detail here?)

I guess this was just for debugging, but true, this can be reverted.

Yup it was for debugging.
I'm glad it's this name, I sometimes have an excess of imagination in my development (for naming variables or logs 😅)...

I'll fix it ASAP, am working on another project

Wo worries, no hurries :)

AndyScherzinger · 2020-02-13T13:29:57Z

@Shagequi Just two minor issues 👍

tobiasKaminsky · 2020-02-13T14:25:27Z

src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

+            if (currentFile.isFolder()) {
+                finalFolder = currentFile;
+            } else if(currentFile.getRemotePath() != null) {
+                String parentPath = currentFile


I would use new File(currentFile.getRemotePath()).getParent() for this.

Yeah, I forgot this point too,
will be fixed asap too

"asap" -> do not hurry too much :-)

This method doesn't work, we need to use the FileStorageManager in all cases, I stay with this solution for now

String parentPath = new File(currentFile.getRemotePath()).getParent(); String parentPath1 = currentFile .getRemotePath() .substring(0, currentFile.getRemotePath() .lastIndexOf(currentFile.getFileName()));

Should be exactly the same, and is not error prone :-)

But, why create a File object, if we're expecting an OCFile object ?

This is just for handling the path part.
I think, using File, is more error prone than trying to to it by our selves.

src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityTest.java

src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java

nextcloud-android-bot · 2020-02-14T12:41:35Z

Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

Kilian-Perisset · 2020-02-17T09:57:02Z

@tobiasKaminsky Now it's done, would you please merge this important fix ?

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

tobiasKaminsky · 2020-02-17T14:06:03Z

I rebased, added two tests and if everything is green, we can merge.

nextcloud-android-bot · 2020-02-17T14:08:59Z

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

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 · 2020-02-17T14:20:48Z

Codacy

360

Lint

Type	master	PR
Warnings	77	77
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	71
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	78
Security Warnings	45
Dodgy code Warnings	138
Total	385

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	71
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	78
Security Warnings	45
Dodgy code Warnings	138
Total	385

Kilian-Perisset · 2020-02-17T16:01:11Z

All the tests are green :D

3f62afa Merge remote-tracking branch 'origin/master' into dev 5d428fe Merge pull request #4788 from nextcloud/instantupload_all 49f3a67 ConflictsResolveActivity: code style and readability improvements 6540e3e Upload list conflicts: replace trash icon with menu and add resolve action a4ff1f1 Customize upload sync conflict notification strings e77ffa0 Fix synced folder layout form control widgets alignment 91ef307 Fix database migration of field forceOverwrite to NameCollisionPolicy 52d089b FileUploader: fix codacy issues and SpotBugs ec27f84 FileUploader: code cleanup 7713a28 FileUploader: require explicit NameCollisionPolicy and change default used value 6783e8a Make file uploads ask the user what to do when the file already exists on remote 213002f Make newly created synced folders auto upload existing files by default 1b7bd72 ADD: [instantupload] setting to also upload existing files c243453 Merge pull request #5465 from nextcloud/fix/create-folder-crash-autosync d178cde daily dev 20200218

Kilian-Perisset mentioned this pull request Feb 13, 2020

App crashes every time I try to create a new folder #4792

Closed

AndyScherzinger reviewed Feb 13, 2020

View reviewed changes

AndyScherzinger added the 3. to review label Feb 13, 2020

tobiasKaminsky reviewed Feb 13, 2020

View reviewed changes

ezaquarii requested changes Feb 14, 2020

View reviewed changes

Kilian Périsset and others added 6 commits February 17, 2020 14:45

Fixed bug relative to null folder in FolderPicker

511a166

Implemented tests for FolderPickerActivity

389090d

Formated the code (removed useless spaces)

c821f19

Formated the code + added header

c59f9c0

Replaced OCFile by File in getFolder() method

467104c

added tests

a93313c

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

tobiasKaminsky force-pushed the fix/create-folder-crash-autosync branch from 49842a9 to a93313c Compare February 17, 2020 14:05

tobiasKaminsky approved these changes Feb 17, 2020

View reviewed changes

tobiasKaminsky mentioned this pull request Feb 18, 2020

Streamline test pattern #5486

Open

tobiasKaminsky merged commit c243453 into master Feb 18, 2020

delete-merged-branch bot deleted the fix/create-folder-crash-autosync branch February 18, 2020 06:28

AndyScherzinger added this to the Nextcloud App 3.11.0 milestone Feb 18, 2020

Kilian-Perisset mentioned this pull request Mar 16, 2020

Exception on activating auto file upload #5431

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed crash during folder creation (autosync) #5465

Fixed crash during folder creation (autosync) #5465

Kilian-Perisset commented Feb 13, 2020 •

edited by AndyScherzinger

Loading

codecov bot commented Feb 13, 2020 •

edited

Loading

nextcloud-android-bot commented Feb 13, 2020

AndyScherzinger Feb 13, 2020

Kilian-Perisset Feb 13, 2020

AndyScherzinger Feb 13, 2020

tobiasKaminsky Feb 13, 2020

Kilian-Perisset Feb 13, 2020

AndyScherzinger Feb 13, 2020

AndyScherzinger commented Feb 13, 2020

tobiasKaminsky Feb 13, 2020

Kilian-Perisset Feb 13, 2020

tobiasKaminsky Feb 13, 2020

Kilian-Perisset Feb 14, 2020

tobiasKaminsky Feb 14, 2020

Kilian-Perisset Feb 14, 2020 •

edited

Loading

tobiasKaminsky Feb 17, 2020

nextcloud-android-bot commented Feb 14, 2020

Kilian-Perisset commented Feb 17, 2020

tobiasKaminsky commented Feb 17, 2020

nextcloud-android-bot commented Feb 17, 2020

nextcloud-android-bot commented Feb 17, 2020

Kilian-Perisset commented Feb 17, 2020

Fixed crash during folder creation (autosync) #5465

Fixed crash during folder creation (autosync) #5465

Conversation

Kilian-Perisset commented Feb 13, 2020 • edited by AndyScherzinger Loading

codecov bot commented Feb 13, 2020 • edited Loading

Codecov Report

nextcloud-android-bot commented Feb 13, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndyScherzinger commented Feb 13, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Kilian-Perisset Feb 14, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nextcloud-android-bot commented Feb 14, 2020

Kilian-Perisset commented Feb 17, 2020

tobiasKaminsky commented Feb 17, 2020

nextcloud-android-bot commented Feb 17, 2020

nextcloud-android-bot commented Feb 17, 2020

Codacy

Lint

SpotBugs (new)

SpotBugs (master)

Kilian-Perisset commented Feb 17, 2020

Kilian-Perisset commented Feb 13, 2020 •

edited by AndyScherzinger

Loading

codecov bot commented Feb 13, 2020 •

edited

Loading

Kilian-Perisset Feb 14, 2020 •

edited

Loading