2194 commits

Author	SHA1	Message	Date
Allan Nordhøy	7dd747f1c1	Spelling: Admin, sync, filename, make note	2018-01-22 17:01:20 +01:00
Allan Nordhøy	e4bc267209	Spelling: Synced, config, copylefted, (4.4)	2018-01-22 17:01:17 +01:00
tobiaskaminsky	e3efbb1770	prevent copy/move into encrypted folder --> M2 ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-22 12:39:31 +01:00
Nextcloud bot	0e2b4109cc	[tx-robot] updated from transifex	2018-01-22 01:39:28 +00:00
Nextcloud bot	110086217b	[tx-robot] updated from transifex	2018-01-21 01:39:58 +00:00
Andy Scherzinger	f4350da349	Merge pull request #2009 from nextcloud/getIdForE2E ... Use id instead of account name	2018-01-20 14:31:30 +01:00
Nextcloud bot	565b8af563	[tx-robot] updated from transifex	2018-01-20 01:40:02 +00:00
Andy Scherzinger	faeafb69fa	Merge pull request #2008 from nextcloud/sortingPreviewOrder ... Obey sort order also on preview image slide	2018-01-19 14:46:54 +01:00
Andy Scherzinger	c9927cd7f2	Merge pull request #2004 from nextcloud/fixDuplicateColumn ... Catch error on duplicate column	2018-01-19 14:46:37 +01:00
Andy Scherzinger	741503de06	Merge pull request #2001 from nextcloud/authOnOldNC ... Auth: NPE	2018-01-19 14:46:22 +01:00
Andy Scherzinger	847fb45ea5	Merge pull request #2002 from nextcloud/NPEonActivityResult ... NPE if activity is already closed	2018-01-19 14:46:04 +01:00
tobiaskaminsky	a259a3f84b	use id instead of account name ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-19 14:17:41 +01:00
tobiaskaminsky	2ff542520a	obey sort order also on preview image slide ... remove obsolete code Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-19 12:04:11 +01:00
tobiaskaminsky	f79f3f65e4	catch error on duplicate column ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-19 10:43:23 +01:00
Nextcloud bot	9bf81a02de	[tx-robot] updated from transifex	2018-01-19 08:46:06 +00:00
tobiaskaminsky	7a06cbce79	NPE if activity is already closed ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-19 09:18:33 +01:00
tobiaskaminsky	bc7f2b0f4e	fix NPE ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-19 08:51:51 +01:00
Nextcloud bot	62b5c74d46	[tx-robot] updated from transifex	2018-01-19 01:39:56 +00:00
AndyScherzinger	336c1705b1	codacy: organize imports	2018-01-18 21:28:54 +01:00
AndyScherzinger	2d79a37b9f	added newline	2018-01-18 21:27:48 +01:00
AndyScherzinger	fdd0431beb	center image/text	2018-01-18 21:27:48 +01:00
tobiaskaminsky	5d30d83e67	Hardening preview adapter for null files ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-18 21:27:47 +01:00
Andy Scherzinger	61c6a37acb	Merge pull request #1986 from nextcloud/NPEonFilename ... No path magic, but simply use parent id	2018-01-18 21:27:15 +01:00
Andy Scherzinger	8933a065d6	Merge pull request #1988 from nextcloud/npeOnGetActivity ... use provide activity instead of calling getActivity, which might be null	2018-01-18 21:26:49 +01:00
Andy Scherzinger	7c7ee7aa36	Merge pull request #1983 from nextcloud/snackbar ... Resized images: snackbar fix	2018-01-18 21:25:56 +01:00
Andy Scherzinger	60c416ea26	Merge pull request #1993 from nextcloud/intentNPE ... Intent can be null if service is restarted	2018-01-18 21:24:58 +01:00
Andy Scherzinger	12f2be740c	Merge pull request #1978 from nextcloud/hardenNotificationManager ... harden notificationManager	2018-01-18 21:24:16 +01:00
Andy Scherzinger	fb622ea6b5	Merge pull request #1997 from nextcloud/walledException ... Internet walled: catch any exception	2018-01-18 21:11:36 +01:00
Andy Scherzinger	e21429a557	Merge pull request #1985 from nextcloud/drawerLoad ... Fix NPE in external link icon loading	2018-01-18 21:07:33 +01:00
Andy Scherzinger	bf53f74025	Merge pull request #1981 from nextcloud/SyncFolderNPE ... Avoid NPE	2018-01-18 21:06:54 +01:00
Andy Scherzinger	f54f114d9d	Merge pull request #1995 from nextcloud/shareButton ... Make drawable mutable	2018-01-18 21:05:43 +01:00
Andy Scherzinger	6504145638	Merge pull request #1980 from nextcloud/retryFailedInThread ... Retry upload in thread	2018-01-18 15:57:02 +01:00
tobiaskaminsky	b71c302db8	catch any exception ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-18 13:56:49 +01:00
tobiaskaminsky	252bc8cbd6	make drawable mutable ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-18 12:07:16 +01:00
tobiaskaminsky	948f3bd2f2	try to instantiate again ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-18 09:28:59 +01:00
tobiaskaminsky	36e8ad636a	harden notificationManager ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-18 09:28:59 +01:00
tobiaskaminsky	3145260054	also fix #1976 ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-18 09:07:00 +01:00
tobiaskaminsky	2239730cb5	fix NPE in external link icon loading ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-18 09:07:00 +01:00
tobiaskaminsky	cab4f6a9a8	Intent can be null if service is restarted ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-18 08:33:16 +01:00
Nextcloud bot	795f0451b5	[tx-robot] updated from transifex	2018-01-18 01:39:55 +00:00
tobiaskaminsky	3d3fbe557a	use provide activity instead of calling getActivity, which might be null. ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-17 15:23:26 +01:00
tobiaskaminsky	55df66377f	no path magic, but simply use parent id ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-17 15:07:58 +01:00
tobiaskaminsky	3eb99c65c5	try to avoid Exception on dismissDialog ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-17 14:32:17 +01:00
tobiaskaminsky	cff3b455c0	Snackbar fix IAE ... download only if activity exists Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-17 14:08:06 +01:00
tobiaskaminsky	e9f352c27c	avoid npe ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-17 13:22:43 +01:00
tobiaskaminsky	fef6d38c40	retry upload in thread ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-17 13:05:54 +01:00
tobiaskaminsky	b8e5b8c4bf	fix DB for dev version ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-17 08:17:16 +01:00
Nextcloud bot	43675d9880	[tx-robot] updated from transifex	2018-01-17 06:09:03 +00:00
tobiaskaminsky	e054fbcb83	replace … with &#8230; to make it clearer for translators ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-17 07:03:51 +01:00
Nextcloud bot	7cc57d2e45	[tx-robot] updated from transifex	2018-01-17 01:40:40 +00:00
tobiasKaminsky	3753832a9a	remove 200 features from whats new ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-16 11:10:36 +01:00
Nextcloud bot	5522b0b82e	[tx-robot] updated from transifex	2018-01-16 01:42:35 +00:00
tobiasKaminsky	88498e4071	use copy & delete instead of move ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 12:40:15 +01:00
Mario Danic	1c8d46f9ff	Revert change ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-15 11:23:33 +01:00
Mario Danic	f626f58378	Attempt to fix moves ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-15 11:23:33 +01:00
tobiaskaminsky	45f7cb1cc7	linebreaks ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-15 11:23:32 +01:00
Mario Danic	66711f215c	Fix code review issues ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-15 11:23:32 +01:00
Mario Danic	4c6a98d8af	Add new line ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-15 11:23:32 +01:00
Mario Danic	ee7d4ed56c	Implement keys migration ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-15 11:23:32 +01:00
Mario Danic	d56f53bb11	Fix uploads ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-15 11:23:31 +01:00
Mario Danic	845e85fb24	Most improvements ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-01-15 11:23:31 +01:00
tobiasKaminsky	c1fe52bbf8	Detect top of encryption folders ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-01-15 10:45:43 +01:00
tobiaskaminsky	2e4fcd3f39	add support for slightly modified nc13 background (bigger dots) ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-15 09:56:00 +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
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
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	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	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	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	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
tobiasKaminsky	9a7d59a1af	merge	2018-01-15 08:11:55 +01:00
tobiasKaminsky	17b1088ced	description, remove todo, suppress lint warning	2018-01-15 08:11:55 +01:00
tobiasKaminsky	917189f3ca	append salt to private key	2018-01-15 08:11:55 +01:00
tobiasKaminsky	d6b9f7e54b	immediately store folder token	2018-01-15 08:11:55 +01:00
tobiasKaminsky	9996753032	rebase	2018-01-15 08:11:55 +01:00
tobiasKaminsky	d06ef53659	change iv/key handling	2018-01-15 08:11:54 +01:00
tobiasKaminsky	1293217da6	- rebased -> changed db numbers ... - deleted old file - add proper resume on folder lock	2018-01-15 08:11:54 +01:00
tobiasKaminsky	4e6c886cbb	store & re-use token for retry of failed encrypted upload	2018-01-15 08:11:54 +01:00
tobiasKaminsky	e2ed7a6a1a	versionCode/versionName	2018-01-15 08:11:54 +01:00
tobiasKaminsky	0abe4efd37	codacy	2018-01-15 08:11:54 +01:00
tobiasKaminsky	5637d7d366	changes due to rebase	2018-01-15 08:11:54 +01:00
tobiasKaminsky	71304fe236	better random	2018-01-15 08:11:53 +01:00
tobiasKaminsky	b838210720	wip	2018-01-15 08:11:53 +01:00
tobiasKaminsky	2ca5727975	split up large method - part 1	2018-01-15 08:11:53 +01:00
Jan-Christoph Borchardt	45bcdebd9d	First release of E2E	2018-01-15 08:11:53 +01:00
AndyScherzinger	eb667c9831	bump version to 2.0.0RC9	2018-01-15 08:11:53 +01:00
tobiasKaminsky	9b1b89cd3c	always use new key/iv ... cleanup	2018-01-15 08:11:53 +01:00
tobiasKaminsky	e1df7d32cc	fix codacy	2018-01-15 08:11:53 +01:00
Jan-Christoph Borchardt	6caf0834ce	First release of E2E	2018-01-15 08:11:53 +01:00
tobiasKaminsky	f175706ab0	immediately show correct infos about uploaded file	2018-01-15 08:11:52 +01:00
tobiasKaminsky	22701416bf	change iv/key handling	2018-01-15 08:11:52 +01:00
tobiasKaminsky	020333affc	- rebased -> changed db numbers ... - deleted old file - add proper resume on folder lock	2018-01-15 08:11:52 +01:00
tobiasKaminsky	b3f0fd3c17	correct appending of (2), (3), and so on	2018-01-15 08:11:52 +01:00
tobiasKaminsky	ade5bfe226	store & re-use token for retry of failed encrypted upload	2018-01-15 08:11:52 +01:00
tobiasKaminsky	7bb8a28bd6	if image is encrypted -> download file as no resized image is possible	2018-01-15 08:11:52 +01:00
tobiasKaminsky	8361848583	versionCode/versionName	2018-01-15 08:11:51 +01:00
tobiasKaminsky	cca39f888a	codacy	2018-01-15 08:11:51 +01:00
tobiasKaminsky	ebb4ffc489	changes due to rebase	2018-01-15 08:11:51 +01:00
tobiasKaminsky	14e66fed69	use only CN	2018-01-15 08:11:51 +01:00
tobiasKaminsky	042d0ea23a	better random	2018-01-15 08:11:51 +01:00
tobiasKaminsky	cd0bebf45e	wip	2018-01-15 08:11:51 +01:00
tobiasKaminsky	590e617c8a	split up large method - part 1	2018-01-15 08:11:51 +01:00
Jan-Christoph Borchardt	34f198cc48	First release of E2E	2018-01-15 08:11:50 +01:00
AndyScherzinger	e87bf739cf	bump version to 2.0.0RC9	2018-01-15 08:11:50 +01:00
tobiaskaminsky	ff7cf4ad12	Set CN to userID	2018-01-15 08:11:50 +01:00
tobiasKaminsky	50b56bc09f	use pem for private key	2018-01-15 08:11:50 +01:00
ardevd	c534d603c7	e2e: Cleaned up cipher transformation arguments. ... - Define commonly used transformation specs in constants.	2018-01-15 08:11:50 +01:00
tobiasKaminsky	275ec70658	codacy: Avoid reassigning parameters such as 'remotePath' ... Switch statements should have a default label	2018-01-15 08:11:50 +01:00
tobiasKaminsky	58b7f33a48	codacy: assertTrue -> assertFalse ... use specific exceptions add missing break	2018-01-15 08:11:50 +01:00
tobiasKaminsky	fab1f4b23e	always use new key/iv ... cleanup	2018-01-15 08:11:50 +01:00
tobiasKaminsky	9848c1dc28	setup: in case of error show message and let user retry	2018-01-15 08:11:49 +01:00
tobiasKaminsky	febe6b60c0	fix codacy	2018-01-15 08:11:49 +01:00
Jan-Christoph Borchardt	b6e84b66fd	First release of E2E	2018-01-15 08:11:49 +01:00
Nextcloud bot	de2e7942f1	[tx-robot] updated from transifex	2018-01-15 01:39:52 +00:00
Nextcloud bot	a853724015	[tx-robot] updated from transifex	2018-01-14 01:40:24 +00:00
tobiaskaminsky	42c2d58a63	remove unused resource ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-01-13 09:58:59 +01:00
Nextcloud bot	c63abd886d	[tx-robot] updated from transifex	2018-01-13 01:39:00 +00:00