mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-22 16:54:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
8839 commits 221 branches 1589 tags 640 MiB
Commit graph

5190 commits

Author SHA1 Message Date
Nextcloud bot
c33c275470
[tx-robot] updated from transifex 2017-09-01 00:28:42 +00:00
tobiaskaminsky
b499bce225
use same String for Intent 2017-08-31 13:38:10 +02:00
tobiaskaminsky
d3754d156a
revert creating object in loop 2017-08-31 13:03:40 +02:00
tobiaskaminsky
853350221f
- use nullable 
- only add non-null object to list
 2017-08-31 13:03:40 +02:00
tobiaskaminsky
9174397939
- switch if branch for easier readability 
- show snackbar only for webview (for old login there is a decent error warning)
 2017-08-31 09:37:31 +02:00
Nextcloud bot
713fd35aaf
[tx-robot] updated from transifex 2017-08-31 00:28:43 +00:00
Nextcloud bot
7799336a79
[tx-robot] updated from transifex 2017-08-30 00:28:59 +00:00
Nextcloud bot
0007fbe795
[tx-robot] updated from transifex 2017-08-29 00:29:36 +00:00
tobiasKaminsky
16584da0ed also extract this one... 2017-08-28 14:54:31 +02:00
tobiasKaminsky
6447eebb3d extract string ressource 2017-08-28 14:54:31 +02:00
tobiasKaminsky
4acbeee05f show snackbar after 60s to redirect to old login 2017-08-28 14:54:31 +02:00
tobiasKaminsky
d04da84a16 url returned by new weblogin flow is url encoded 2017-08-28 14:54:31 +02:00
tobiasKaminsky
081525bc9e restart weblogin flow if auth failed 2017-08-28 14:54:31 +02:00
Nextcloud bot
7818cbfca3
[tx-robot] updated from transifex 2017-08-28 11:02:48 +00:00
Nextcloud bot
de74c6b974
[tx-robot] updated from transifex 2017-08-28 10:52:46 +00:00
AndyScherzinger
a89a46a417 resolves #1398 fix NPE if error occurs retrieving the parents from the server 2017-08-28 12:40:57 +02:00
Mario Đanić
d94274c8a7 Merge pull request #1437 from nextcloud/fixDialogBadTokenException 
Fix dialog bad token exception
 2017-08-28 10:34:07 +02:00
Mario Đanić
89d6e6ab6c Merge pull request #1438 from nextcloud/allowBackButtonCancelDialog 
Add ability to cancel dialog via back button
 2017-08-28 10:32:09 +02:00
AndyScherzinger
d5db3d43ff
resolves #1439 - by runnign the UI operations in the UI thread (anything else will crash, like seen on GPlay) 2017-08-26 19:46:42 +02:00
AndyScherzinger
164711f40b
resolves #1434 - adding the ability to cancel the dialog via calncel-button and HW/SW-back-button 2017-08-26 19:20:16 +02:00
AndyScherzinger
9a6ebe7a84
resolves #1399 - hardening dialog call in case app is shutting down at the exact same moment 2017-08-26 18:54:23 +02:00
AndyScherzinger
ad9556b89b
bump version to RC5 2017-08-25 15:33:47 +02:00
AndyScherzinger
c4cea4f12b
add null check to theme util method 2017-08-25 14:55:53 +02:00
AndyScherzinger
c6360ae198
add null check for action bar coloring 2017-08-25 14:55:53 +02:00
tobiasKaminsky
ef61ccae5e
fix non themed actionbar text in activities list activity 2017-08-25 14:55:53 +02:00
tobiasKaminsky
3bae26ef66
fix hsl 2017-08-25 14:55:53 +02:00
AndyScherzinger
1ffeb7a11a
lint: remove unused string 2017-08-25 12:54:46 +02:00
AndyScherzinger
60574d6de1
fix import statement 2017-08-24 18:51:20 +02:00
AndyScherzinger
a680c90da3
line length 2017-08-24 18:34:41 +02:00
AndyScherzinger
2bc57557f9
set color for notification for modified build too 2017-08-24 18:30:28 +02:00
AndyScherzinger
08f5e71d20
codacy: remove unused code 2017-08-24 18:27:34 +02:00
AndyScherzinger
4fa8eb7409
set theming color for notification 2017-08-24 18:25:10 +02:00
AndyScherzinger
c73d102291
fix spacing 2017-08-23 16:47:36 +02:00
AndyScherzinger
e4028493fd
fix 2017-08-23 16:46:03 +02:00
AndyScherzinger
037b2a363d
fix code review 2017-08-23 16:44:29 +02:00
AndyScherzinger
35db685639
remove logging 2017-08-23 16:38:35 +02:00
AndyScherzinger
be26905e36
fix push notifications for 12.0.2 2017-08-23 16:35:44 +02:00
Mario Đanić
5426104cea Merge pull request #1404 from nextcloud/fixFingerprintActivityNPE 
Prevent NPE in FingerprintActivity
 2017-08-23 14:19:18 +02:00
