18947 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiasKaminsky	3ec348d5f6	recreate StoragePermissionDialogFragment when rotating ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-06 12:18:52 +02:00
Tobias Kaminsky	6441e5d189	Merge pull request #10392 from nextcloud/encryptedFavorites ... on favorite/recent search: update encrypted files	2022-07-06 12:13:17 +02:00
Tobias Kaminsky	fa21cef158	Merge pull request #10322 from nextcloud/e2ePass ... only encrypt folder if key is setup	2022-07-06 12:12:44 +02:00
tobiasKaminsky	9d80622d23	only encrypt folder if key is setup ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-06 10:59:08 +02:00
Álvaro Brey	b8800a9906	FileDetailsSharingProcessFragment: avoid crashing when modifying existing shares ... This can only happen on certain codepaths but should be avoided anyway. Fixes #10480 Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-07-06 09:56:14 +02:00
tobiasKaminsky	5e58fdae4c	fix potential NPE ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-06 09:41:19 +02:00
Álvaro Brey	2e3ac1850b	FileActivity: fix crash when creating share link from FileDetailsFragment ... Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-07-06 09:41:14 +02:00
Tobias Kaminsky	d14ba71b10	Merge pull request #10388 from nextcloud/unsetEncryptedFolder ... Only allow folder to unset if not in e2e subtree	2022-07-06 09:02:32 +02:00
Álvaro Brey	8cc3bd1d41	Merge pull request #10448 from nextcloud/fix/offline-sync-server-ping ... Avoid checking for walled connection until necessary	2022-07-05 16:44:02 +02:00
Álvaro Brey	f19e3b7f33	Merge pull request #10323 from nextcloud/disableSharingOnE2E ... Disable sharing on e2e	2022-07-05 16:41:09 +02:00
Álvaro Brey	c8aa577589	When retrying failing uploads, delay connectivity check until last possible moment ... This avoids network calls if the uploads can't be done for other reason (such as missing files) Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-07-05 14:52:23 +02:00
Álvaro Brey	a62373efb4	OfflineSyncWork: minor refactor to make more readable ... Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-07-05 14:52:23 +02:00
Álvaro Brey	8a0609044f	OfflineSyncWork: remove unused wakelock ... Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-07-05 14:52:23 +02:00
Álvaro Brey	b7cf2a5d67	OfflineSyncWork: do not proactively ping server for connectivity unless sync fails ... Co-authored-by: obel1x <obel1x@web.de> Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-07-05 14:52:23 +02:00
tobiasKaminsky	935b71ed86	rebase ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-05 12:25:23 +00:00
tobiasKaminsky	efa7875dcd	explanation of tab count ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-05 12:25:23 +00:00
tobiasKaminsky	2c69d94162	fix uploadReport.sh ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-05 12:25:23 +00:00
tobiasKaminsky	c6681407bf	Do not show sharing option at all ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-05 12:25:23 +00:00
tobiasKaminsky	c8e523b2c1	Do not show sharing tab when folder is encrypted ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-05 12:25:23 +00:00
Tobias Kaminsky	074b914b5f	Merge pull request #10232 from nextcloud/offlineNavigation ... Fix Notification -> on device navigation path	2022-07-05 14:21:29 +02:00
Tobias Kaminsky	00bf0f28fb	Merge pull request #10473 from nextcloud/onDeviceWrongMessage ... Shared -> OnDevice -> now correct message	2022-07-05 10:59:02 +02:00
tobiasKaminsky	a4829d4567	on favorite/recent search: update encrypted files ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-05 10:57:12 +02:00
tobiasKaminsky	d31ba4b3e6	Only allow folder to unset if not in e2e subtree ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-05 10:44:26 +02:00
Álvaro Brey	e8d2989295	Prevent crash when selecting too many files to copy or move (#10476) ... * Prevent crash when selecting too many files to copy or move This is caused by too much data in intent extras as we're passing a fat arraylist of objects. As we only need the paths for the copy operation, change it so that only the paths are passed. Ideally this would instead be stored in FDA or whatever listener we have for the folder picker, rather than passed back and forth between the folder picker. Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com> * Convert FolderPickerActivity to Kotlin (step 1) Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com> * FolderPickerActivity: convert to Kotlin step 2 Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com> * OCFileListFragment: deduplicate copy/move code Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-07-05 07:47:18 +00:00
Tobias Kaminsky	efb26fc43a	Merge pull request #10479 from nextcloud/fixRebaseCommand ... wrong indentation	2022-07-05 08:49:52 +02:00
tobiasKaminsky	e656e06acd	wrong indentation ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-05 08:49:01 +02:00
tobiasKaminsky	3e387c441a	New screenshot for com.owncloud.android.ui.activity.FolderPickerActivityIT_open ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-04 15:49:55 +02:00
Tobias Kaminsky	5cdace49ca	Merge pull request #10472 from nextcloud/thumbnailUpdateEnforced ... When thumbnail update enforced, do not use any cached version	2022-07-04 14:36:43 +02:00
tobiasKaminsky	7ee18b735b	Shared -> OnDevice -> now correct message ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-04 11:45:41 +02:00
tobiasKaminsky	a981db2200	When thumbnail update enforced, do not use any cached version ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2022-07-04 10:00:28 +02:00
Álvaro Brey	fb8c6f4f23	Merge pull request #10471 from nextcloud/fix-flaky-logger-test ... Fix flaky Logger overflow test	2022-07-04 09:01:58 +02:00
Nextcloud bot	d6cf7a97a3	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-07-04 04:09:52 +00:00
Chris Narkiewicz	98230e1296	Fix flaky Logger overflow test ... Load event is processed before overlow condition check can result in warning log line being appended. This resulted in a race condition. We simply poll the log file until we either find interesting log line or we give up after several seconds. Fixes #10416 Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>	2022-07-04 00:30:30 +01:00
Tobias Kaminsky	29390e1fe0	Merge pull request #10464 from nextcloud/repo-sync/android-common/master ... 🔄 Synced file(s) with nextcloud/android-common	2022-07-01 09:38:30 +02:00
nextcloud-android-bot	81fae4d71b	🔄 Synced local '.github/workflows/' with remote 'config/workflows/' ... Signed-off-by: nextcloud-android-bot <android@nextcloud.com>	2022-07-01 07:06:35 +00:00
Álvaro Brey	5cb0056db3	Merge pull request #10457 from nextcloud/dependabot/gradle/androidx.fragment-fragment-ktx-1.5.0 ... Bump fragment-ktx from 1.4.1 to 1.5.0	2022-06-30 11:35:54 +02:00
Álvaro Brey	5b54f76edc	Merge pull request #10458 from nextcloud/dependabot/gradle/androidx.lifecycle-lifecycle-viewmodel-ktx-2.5.0 ... Bump lifecycle-viewmodel-ktx from 2.4.1 to 2.5.0	2022-06-30 11:02:51 +02:00
Álvaro Brey	084abc1a5e	Fix compilation error with new fragment ktx version ... Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-06-30 11:00:17 +02:00
Álvaro Brey	0aa8924edd	Merge pull request #10459 from nextcloud/repo-sync/android-common/master ... 🔄 Synced file(s) with nextcloud/android-common	2022-06-30 10:01:37 +02:00
Álvaro Brey	7fb3c6f2ed	Remove detectNewJavaFiles script ... Now built into the workflow Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-06-30 09:44:36 +02:00
nextcloud-android-bot	0c258a2fc7	🔄 Synced local '.github/workflows/' with remote 'config/workflows/' ... Signed-off-by: nextcloud-android-bot <android@nextcloud.com>	2022-06-30 07:42:52 +00:00
Nextcloud bot	a453cf7640	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-06-30 04:09:30 +00:00
dependabot[bot]	9ad5d53b64	Bump lifecycle-viewmodel-ktx from 2.4.1 to 2.5.0 ... Bumps lifecycle-viewmodel-ktx from 2.4.1 to 2.5.0. --- updated-dependencies: - dependency-name: androidx.lifecycle:lifecycle-viewmodel-ktx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-30 01:04:56 +00:00
dependabot[bot]	830feb91df	Bump fragment-ktx from 1.4.1 to 1.5.0 ... Bumps fragment-ktx from 1.4.1 to 1.5.0. --- updated-dependencies: - dependency-name: androidx.fragment:fragment-ktx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-06-30 01:04:49 +00:00
Nextcloud bot	502a936686	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-06-29 04:14:29 +00:00
Tobias Kaminsky	37a5a79feb	Merge pull request #10407 from nextcloud/repo-sync/android-common/master ... 🔄 Synced file(s) with nextcloud/android-common	2022-06-28 10:51:44 +02:00
nextcloud-android-bot	4b8db87141	🔄 Synced local '.github/workflows/' with remote 'config/workflows/' ... Signed-off-by: nextcloud-android-bot <android@nextcloud.com>	2022-06-28 08:19:29 +00:00
Álvaro Brey	f2a399ed10	Merge pull request #10446 from nextcloud/dependabot/gradle/com.github.spotbugs.snom-spotbugs-gradle-plugin-5.0.9 ... Bump spotbugs-gradle-plugin from 5.0.8 to 5.0.9	2022-06-28 10:02:27 +02:00
Tobias Kaminsky	d62e215cf9	Fix QA upload (#10447) ... * secret is called GIT_TOKEN on GitHub Signed-off-by: tobiasKaminsky <tobias@kaminsky.me> * Remove "sudo" from qa build to preserve env variables Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com> Co-authored-by: Álvaro Brey <alvaro.brey@nextcloud.com>	2022-06-28 07:43:32 +00:00
Nextcloud bot	0feb695d0d	[tx-robot] updated from transifex ... Signed-off-by: Nextcloud bot <bot@nextcloud.com>	2022-06-28 04:21:16 +00:00