Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasKaminsky committed Feb 13, 2024
2 parents 6efdf36 + b4faf77 commit 02df2e9
Show file tree
Hide file tree
Showing 46 changed files with 64 additions and 42 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ class BackgroundJobManagerTest {
}

fun buildWorkInfo(index: Long): WorkInfo = WorkInfo(
UUID.randomUUID(),
WorkInfo.State.RUNNING,
Data.Builder().build(),
listOf(BackgroundJobManagerImpl.formatTimeTag(1581820284000)),
Data.Builder().build(),
1,
0
id = UUID.randomUUID(),
state = WorkInfo.State.RUNNING,
outputData = Data.Builder().build(),
tags = setOf(BackgroundJobManagerImpl.formatTimeTag(1581820284000)),
progress = Data.Builder().build(),
runAttemptCount = 1,
generation = 0
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ public void testAccountChooserDialog() throws AccountUtils.AccountNotFoundExcept
accountManager.setUserData(newAccount, AccountUtils.Constants.KEY_USER_ID, "test");
accountManager.setAuthToken(newAccount, AccountTypeUtils.getAuthTokenTypePass(newAccount.type), "password");
User newUser = userAccountManager.getUser(newAccount.name).orElseThrow(RuntimeException::new);
userAccountManager.setCurrentOwnCloudAccount(newAccount.name);

Account newAccount2 = new Account("[email protected]", MainApp.getAccountType(targetContext));
accountManager.addAccountExplicitly(newAccount2, "password", null);
Expand Down
4 changes: 2 additions & 2 deletions app/src/debug/java/com/nextcloud/test/TestActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ class TestActivity :
TODO("Not yet implemented")
}