Mario Đanić
1e7f609812 Merge pull request #1408 from nextcloud/fixUploadFilesActivityNPE 
Prevent NPE for menuItem state
 2017-08-23 14:19:08 +02:00
Nextcloud bot
283858cbae
[tx-robot] updated from transifex 2017-08-23 00:28:34 +00:00
AndyScherzinger
7bc1a955e2
resolves #1405 - checking for menuItem not existing before accessing its check state 2017-08-22 19:11:45 +02:00
AndyScherzinger
eafee1abf3
resolves #1403 - check for null since the cancellationSignal is null if the device doesn't have a secure keyguard or no matching algorithm 2017-08-22 14:51:22 +02:00
Nextcloud bot
bd09a09fbe
[tx-robot] updated from transifex 2017-08-22 00:28:46 +00:00
Nextcloud bot
9a9f40f1fb
[tx-robot] updated from transifex 2017-08-21 18:11:44 +00:00
Mario Danic
5d9c7c4c6a Fix upload requirements 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-21 19:35:19 +02:00
tobiasKaminsky
964f463f43
if context is null, try to get set it 2017-08-21 18:40:09 +02:00
AndyScherzinger
dcece32f72
resolves #1387 by adding a fallback when setting the span text doesn't work 2017-08-21 14:04:23 +02:00
tobiaskaminsky
4284ce8c34
harden database upgrade 2017-08-21 11:46:39 +02:00
Nextcloud bot
30af2f8b67
[tx-robot] updated from transifex 2017-08-21 09:45:50 +00:00
Nextcloud bot
ff7aaa147d
[tx-robot] updated from transifex 2017-08-21 09:27:45 +00:00
AndyScherzinger
26fad60280
bump version to 2.0.0RC4 2017-08-21 10:00:01 +02:00
Allan Nordhøy
13a6aea2c4
Spelling: Android, comma 2017-08-21 09:50:38 +02:00
AndyScherzinger
d6bcb576e0
resolves #1382 #1383 by using ThemeUtils implementation 2017-08-21 08:56:13 +02:00
Nextcloud bot
b18f6b394c
[tx-robot] updated from transifex 2017-08-21 00:28:22 +00:00
Nextcloud bot
1a43b8f683
[tx-robot] updated from transifex 2017-08-20 00:28:10 +00:00
Nextcloud bot
29bfc1abeb
[tx-robot] updated from transifex 2017-08-19 00:29:16 +00:00
Nextcloud bot
fe093cc7d0
[tx-robot] updated from transifex 2017-08-18 14:29:51 +00:00
AndyScherzinger
0e4d50347d
revert visibility test change 2017-08-18 15:43:42 +02:00
AndyScherzinger
dc9c1cfbd4
lint: remove unused strings 2017-08-18 15:38:07 +02:00
AndyScherzinger
fcf132c529
lint: fix descriptions on user info graphics 2017-08-18 13:54:01 +02:00
Nextcloud bot
99979abaf7
[tx-robot] updated from transifex 2017-08-18 08:18:44 +00:00
Nextcloud bot
9ecc1a7710
[tx-robot] updated from transifex 2017-08-18 08:10:47 +00:00
Nextcloud bot
be0caadd67
[tx-robot] updated from transifex 2017-08-18 08:01:13 +00:00
Tobias Kaminsky
33af68536a Merge branch 'master' into removeGCMagain 2017-08-18 09:46:03 +02:00
AndyScherzinger
7be05b5e6a
update to latest status icon design and fix syncronizing and failed state icons 2017-08-18 09:25:47 +02:00
Tobias Kaminsky
85a355ed07 Merge pull request #1362 from nextcloud/handleForeignBroadcast 
Handle foreign broadcast
 2017-08-18 09:22:52 +02:00
