9576 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiaskaminsky	12a6050867	add gson ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-15 09:06:55 +01:00
tobiasKaminsky	4ed6f1d3e1	temporary use lib branch ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 09:06:44 +01:00
tobiasKaminsky	fab57d271e	search only folders when copy/move ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 09:06:19 +01:00
tobiaskaminsky	157afd9d61	fix #1800 ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-15 09:06:19 +01:00
Tobias Kaminsky	8d63ef5d47	Merge pull request #1658 from nextcloud/avatarETags ... Avatar Etags	2018-01-15 09:04:05 +01:00
tobiaskaminsky	614d78ba58	refined annotations ... added one more annotation Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-15 08:40:54 +01:00
tobiasKaminsky	08c33b83c4	annotate via custom annotation	2018-01-15 08:40:54 +01:00
tobiasKaminsky	d16ebf6e9d	fix missing conversion	2018-01-15 08:40:54 +01:00
tobiasKaminsky	c4cee26b1f	trying to first show old one, but asyncDrawable is not working	2018-01-15 08:40:53 +01:00
tobiasKaminsky	3a1c1c904b	Use ETag for avatars	2018-01-15 08:40:53 +01:00
Tobias Kaminsky	c650f3a341	Merge pull request #1944 from nextcloud/e2e_rebased ... E2E	2018-01-15 08:40:16 +01:00
tobiasKaminsky	49b095db9d	increasing lint ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:32:05 +01:00
tobiasKaminsky	eef69ea4ce	change crc32 to v28 ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:12:01 +01:00
tobiasKaminsky	f8ed3750a5	remove unused ressources ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:12:00 +01:00
tobiasKaminsky	756eddb3a7	fix due to rebase ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:12:00 +01:00
tobiasKaminsky	1167b82adb	moved methods ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:12:00 +01:00
tobiasKaminsky	fc7b4f789c	enable subfolder ... check if in subfolder of encrypted folder Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:12:00 +01:00
tobiasKaminsky	a9e558160f	remove obsolete string ... fix showing wrong string Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:12:00 +01:00
tobiasKaminsky	23ab9bff67	revert versionCode/number to master ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:12:00 +01:00
tobiasKaminsky	48f991663d	fix #1938 ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:59 +01:00
tobiasKaminsky	cfd24f306d	remove duplicated upgrade ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:59 +01:00
tobiasKaminsky	8038791820	changes due to to rebase ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:59 +01:00
tobiasKaminsky	b52197d8ce	extract RSA/AES to static string ... make final Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:59 +01:00
tobiasKaminsky	d5c5fb5933	new line ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:59 +01:00
tobiasKaminsky	6043767343	replace printStacktrace() with Log_OC ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:59 +01:00
tobiasKaminsky	3307d52dfb	remove printStacktrace() ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:59 +01:00
tobiasKaminsky	3a8b59a0c1	return RemoteOperationResult on error ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:58 +01:00
tobiasKaminsky	a6eae2396e	move public method up, add doc ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:58 +01:00
tobiasKaminsky	b82cf3e167	new line ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:58 +01:00
tobiasKaminsky	311656b0a1	delete stale file ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:58 +01:00
tobiasKaminsky	385306e45e	make FolderMetadata access private and use getter/setter ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:58 +01:00
tobiasKaminsky	29bcd8cd51	re-enable tests ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:58 +01:00
tobiasKaminsky	dba3a33a49	new line ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:58 +01:00
tobiasKaminsky	16080f8d05	re-add: always use new key / iv on upload ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:58 +01:00
tobiasKaminsky	3c2a01f7bc	disable logger ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:57 +01:00
tobiasKaminsky	de6e352ea1	bump library ... add gson Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:57 +01:00
tobiasKaminsky	c5883f8305	make text selectable ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 08:11:57 +01:00
tobiaskaminsky	b8d7922e0a	also lower case	2018-01-15 08:11:57 +01:00
tobiaskaminsky	373b999806	fix potential NPE	2018-01-15 08:11:57 +01:00
tobiaskaminsky	21a04b1bfe	delete local keys on account removal	2018-01-15 08:11:57 +01:00
tobiaskaminsky	128f3c97c8	ignore whitespaces in password	2018-01-15 08:11:57 +01:00
tobiaskaminsky	64221ece39	use new user agent	2018-01-15 08:11:57 +01:00
tobiaskaminsky	bba88d48de	enable logger, disable prior merge	2018-01-15 08:11:56 +01:00
tobiaskaminsky	4281a02314	do not use linked library	2018-01-15 08:11:56 +01:00
tobiaskaminsky	1fe5c99d87	add cancel button	2018-01-15 08:11:56 +01:00
tobiaskaminsky	54ea7d9bcf	use nextcloud user agent for E2e calls	2018-01-15 08:11:56 +01:00
tobiaskaminsky	f3c3e1ca80	extract string and reword	2018-01-15 08:11:56 +01:00
tobiaskaminsky	debd89ed93	show info that mnemonic needs to be written down	2018-01-15 08:11:56 +01:00
tobiasKaminsky	d52baebb94	merge	2018-01-15 08:11:56 +01:00
tobiasKaminsky	21fd05af8c	codacy	2018-01-15 08:11:55 +01:00