Skip to content

Beta - #169

Closed
tobiasKaminsky wants to merge 1451 commits into
masterfrom
beta
Closed

Beta#169
tobiasKaminsky wants to merge 1451 commits into
masterfrom
beta

Conversation

@tobiasKaminsky

Copy link
Copy Markdown
Member

Dummy PR

@AndyScherzinger

Copy link
Copy Markdown
Member

Just being on my phone, did you also update the search provider for user and groups and also the document provider?

@tobiasKaminsky

Copy link
Copy Markdown
MemberAuthor

Yes, but you can test it of course to make sure everything is working.
I have tested it, but of course I could have overseen something

@AndyScherzinger

Copy link
Copy Markdown
Member

Sure, will do. Most likely Monday or Tuesday. Don't have the time before that :(

Comment threadAndroidManifest.xml

<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Isn't this now a double entry looking at lines 63/64?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not double, but triple ;)
Thanks for the catch!

AndyScherzinger
AndyScherzinger previously approved these changes Sep 22, 2016
Comment threadbuild.gradle Outdated
}


dexOptions {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Now the dex options are duplicated?! 0_o @tobiasKaminsky

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

removed

public static long getUsableSpace(String accountName) {
File savePath = new File(MainApp.getStoragePath());
return savePath.getUsableSpace();
File savePath = Environment.getExternalStorageDirectory();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is legacy and the removed code was the newer version


public static String getLogPath() {
return MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator + "log";
return Environment.getExternalStorageDirectory() + File.separator + MainApp.getDataFolder() + File.separator + "log";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is legacy and the removed code was the newer version (ExternalSD card)

@AndyScherzinger

Copy link
Copy Markdown
Member

@tobiasKaminsky can you do another beta release? This would then automatically include nextcloud/android-library#21 :) So this could then be tested, works with the test account I got.

@AndyScherzinger
AndyScherzinger dismissed their stale reviewOctober 26, 2016 19:50

need to reblock merge to master

@AndyScherzingerAndyScherzinger left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

review to block beta to be merged

Comment threadres/values/attrs.xml
<item>DELETE</item>
<item>LOCAL_BEHAVIOUR_FORGET</item>
<item>LOCAL_BEHAVIOUR_MOVE</item>
<item>LOCAL_BEHAVIOUR_DELETE</item>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Does this impact pre lollipop devices, since this is still used in the older preferences screen?

AndyScherzinger
AndyScherzinger previously approved these changes Nov 22, 2016

@AndyScherzingerAndyScherzinger left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

blocking review, so it won't be accidentally merged to master

Comment threadbetaUpdateStatus Outdated
[13 / 13] Master (nextcloud/master) [https://github.com/nextcloud/android] merged successfully
2017-02-06
Branches: 12
[01 / 12] Rewrite auto upload (nextcloud/rewrite-auto-upload) [https://github.com/nextcloud/android/pull/615] CONFLICT

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@mario to get some feedback, can you try to manually merge (and resolving conflicts) this into the beta branch? That way we can probably get some feedback :)

tobiasKaminskyand others added 8 commits February 6, 2017 00:38
commit ada7a6b
Author: Mario Danic <mario@lovelyhq.com>
Date: Mon Feb 6 02:13:20 2017 +0100
Attempt to fix HDR issues
commit 2d3ee4f
Author: Mario Danic <mario@lovelyhq.com>
Date: Mon Feb 6 01:49:43 2017 +0100
Optimize imports
commit bb08dc7
Author: Mario Danic <mario@lovelyhq.com>
Date: Mon Feb 6 01:46:08 2017 +0100
Fix persistance
commit 93b7899
Author: Mario Danic <mario@lovelyhq.com>
Date: Mon Feb 6 01:30:19 2017 +0100
Revert "Use different models"
This reverts commit ab901a6.
commit ab901a6
Author: Mario Danic <mario@lovelyhq.com>
Date: Mon Feb 6 01:25:04 2017 +0100
Use different models
commit 18fc3bb
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 23:54:03 2017 +0100
Fix a serialization bug
commit ff641bf
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 23:15:36 2017 +0100
Create new file
commit 63259a1
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 23:13:55 2017 +0100
Fix a bug
commit 21aa2ea
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 22:59:09 2017 +0100
Revert "Remove useless conditions"
This reverts commit 5dd6d91.
commit 9b37348
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 22:56:51 2017 +0100
Remove useless conditions
commit 4de7261
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 22:52:50 2017 +0100
Magical magical stuff
commit c73b8df
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 22:02:24 2017 +0100
Fix a typo with tmp files
commit 98b4422
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 22:01:45 2017 +0100
Progress on implementing persistance
commit 0eba0c3
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 10:19:55 2017 +0100
Add persistence layer on service start
commit 870b6bb
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 05:02:23 2017 +0100
Move to approach without reflection
commit 39228a0
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 03:22:48 2017 +0100
Preparation for persistance
commit d74da82
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 01:23:39 2017 +0100
First step towards list persistance
commit dbf1c09
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 00:18:47 2017 +0100
Ignore temporary files
commit 21fee81
Author: Mario Danic <mario@lovelyhq.com>
Date: Sun Feb 5 00:07:10 2017 +0100
Fix a bug with SyncedFolderProvider
commit c0dc9fb
Author: Mario Danic <mario@lovelyhq.com>
Date: Sat Feb 4 23:28:33 2017 +0100
Small bugfix
commit 75b4703
Author: Mario Danic <mario@lovelyhq.com>
Date: Fri Feb 3 11:38:40 2017 +0100
Update copyrights
commit 77f42fd
Author: Mario Danic <mario@lovelyhq.com>
Date: Fri Feb 3 11:35:04 2017 +0100
Remove strange <p> stuff
commit a1371bd
Author: Mario Danic <mario@lovelyhq.com>
Date: Fri Feb 3 01:57:14 2017 +0100
Silence codacy
commit 7b0154d
Author: Mario Danic <mario@lovelyhq.com>
Date: Fri Feb 3 00:23:06 2017 +0100
Enable menu item on 5.0
commit 6204c7e
Author: Mario Danic <mario@lovelyhq.com>
Date: Fri Feb 3 00:10:06 2017 +0100
Update a comment
commit 77d6b64
Author: Mario Danic <mario@lovelyhq.com>
Date: Fri Feb 3 00:07:15 2017 +0100
Revert a typo
commit 4d25169
Author: Mario Danic <mario@lovelyhq.com>
Date: Fri Feb 3 00:03:37 2017 +0100
Introduce rewritten auto upload
@tobiasKaminsky

Copy link
Copy Markdown
MemberAuthor

Closing as this drives Codacy crazy ;-)

@tobiasKaminsky

Copy link
Copy Markdown
MemberAuthor

Do NOT remove beta branch!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@tobiasKaminsky@AndyScherzinger@mario@davigonz@jabarros@davivel@carstendev