Tobias Kaminsky
d8b4393787 Merge pull request #1361 from nextcloud/untrustedCerts 
Fix rare case: ssl cert is ok for checkServer, but not for webview
 2017-08-18 09:22:35 +02:00
Tobias Kaminsky
c76f862ddf Merge pull request #1355 from nextcloud/mediaFolderNPE 
Prevent NPE on absolutePath
 2017-08-18 09:21:35 +02:00
tobiaskaminsky
7d69fe5552
removed a random warning 2017-08-18 09:19:33 +02:00
Tobias Kaminsky
c68ed60b59 Merge branch 'master' into handleForeignBroadcast 2017-08-18 09:05:43 +02:00
Tobias Kaminsky
ebccea21f7 Merge branch 'master' into untrustedCerts 2017-08-18 09:05:26 +02:00
Tobias Kaminsky
bad6f34829 Merge pull request #1356 from nextcloud/deleteCookiesException 
CookieManager.getInstance() can throw an Exception without saying so
 2017-08-18 09:04:37 +02:00
Tobias Kaminsky
371a09c572 Merge branch 'master' into mediaFolderNPE 2017-08-18 09:04:14 +02:00
Tobias Kaminsky
312208462b Merge pull request #1352 from nextcloud/userInfoCrash 
Check if background string is empty
 2017-08-18 09:02:56 +02:00
Tobias Kaminsky
6826f9dda3 Merge pull request #1348 from nextcloud/activitiesThumbnails 
Use ocs api header for thumbnails
 2017-08-18 09:02:38 +02:00
Tobias Kaminsky
09de435ebc Merge pull request #1342 from nextcloud/errorDuringDbUpgrade 
Check if columns exists prior adding them
 2017-08-18 09:02:17 +02:00
Tobias Kaminsky
6cc81e2ea7 Merge pull request #1367 from nextcloud/validFilePath 
Check if valid path
 2017-08-18 08:58:04 +02:00
Nextcloud bot
a4e6076261
[tx-robot] updated from transifex 2017-08-18 05:40:46 +00:00
Tobias Kaminsky
f7034e2f8a Merge pull request #980 from nextcloud/changelog 
Start working on 2.0.0 changelog
 2017-08-18 07:38:59 +02:00
Tobias Kaminsky
ab961ca8e9 Merge ce12e6e398 into ea3f8d07db 2017-08-18 05:32:40 +00:00
tobiaskaminsky
ce12e6e398
check if valid path 2017-08-18 07:31:48 +02:00
Nextcloud bot
ea3f8d07db
[tx-robot] updated from transifex 2017-08-18 00:28:33 +00:00
AndyScherzinger
4d4e7a5606
fix lint for the merge (will be removed by transifex afterwards) 2017-08-17 15:24:26 +02:00
tobiaskaminsky
a4350b9ff2
add slides 2017-08-17 15:00:15 +02:00
tobiaskaminsky
9e7a4cb594
add whats new screen for version 1.5 2017-08-17 15:00:14 +02:00
tobiaskaminsky
e499e393e4
- using versionCode instead of string 
- changed branch that it is mergeable into master for translation
 2017-08-17 15:00:14 +02:00
