3599 commits

Author	SHA1	Message	Date
tobiasKaminsky	71ea26df31	remove firebase from branding branch and put it into branch "analytics"	2017-03-22 20:18:37 +01:00
AndyScherzinger	02e94fb21a	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-21 16:48:42 +01:00
Mario Danic	85a37b563f	Revert "Update branding setup" ... This reverts commit d7161474a2.	2017-03-17 19:09:17 +01:00
Mario Danic	d7161474a2	Update branding setup	2017-03-17 18:28:14 +01:00
Mario Danic	105f609a3f	Properly remove add account	2017-03-17 17:13:25 +01:00
AndyScherzinger	4077980ea0	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-16 23:09:58 +01:00
Mario Danic	8a04689e92	Fix sharing	2017-03-16 18:04:21 +01:00
Mario Danic	f0249be463	Fix search users	2017-03-14 22:59:35 +01:00
AndyScherzinger	2fbc7d05cf	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-14 21:56:31 +01:00
Mario Danic	f14d340dae	Add all required screen names	2017-03-06 12:08:51 +01:00
Mario Danic	1732f7dc73	Some work on Firebase integration	2017-03-06 09:58:50 +01:00
Mario Danic	21e8f5530b	Merge branch 'master' into branding	2017-03-06 08:10:16 +01:00
Mario Danic	d3ec3b3c46	Remove useless import	2017-03-05 22:24:26 +01:00
Mario Danic	cfe8d3c064	Various search fixes	2017-03-05 22:15:27 +01:00
Mario Danic	b7e41eeff1	Fix gradle and supresswarnings issue	2017-03-05 21:20:54 +01:00
Mario Danic	db829c5e56	Remove useless files	2017-03-05 21:11:29 +01:00
Mario Danic	0ffb67c506	Merge branch 'branding' into bring-branding-to-master ... # Conflicts: # .drone.yml # build.gradle # src/main/java/com/owncloud/android/services/SyncedFolderJobService.java # src/main/java/com/owncloud/android/services/observer/SyncedFolderObserver.java # src/main/java/com/owncloud/android/utils/RecursiveFileObserver.java	2017-03-05 21:09:36 +01:00
Mario Danic	b801310ce2	Fix crashes	2017-03-05 17:46:20 +01:00
Mario Danic	657dbcd03e	Fix quota crash	2017-03-03 18:52:10 +01:00
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
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	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	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	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
Mario Danic	f95446eaf1	Remove obsolete stuff	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	9901a80b01	Remove verbose	2017-03-03 11:07:57 +01:00
Mario Danic	115c9a7fd9	Change order of things	2017-03-03 11:07:56 +01:00
Mario Danic	e4c306aa6b	Do not update current	2017-03-03 11:07:56 +01:00
Mario Danic	d734e8a4f8	Change execution window	2017-03-03 11:07:55 +01:00
Mario Danic	ab266f35c5	Enforce requirements	2017-03-03 11:07:55 +01:00
Mario Danic	38234af681	Remove from monitor before destroying	2017-03-03 11:07:54 +01:00
Mario Danic	98319188bc	Fix codacy stuff	2017-03-03 11:07:54 +01:00
Mario Danic	c486b813e6	Fix a typo	2017-03-03 11:07:54 +01:00
Mario Danic	048b7f7bb3	Use android-job for scheduling	2017-03-03 11:07:53 +01:00
Mario Danic	a333ead38c	Remove serializable pair	2017-03-03 11:07:53 +01:00
Mario Danic	ebeb520bf8	Fix a tiny bug	2017-03-03 11:07:53 +01:00
Mario Danic	60325485c6	Some magics	2017-03-03 11:07:52 +01:00
Mario Danic	6d98473654	Revert things to how they were	2017-03-03 11:07:52 +01:00
Mario Danic	7daf7a1106	Clean up iterator	2017-03-03 11:07:52 +01:00
Mario Danic	2d584ad9a7	Fix path for files	2017-03-03 11:07:51 +01:00
Mario Danic	4ef5bc8c80	Wait on shutdown	2017-03-03 11:07:51 +01:00
Mario Danic	c867b54ee3	Update codacy	2017-03-03 11:07:51 +01:00
Mario Danic	137432068b	Don’t add observer if it fails to init	2017-03-03 11:07:50 +01:00
Mario Danic	16da98099b	Update stuff for review	2017-03-03 11:07:50 +01:00
Mario Danic	ead3c16ec4	Try to fix Tobias crash	2017-03-03 11:07:50 +01:00
Mario Danic	91c28ee158	Enable auto upload on Android 6+ only :-/	2017-03-03 11:07:49 +01:00
Mario Danic	5c3cd5f6f8	Remove content text	2017-03-03 11:07:49 +01:00
Mario Danic	0ee60c5529	Update for codacy warnings	2017-03-03 11:07:49 +01:00
Mario Danic	a568b5dd79	Remove permanent marker	2017-03-03 11:07:48 +01:00
Mario Danic	172da075a3	Change content text for notification	2017-03-03 11:07:48 +01:00
Mario Danic	bd9a12ae00	Persistent upload magic	2017-03-03 11:07:48 +01:00
Mario Danic	623a48328d	Simplify code	2017-03-03 11:07:47 +01:00
Mario Danic	79fb4e884b	Use exif tags	2017-03-03 11:07:47 +01:00
Mario Danic	9fcda73119	Attempt a fix	2017-03-03 11:07:47 +01:00
Mario Danic	8a56201874	Small workaround	2017-03-03 11:07:46 +01:00
Mario Danic	284eba8fc7	New build	2017-03-03 11:07:46 +01:00
tobiasKaminsky	5e4ad8ab14	user last modification date for auto upload, e.g. take an image on 31.01.17 and upload it via autoupload on 10.02.17 it will be uploaded to Camera/2017/01	2017-03-03 11:07:46 +01:00
Mario Danic	15101bf664	Simplify new auto upload code	2017-03-03 11:07:45 +01:00
Mario Danic	d1dc7b090c	Clean up cleaning	2017-03-03 11:07:45 +01:00
Mario Danic	2015851faa	Attempt to fix duplicate uploads again :P	2017-03-03 11:07:44 +01:00
Mario Danic	ee0c112ffc	Increase delay slightly	2017-03-03 11:07:44 +01:00
Mario Danic	4068eb5499	Attempt to fix duplicate entries	2017-03-03 11:07:44 +01:00
Mario Danic	7f28c35b34	:)	2017-03-03 11:07:43 +01:00
Mario Danic	fbdcfce692	Attempt to fix uploads with non-conf folders	2017-03-03 11:07:43 +01:00
Mario Danic	3b143a91b2	Delete from runnable on delete	2017-03-03 11:07:43 +01:00