override fun getFileUploaderHelper(): FileUploadHelper? {
return null
override fun getFileUploaderHelper(): FileUploadHelper {
return FileUploadHelper.instance()
}

override fun getFileDownloadProgressListener(): FileDownloadWorker.FileDownloadProgressListener? {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1921,28 +1921,29 @@ public void startSyncFolderOperation(final OCFile folder, final boolean ignoreET
// the execution is slightly delayed to allow the activity get the window focus if it's being started
// or if the method is called from a dialog that is being dismissed
if (TextUtils.isEmpty(searchQuery) && getUser().isPresent()) {
getHandler().postDelayed(new Runnable() {
@Override
public void run() {
if (ignoreFocus || hasWindowFocus()) {
long currentSyncTime = System.currentTimeMillis();
mSyncInProgress = true;
getHandler().postDelayed(() -> {
Optional<User> user = getUser();

// perform folder synchronization
RemoteOperation synchFolderOp = new RefreshFolderOperation(folder, currentSyncTime, false, ignoreETag, getStorageManager(), getUser().orElseThrow(RuntimeException::new), getApplicationContext());
synchFolderOp.execute(getAccount(), MainApp.getAppContext(), FileDisplayActivity.this, null, null);
if (!ignoreFocus && !hasWindowFocus() || !user.isPresent()) {
// do not refresh if the user rotates the device while another window has focus
// or if the current user is no longer valid
return;
}

OCFileListFragment fragment = getListOfFilesFragment();
long currentSyncTime = System.currentTimeMillis();
mSyncInProgress = true;

if (fragment != null && !(fragment instanceof GalleryFragment)) {
fragment.setLoading(true);
}
// perform folder synchronization
RemoteOperation refreshFolderOperation = new RefreshFolderOperation(folder, currentSyncTime, false, ignoreETag, getStorageManager(), user.get(), getApplicationContext());
refreshFolderOperation.execute(getAccount(), MainApp.getAppContext(), FileDisplayActivity.this, null, null);

setBackgroundText();
OCFileListFragment fragment = getListOfFilesFragment();

} // else: NOTHING ; lets' not refresh when the user rotates the device but there is
// another window floating over
if (fragment != null && !(fragment instanceof GalleryFragment)) {
fragment.setLoading(true);
}

setBackgroundText();
}, DELAY_TO_REQUEST_REFRESH_OPERATION_LATER);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingEmpty);
viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList);

isLoadingActivities = true;
fetchAndSetData(-1);

binding.swipeContainingList.setOnRefreshListener(() -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,11 @@ public void refreshCapabilitiesFromDB() {
* before reading database.
*/
public void refreshSharesFromDB() {
file = fileDataStorageManager.getFileById(file.getFileId());
OCFile newFile = fileDataStorageManager.getFileById(file.getFileId());
if (newFile != null) {
file = newFile;
}

ShareeListAdapter adapter = (ShareeListAdapter) binding.sharesList.getAdapter();

if (adapter == null) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-sc/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
<string name="shared_icon_shared_via_link">cumpartzidu cun ligòngiu</string>
<string name="shared_with_you_by">Cumpartzidu cun te dae %1$s</string>
<string name="sharee_add_failed">Agiunta de cumpartzidura faddida</string>
<string name="signup_with_provider">Registrati cun su frunidore</string>
<string name="signup_with_provider">Registra·ti cun su frunidore</string>
<string name="single_sign_on_request_token" formatted="true">Permìtere a %1$s de intrare in su contu tuo de Nextcloud %2$s?</string>
<string name="sort_by">Assenta segundu</string>
<string name="ssl_validator_btn_details_hide">Cua</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-sr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@
<string name="drawer_item_home">Почетна</string>
<string name="drawer_item_notifications">Обавештења</string>
<string name="drawer_item_on_device">На уређају</string>
<string name="drawer_item_personal_files">Лични фајлови</string>
<string name="drawer_item_recently_modified">Недавно измењено</string>
<string name="drawer_item_shared">Дељено</string>
<string name="drawer_item_trashbin">Обрисани фајлови</string>
Expand Down
26 changes: 13 additions & 13 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
<string name="prefs_show_ecosystem_apps_summary">Nextcloud app suggestions in navigation heading</string>
<string name="prefs_enable_media_scan_notifications">Show media scan notifications</string>
<string name="prefs_enable_media_scan_notifications_summary">Notify about newly found media folders</string>
<string name="prefs_calendar_contacts">Sync calendar &amp; contacts</string>
<string name="prefs_calendar_contacts">Sync calendar and contacts</string>
<string name="prefs_calendar_contacts_summary">Set up DAVx5 (formerly known as DAVdroid) (v1.3.0+) for current account</string>
<string name="prefs_davx5_setup_error">Unexpected error while setting up DAVx5 (formerly known as DAVdroid)</string>
<string name="prefs_calendar_contacts_no_store_error">Neither F-Droid nor Google Play is installed</string>
<string name="prefs_calendar_contacts_sync_setup_successful">Calendar &amp; contacts sync set up</string>
<string name="prefs_daily_backup_summary">Daily backup of your calendar &amp; contacts</string>
<string name="prefs_calendar_contacts_sync_setup_successful">Calendar and contacts sync set up</string>
<string name="prefs_daily_backup_summary">Daily backup of your calendar and contacts</string>
<string name="prefs_daily_contact_backup_summary">Daily backup of your contacts</string>
<string name="prefs_sycned_folders_summary">Manage folders for auto upload</string>
<string name="prefs_help">Help</string>
Expand Down Expand Up @@ -613,7 +613,7 @@
<string name="activities_no_results_message">No events like additions, changes and shares yet.</string>
<string name="prefs_category_about">About</string>

<string name="actionbar_calendar_contacts_restore">Restore contacts &amp; calendar</string>
<string name="actionbar_calendar_contacts_restore">Restore contacts and calendar</string>
<string name="contacts_backup_button">Back up now</string>
<string name="contactlist_no_permission">No permission given, nothing imported.</string>
<string name="contact_no_permission">Contact permission is required.</string>
Expand All @@ -622,7 +622,7 @@
<string name="contacts_preferences_something_strange_happened">Could not find your last backup!</string>
<string name="contacts_preferences_backup_scheduled">Backup scheduled and will start shortly</string>
<string name="contacts_preferences_import_scheduled">Import scheduled and will start shortly</string>
<string name="backup_title">Contacts &amp; calendar backup</string>
<string name="backup_title">Contacts and calendar backup</string>
<string name="contact_backup_title">Contacts backup</string>
<string name="drawer_logout">Log out</string>
<string name="picture_set_as_no_app">No app found to set a picture with</string>
Expand Down Expand Up @@ -658,7 +658,7 @@
<string name="resized_image_not_possible_download">No resized image available. Download full image?</string>

<string name="store_short_desc">The self-hosted productivity platform that keeps you in control</string>
<string name="store_full_desc">The self-hosted productivity platform that keeps you in control.\n\nFeatures:\n* Easy, modern interface, suited to the theme of your server\n* Upload files to your Nextcloud server\n* Share them with others\n* Keep your favorite files and folders synced\n* Search across all folders on your server\n* Auto Upload for photos and videos taken by your device\n* Keep up to date with notifications\n* Multi-account support\n* Secure access to your data with fingerprint or PIN\n* Integration with DAVx5 (formerly known as DAVdroid) for easy setup of calendar &amp; Contacts synchronization\n\nPlease report all issues at https://github.com/nextcloud/android/issues and discuss this app at https://help.nextcloud.com/c/clients/android\n\nNew to Nextcloud? Nextcloud is a private file sync &amp; share and communication server. It is libre software, and you can host it yourself or pay a company to do it for you. That way, you are in control of your photos, your calendar and contact data, your documents and everything else.\n\nCheck out Nextcloud at https://nextcloud.com</string>
<string name="store_full_desc">The self-hosted productivity platform that keeps you in control.\n\nFeatures:\n* Easy, modern interface, suited to the theme of your server\n* Upload files to your Nextcloud server\n* Share them with others\n* Keep your favorite files and folders synced\n* Search across all folders on your server\n* Auto Upload for photos and videos taken by your device\n* Keep up to date with notifications\n* Multi-account support\n* Secure access to your data with fingerprint or PIN\n* Integration with DAVx5 (formerly known as DAVdroid) for easy setup of calendar and Ccontacts synchronization\n\nPlease report all issues at https://github.com/nextcloud/android/issues and discuss this app at https://help.nextcloud.com/c/clients/android\n\nNew to Nextcloud? Nextcloud is a private file sync and share and communication server. It is libre software, and you can host it yourself or pay a company to do it for you. That way, you are in control of your photos, your calendar and contact data, your documents and everything else.\n\nCheck out Nextcloud at https://nextcloud.com</string>

<string name="contactlist_item_icon">User icon for contact list</string>
<string name="activity_icon">Activity</string>
Expand Down Expand Up @@ -715,9 +715,9 @@
<string name="screenshot_04_accounts_subline">in one place</string>

<string name="screenshot_05_autoUpload_heading">Automatic upload</string>
<string name="screenshot_05_autoUpload_subline">for your photos &amp; videos</string>
<string name="screenshot_05_autoUpload_subline">for your photos and videos</string>

<string name="screenshot_06_davdroid_heading">Calendar &amp; contacts</string>
<string name="screenshot_06_davdroid_heading">Calendar and contacts</string>
<string name="screenshot_06_davdroid_subline">Sync with DAVx5</string>

<string name="userinfo_no_info_headline">No personal info set</string>
Expand Down Expand Up @@ -766,9 +766,9 @@
<string name="signup_with_provider">Sign up with provider</string>
<string name="host_your_own_server">Host your own server</string>
<string name="first_run_1_text">Keep your data secure and under your control</string>
<string name="first_run_2_text">Secure collaboration &amp; file exchange</string>
<string name="first_run_3_text">Easy-to-use webmail, calendar &amp; contacts</string>
<string name="first_run_4_text">Screensharing, online meetings &amp; web conferences</string>
<string name="first_run_2_text">Secure collaboration and file exchange</string>
<string name="first_run_3_text">Easy-to-use webmail, calendar and contacts</string>
<string name="first_run_4_text">Screensharing, online meetings and web conferences</string>
<string name="restore_button_description">Restore deleted file</string>
<string name="restore">Restore file</string>
<string name="new_version_was_created">New version was created</string>
Expand Down Expand Up @@ -1010,7 +1010,7 @@
<string name="common_next">Next</string>
<string name="send_share">Send Share</string>
<string name="no_share_permission_selected">Please select at least one permission to share.</string>
<string name="share_copy_link">Share &amp; Copy Link</string>
<string name="share_copy_link">Share and Copy Link</string>
<string name="set_note">Set Note</string>
<string name="share_send_new_email">Send new email</string>
<string name="link_name">Link Name</string>
Expand Down Expand Up @@ -1049,7 +1049,7 @@
<string name="pdf_zoom_tip">Tap on a page to zoom in</string>
<string name="storage_permission_full_access">Full access</string>
<string name="storage_permission_media_read_only">Media read-only</string>
<string name="subtitle_photos_videos">Photos &amp; videos</string>
<string name="subtitle_photos_videos">Photos and videos</string>
<string name="show_images">Show photos</string>
<string name="subtitle_photos_only">Photos only</string>
<string name="show_video">Show videos</string>
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ buildscript {
daggerVersion = "2.50"
markwonVersion = "4.6.2"
prismVersion = "2.0.0"
androidLibraryVersion ="fb3552a4322c83ed32bbbdfa988fa2c16dba529a"
androidLibraryVersion = "2b1da4cb14e2cd4b79e231b0be54e0bae699f143"
mockitoVersion = "4.11.0"
mockitoKotlinVersion = "4.1.0"
mockkVersion = "1.13.9"
espressoVersion = "3.5.1"
workRuntime = "2.8.1"
workRuntime = "2.9.0"
fidoVersion = "4.1.0-patch2"
checkerVersion = "3.21.2"
exoplayerVersion = "2.19.1"
Expand Down
14 changes: 14 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
<trusting group="androidx.room"/>
<trusting group="androidx.sqlite"/>
<trusting group="androidx.webkit" name="webkit" version="1.10.0"/>
<trusting group="androidx.work"/>
</trusted-key>
<trusted-key id="84789D24DF77A32433CE1F079EB80E92EB2135B1" group="org.apache" name="apache"/>
<trusted-key id="8569C95CADC508B09FE90F3002216ED811210DAA" group="io.github.detekt.sarif4k"/>
Expand Down Expand Up @@ -1760,6 +1761,11 @@
<sha256 value="d66eaa8212f2f4d35f79b7dd1ecfdc0bd46f11a11912ed859f3dd8865b73245c" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.room" name="room-ktx" version="2.5.0">
<artifact name="room-ktx-2.5.0.module">
<sha256 value="238a821a18addcbb834d0fff09ce568edc14c307202d22b85254c7821560adaf" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.room" name="room-migration" version="2.5.2">
<artifact name="room-migration-2.5.2.jar">
<sha256 value="9877e821980c3707c70c409a6853b367ea4f0a8d444bda51019f48f46e3cbd28" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -3056,6 +3062,14 @@
<sha256 value="6a91a2139a3cae8126c509cf65d136d49c35cb032b581ac1a56cb6a649cc0245" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="2b1da4cb14e2cd4b79e231b0be54e0bae699f143">
<artifact name="android-library-2b1da4cb14e2cd4b79e231b0be54e0bae699f143.aar">
<sha256 value="bdc44e874f1e14338213ae5723e71710940a31416ff1c52c9eb2f282e5d3f29a" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-2b1da4cb14e2cd4b79e231b0be54e0bae699f143.module">
<sha256 value="b4f19aae9d8687651cf8f760cb89be155cfa0a9aed818cb50cfbcb15f36c9f2d" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="fb3552a4322c83ed32bbbdfa988fa2c16dba529a">
<artifact name="android-library-fb3552a4322c83ed32bbbdfa988fa2c16dba529a.aar">
<sha256 value="bdc44e874f1e14338213ae5723e71710940a31416ff1c52c9eb2f282e5d3f29a" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down

0 comments on commit 02df2e9

Please sign in to comment.