tobiaskaminsky
7f7fd3ae6a
wording 2017-08-17 15:00:14 +02:00
tobiaskaminsky
ae4ef70e36
add slides 2017-08-17 15:00:13 +02:00
tobiasKaminsky
71e16238e5
center title 2017-08-17 15:00:13 +02:00
tobiaskaminsky
b95aeeb51c
add whats new screen for version 1.5 2017-08-17 15:00:13 +02:00
AndyScherzinger
8eea18803d
set version to 2.0.0RC3 2017-08-17 15:00:12 +02:00
AndyScherzinger
73b0ca3bd6
set final/stable release version to 2.0.0 2017-08-17 15:00:11 +02:00
tobiaskaminsky
ec568b7483
handle foreign broadcast 2017-08-17 14:25:24 +02:00
tobiaskaminsky
fe6a549532
fix rare case: ssl cert is ok for checkServer, but not for webview -> show untrustedDialog 2017-08-17 11:13:02 +02:00
AndyScherzinger
5cead89381
hardening of video retrieval according to image hardening 2017-08-17 09:29:36 +02:00
tobiaskaminsky
caf9242e10
prevent NPE on absolutePath 2017-08-17 09:29:36 +02:00
Nextcloud bot
31547ccb14
[tx-robot] updated from transifex 2017-08-17 00:28:02 +00:00
tobiaskaminsky
2af14be41b
appearantly CookieManager.getInstance() can throw an Exception without saying so... 2017-08-16 16:30:00 +02:00
tobiaskaminsky
8a21a1ad21
re-add user theming columns if they do not exist yet 2017-08-16 16:00:02 +02:00
tobiaskaminsky
a44475d15f
check if background string is empty 2017-08-16 11:09:00 +02:00
tobiaskaminsky
0454ab14f3
use ocs api header 2017-08-16 10:50:16 +02:00
Nextcloud bot
0e763b9397
[tx-robot] updated from transifex 2017-08-16 00:28:16 +00:00
Nextcloud bot
05d3b8ea51
[tx-robot] updated from transifex 2017-08-15 00:29:46 +00:00
tobiaskaminsky
14cf7243aa
check if columns exists prior adding them 2017-08-14 13:34:35 +02:00
Nextcloud bot
99700bbe3c
[tx-robot] updated from transifex 2017-08-14 00:27:38 +00:00
Nextcloud bot
667413eb0a
[tx-robot] updated from transifex 2017-08-13 00:27:47 +00:00
Nextcloud bot
c18d5c77fe
[tx-robot] updated from transifex 2017-08-12 00:27:55 +00:00
Andy Scherzinger
519702c7c4 Merge pull request #1314 from nextcloud/colorThreshold 
Use same color detection as in server
 2017-08-11 16:55:31 +02:00
Mario Đanić
e3fe9485a6 Merge pull request #1315 from nextcloud/enterURL 
check server on enter click
 2017-08-11 16:54:04 +02:00
Joas Schilling
ee1f4c5f18
No thumbnail for non-files 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-11 15:39:41 +02:00
tobiaskaminsky
5252d24cee
check server on enter click 2017-08-11 15:29:32 +02:00
tobiaskaminsky
fa35cc5914
use same color detection as https://github.com/nextcloud/server/pull/5953/files#diff-3de1769d04fcc4f13f8d546d9fbdac19 2017-08-11 14:46:47 +02:00
tobiasKaminsky
e37c1b9b6d
fix: #1222 2017-08-11 09:06:41 +02:00
Nextcloud bot
7d1a23af0e
[tx-robot] updated from transifex 2017-08-11 00:27:32 +00:00
Mario Danic
22ecbfd71b Update modified 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-10 19:54:04 +02:00
Mario Danic
ecd0ff3b0d Update version 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-10 19:53:14 +02:00
Andy Scherzinger
46ff9288e1 Merge pull request #1299 from nextcloud/release200RC1 
2.0.0 RC1
 2017-08-10 18:45:07 +02:00
