6575 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mario Danic	5fee93d975	Declare string where needed	2017-03-03 11:08:13 +01:00
Mario Danic	a53e289a3e	This is useless	2017-03-03 11:08:13 +01:00
Mario Danic	c9749698fa	Fix a bug	2017-03-03 11:08:12 +01:00
Mario Danic	4f461b788e	Fix	2017-03-03 11:08:12 +01:00
AndyScherzinger	35284f93a5	made expected path a local variable since it is only used in one place	2017-03-03 11:08:12 +01:00
Mario Danic	832f2c4733	Put delete file back	2017-03-03 11:08:11 +01:00
Mario Danic	de3fe5e7df	Attempt to fix move	2017-03-03 11:08:11 +01:00
Mario Danic	bb20395e98	Revert "Revert "Try to fix changes between upload behaviour"" ... This reverts commit e7da3ede5e. # Conflicts: # src/com/owncloud/android/operations/UploadFileOperation.java	2017-03-03 11:08:11 +01:00
Mario Danic	b3e668ffa6	Remove useless import	2017-03-03 11:08:10 +01:00
AndyScherzinger	f13b1f2ef2	minor reformatting and javaDoc fixes	2017-03-03 11:08:10 +01:00
AndyScherzinger	16d81b4fa6	extract pattern to a constant	2017-03-03 11:08:10 +01:00
Mario Danic	62126daff2	Update stuff according to review	2017-03-03 11:08:09 +01:00
AndyScherzinger	b2e8cff801	change documentation	2017-03-03 11:08:09 +01:00
AndyScherzinger	5de19e2936	removed unnecessary line break	2017-03-03 11:08:09 +01:00
Mario Danic	9d45479f0f	Update android job	2017-03-03 11:08:08 +01:00
Mario Danic	01e9a3568e	Update dependency	2017-03-03 11:08:08 +01:00
AndyScherzinger	8f3c052ab5	remove unnecessary line break	2017-03-03 11:08:08 +01:00
AndyScherzinger	650a09d52c	moved legacyClean flag to app's PreferenceManager	2017-03-03 11:08:07 +01:00
AndyScherzinger	1bd5113589	cleanup MediaStore on upload behavior "delete"	2017-03-03 11:08:07 +01:00
Mario Danic	4c86922597	Revert "Use stable android-job lib" ... This reverts commit 1c28fc69bad34cd781dfe655fa051a622d7b2e62.	2017-03-03 11:08:07 +01:00
Mario Danic	0be1f75d5b	Remove unused imports	2017-03-03 11:08:06 +01:00
Mario Danic	c09f9e9ae5	Remove vars we don’t use	2017-03-03 11:08:06 +01:00
Mario Danic	aa10589e55	Show all uploads	2017-03-03 11:08:06 +01:00
AndyScherzinger	316554f5a5	added break to switch statement	2017-03-03 11:08:05 +01:00
AndyScherzinger	5e5e9b609f	remove warning, adding generic brackets	2017-03-03 11:08:05 +01:00
AndyScherzinger	bdb3a566a5	rename function to deleteSyncedFoldersNotInList	2017-03-03 11:08:05 +01:00
Mario Danic	e245b1f91d	Revert "Remove play services" ... This reverts commit d860d942ede22fb53d6d610a99d3e71ad18a7be7.	2017-03-03 11:08:04 +01:00
Mario Danic	56a9998efb	Remove play services	2017-03-03 11:08:04 +01:00
Mario Danic	065cbd9d93	Remove magic	2017-03-03 11:08:04 +01:00
Mario Danic	80de60a51f	Delete delay for delete	2017-03-03 11:08:03 +01:00
Mario Danic	96cfa5d16f	Use stable android-job lib	2017-03-03 11:08:03 +01:00
Mario Danic	3b755d48d2	Clean up code	2017-03-03 11:08:03 +01:00
Mario Danic	4bf833cf4d	Chande delay slightly	2017-03-03 11:08:02 +01:00
Mario Danic	488c41d134	Fix path	2017-03-03 11:08:02 +01:00
Mario Danic	c935617898	Attempt to fix	2017-03-03 11:08:02 +01:00
Mario Danic	49c27b1464	Revert "Attempt to fix stuff" ... This reverts commit 58b640a8c85f090c9d8b9fc8de342e95a708f7a0.	2017-03-03 11:08:01 +01:00
Mario Danic	8bfdd0047c	Attempt to fix stuff	2017-03-03 11:08:01 +01:00
Mario Danic	004cfd5760	Revert "Try to fix changes between upload behaviour" ... This reverts commit c61ad342e462ebba43a4022d4214ed2bfe13cb6f.	2017-03-03 11:08:01 +01:00
Mario Danic	8804a019d8	Try to fix changes between upload behaviour	2017-03-03 11:08:01 +01:00
Mario Danic	602b3c1982	Remove stuff we don’t need	2017-03-03 11:08:00 +01:00
Mario Danic	759d0df4a9	Fix it all	2017-03-03 11:08:00 +01:00
Mario Danic	9ff5f2b769	Fix empty stuff	2017-03-03 11:07:59 +01:00
Mario Danic	9960434c4b	Try to fix videos	2017-03-03 11:07:59 +01:00
Morris Jobke	5548d17bc4	test new image ... Signed-off-by: Morris Jobke <hey@morrisjobke.de>	2017-03-03 11:07:59 +01:00
Mario Danic	f95446eaf1	Remove obsolete stuff	2017-03-03 11:07:58 +01:00
Mario Danic	4d6cc118b2	Update gradle	2017-03-03 11:07:58 +01:00
Mario Danic	91257c83ab	Multidex import	2017-03-03 11:07:58 +01:00
Mario Danic	3860b94d07	Add multidex magic	2017-03-03 11:07:58 +01:00
Mario Danic	66c2a80bec	Do not persist	2017-03-03 11:07:57 +01:00
Mario Danic	140f2d9b7b	Remove obsolete stuff	2017-03-03 11:07:57 +01:00