Nextcloud bot
dafae31e14
[tx-robot] updated from transifex 2017-08-10 16:44:53 +00:00
AndyScherzinger
bec836f36a
Fix name to be 2.0.0RC1 2017-08-10 18:33:33 +02:00
AndyScherzinger
381355e9f3
bum version to 2.0.0 RC1 2017-08-10 18:24:07 +02:00
Mario Đanić
ed71cdac9c Merge branch 'master' into lintWarnings 2017-08-10 18:23:02 +02:00
AndyScherzinger
df55791c5d
remove unused code 2017-08-10 16:37:50 +02:00
AndyScherzinger
05b0ff492e
cleanup lang files for further obsolete strings 2017-08-10 16:37:38 +02:00
AndyScherzinger
9ab6f3cd4a
cleanup lang files for further obsolete strings 2017-08-10 16:37:38 +02:00
AndyScherzinger
af35cb50e5
cleanup lang files for further obsolete strings 2017-08-10 16:37:37 +02:00
AndyScherzinger
5b40f120c6
cleanup lang files for lint build 2017-08-10 16:37:37 +02:00
AndyScherzinger
3c43602cd6
revert menu items 2017-08-10 16:37:36 +02:00
AndyScherzinger
0054d7fc92
remove further unused strings 2017-08-10 16:37:36 +02:00
AndyScherzinger
7b8f67ff36
replace ... with proper &#8230; 2017-08-10 16:37:36 +02:00
AndyScherzinger
acbf30642a
remove unsued preferences/strings 2017-08-10 16:37:35 +02:00
AndyScherzinger
89fba7f040
remove unused strings 2017-08-10 16:37:35 +02:00
tobiasKaminsky
ffa50ed82d
remove unused ressources 2017-08-10 16:37:34 +02:00
tobiasKaminsky
38657443d8
removed some unused code to get the warnings down ;-) 2017-08-10 16:32:10 +02:00
AndyScherzinger
e30bc9eefc
add object descriptions for accessibility 2017-08-10 16:32:10 +02:00
tobiasKaminsky
91579554a8
remove them in translated files 2017-08-10 16:32:09 +02:00
AndyScherzinger
160fc45c27
remove unsused string 2017-08-10 16:31:46 +02:00
tobiaskaminsky
5535ff3c0e
FileFragment Avoid non default constructors in fragments use a default 2017-08-10 16:31:25 +02:00
tobiaskaminsky
5d4049aab9
add cast 2017-08-10 16:31:24 +02:00
tobiaskaminsky
887c1c4263
PreviewMediaFragment java 124 Avoid non default constructors in fragments use a default 2017-08-10 16:31:20 +02:00
Andy Scherzinger
2b2fb45732 Merge pull request #1292 from nextcloud/autoUploadLight 
Make auto upload light working again
 2017-08-10 16:27:04 +02:00
tobiasKaminsky
86844523ee
disable expert mode on auto upload light, also no custom folders, doing it right now... 2017-08-10 13:52:20 +02:00
tobiasKaminsky
67c77adf40
removed some unused code to get the warnings down ;-) 2017-08-10 12:34:21 +02:00
tobiasKaminsky
fecc468307
removed some unused code to get the warnings down ;-) 2017-08-10 12:29:42 +02:00
tobiasKaminsky
185887bb42
disable expert mode on auto upload light, also no custom folders 2017-08-10 11:13:04 +02:00
Nextcloud bot
a532e269bd
[tx-robot] updated from transifex 2017-08-10 00:28:25 +00:00
Tobias Kaminsky
46e62cfb80 Merge efd1167ce6 into 43b751605b 2017-08-09 12:15:27 +00:00
tobiasKaminsky
efd1167ce6
make auto upload light working again 2017-08-09 14:14:56 +02:00
Nextcloud bot
43b751605b
[tx-robot] updated from transifex 2017-08-09 00:27:29 +00:00
tobiaskaminsky
4aa189954a
some minor changes 2017-08-08 15:18:37 +02:00
AndyScherzinger
727a7326ee
Revert "minor code cleanups due to code review" 
This reverts commit ea6dcaa958a233d29bffd0ee01932b9e75f86122.
 2017-08-08 15:18:36 +02:00
AndyScherzinger
dd6bd6f399
organize imports after rebase 2017-08-08 15:18:36 +02:00
AndyScherzinger
a9100e5d8e
minor code cleanups due to code review 2017-08-08 15:18:36 +02:00
Victor Nidens
ec322ff8a8
Sharing menus aren't visible anymore for shared files without resharing permissions #1176 2017-08-08 15:18:35 +02:00
Victor Nidens
a9857b800c
Added warning when trying to reshare a file without necessary permissions 2017-08-08 15:18:35 +02:00
Victor Nidens
0991b14904
Resharing toggle hidden if the resharing is disabled in server settings #1177 2017-08-08 15:18:17 +02:00
tobiaskaminsky
8bd39d9438
LoadingDialog.java:50: Avoid non-default constructors in fragments 2017-08-08 13:23:45 +02:00
tobiaskaminsky
12fd76de5b
fix: ThemeUtils.java:257: AppCompatCheckBox.setSupportButtonTintList can only be called from within the same library group (groupId=com.android.support) 2017-08-08 13:23:45 +02:00
tobiaskaminsky
65e6e0a8e5
replace constant: ../../../src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java:179: Must be one or more of: ... 2017-08-08 13:23:41 +02:00
AndyScherzinger
d10f981b0f
fix folder migration 2017-08-08 13:00:06 +02:00
AndyScherzinger
0ef2739d26
remove further unused code 2017-08-08 13:00:06 +02:00
AndyScherzinger
f812d5b8c3
fix RTL issue 2017-08-08 13:00:05 +02:00
AndyScherzinger
bddce2080d
minor code formatting cleanups 2017-08-08 13:00:05 +02:00
AndyScherzinger
19ec306b8c
remove unused layouts 2017-08-08 13:00:04 +02:00
AndyScherzinger
b82b72f2b3
add content description and rtl fixes 2017-08-08 13:00:03 +02:00
AndyScherzinger
2e947eac61
fix some rtl warnings 2017-08-08 13:00:03 +02:00
AndyScherzinger
d643d28c58
fix codacy warnings 2017-08-08 13:00:03 +02:00
AndyScherzinger
5d2b30d86c
removing unsed reources 2017-08-08 13:00:02 +02:00
AndyScherzinger
7e879f7bcd
lint: remove unused resources 2017-08-08 13:00:02 +02:00
AndyScherzinger
4781c0703f
remove further unused resources 2017-08-08 13:00:02 +02:00
AndyScherzinger
51c17f0614
codacy: remove unused code 2017-08-08 13:00:01 +02:00
AndyScherzinger
953ee85268
file line length 2017-08-08 13:00:01 +02:00
AndyScherzinger
aeda198d5b
CR: use enum instead of Integer 2017-08-08 13:00:00 +02:00
AndyScherzinger
2cb8785fd0
lint: remove hardcoded strings 2017-08-08 13:00:00 +02:00
AndyScherzinger
29ff68bb79
rename icon work that isn't a menu icon 2017-08-08 13:00:00 +02:00
AndyScherzinger
667dd10ac7
remove further unused ressources (lint) 2017-08-08 12:59:59 +02:00
AndyScherzinger
13ecb580f1
remove first batch of unused resources 2017-08-08 12:59:59 +02:00
AndyScherzinger
c3be2fe72f
fix string call 2017-08-08 12:59:58 +02:00
AndyScherzinger
d7ed716468
fix further lint errors 2017-08-08 12:59:58 +02:00
AndyScherzinger
ab9325da3b
fix lint error moving constant to preferences 2017-08-08 12:59:58 +02:00
AndyScherzinger
7f22be5355
fix lint error 2017-08-08 12:59:57 +02:00
AndyScherzinger
fbcfa02142
fix lint errors 2017-08-08 12:59:57 +02:00
AndyScherzinger
21d1c56e4d
fix Combining Ellipsize and Maxlines (lint) 2017-08-08 12:59:56 +02:00
Mario Danic
334a6852c6
Optimize imports 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:56 +02:00
Mario Danic
5e974670b4
Fix review stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:55 +02:00
Mario Danic
656d5c1ca9
Fix bugs 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:55 +02:00
Mario Danic
934d8ecaf8
Remove resources 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:54 +02:00
Mario Danic
c68f02ec57
Put custom folders intto expert 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:53 +02:00
Mario Danic
1cd5d8dc8a
Remove obsolete methods 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:53 +02:00
Mario Danic
aff05ef57f
Update from legacy 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:53 +02:00
Mario Danic
1066512ef2
Fix merge 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:52 +02:00
Mario Danic
2af9039c50
Remove instant upload screen 
Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/Preferences.java
 2017-08-08 12:59:52 +02:00
Mario Danic
8dfdf92118
Clarify receivers 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:52 +02:00
Mario Danic
c1c3775752
Network receivers & Pre-JellyBeanMR1 charging 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:51 +02:00
Mario Danic
360f1ec1b3
Fix retries 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:51 +02:00
Mario Danic
3c79642bb3
Stop trimming uploads 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:51 +02:00
Mario Danic
9766c24db9
Codacy stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:50 +02:00
Mario Danic
6a47a2fe01
Simplify 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:50 +02:00
Mario Danic
4c50bb999c
Fix stuff 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:50 +02:00
Mario Danic
7c6245a6b7
Update methods 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:49 +02:00
Mario Danic
c3daf45f74
Update for N 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:49 +02:00