Skip to content

refactor(file-activity): kotlin #18007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 4 commits into from
Nov 11, 2026
Merged

refactor(file-activity): kotlin #18007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ceacc8
Rename .java to .kt
alperozturk96 Nov 10, 2026
cc0e547
refactor(file-activity): convert to kotlin
alperozturk96 Nov 10, 2026
be30d0f
split into smaller classes
alperozturk96 Nov 10, 2026
50bce00
fix formatting
alperozturk96 Nov 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class FileDisplayActivityIT : AbstractOnServerIT() {
val test = storageManager.getFileByPath("/test/")
sut.file = test
sut.startSyncFolderOperation(test, false)
assertEquals(storageManager.getFileByPath("/test/"), sut.currentDir)
assertEquals(storageManager.getFileByPath("/test/"), sut.getCurrentDir())
EspressoIdlingResource.decrement()

// open drawer
Expand All @@ -150,7 +150,7 @@ class FileDisplayActivityIT : AbstractOnServerIT() {
.perform(NavigationViewActions.navigateTo(R.id.nav_all_files))

// then should be in root again
assertEquals(storageManager.getFileByPath("/"), sut.currentDir)
assertEquals(storageManager.getFileByPath("/"), sut.getCurrentDir())
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class EditImageActivity :
Injectable {

private lateinit var binding: ActivityEditImageBinding
private lateinit var file: OCFile
private lateinit var imageFile: OCFile
private lateinit var format: Bitmap.CompressFormat

companion object {
Expand All @@ -68,12 +68,12 @@ class EditImageActivity :
binding = ActivityEditImageBinding.inflate(layoutInflater)
setContentView(binding.root)

file = intent.extras?.getParcelableArgument(EXTRA_FILE, OCFile::class.java)
imageFile = intent.extras?.getParcelableArgument(EXTRA_FILE, OCFile::class.java)
?: throw IllegalArgumentException("Missing file argument")

setSupportActionBar(binding.toolbar)
supportActionBar?.apply {
title = file.fileName
title = imageFile.fileName
setDisplayHomeAsUpEnabled(true)
}

Expand All @@ -91,15 +91,15 @@ class EditImageActivity :
return
}
val resultUri = result.getUriFilePath(this, false)
val newFileName = file.fileName.substring(0, file.fileName.lastIndexOf('.')) +
val newFileName = imageFile.fileName.substring(0, imageFile.fileName.lastIndexOf('.')) +
" " + getString(R.string.image_editor_file_edited_suffix) +
resultUri?.substring(resultUri.lastIndexOf('.'))

resultUri?.let {
val data = OCUploadLocalPathData(
user = storageManager.user,
localPaths = arrayOf(it),
remotePaths = arrayOf(file.parentRemotePath + File.separator + newFileName),
remotePaths = arrayOf(imageFile.parentRemotePath + File.separator + newFileName),
createRemoteFolder = false,
creationType = UploadFileOperation.CREATED_BY_USER,
requiresWifi = false,
Expand Down Expand Up @@ -171,10 +171,10 @@ class EditImageActivity :

cropper.setOnSetImageUriCompleteListener(this)
cropper.setOnCropImageCompleteListener(this)
cropper.setImageUriAsync(file.storageUri)
cropper.setImageUriAsync(imageFile.storageUri)

// determine output file format
format = when (file.mimeType) {
format = when (imageFile.mimeType) {
MimeType.PNG -> Bitmap.CompressFormat.PNG

MimeType.WEBP -> {
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import com.nextcloud.utils.extensions.IntentExtensionsKt;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.ui.fragment.contactsbackup.BackupFragment;
import com.owncloud.android.ui.fragment.contactsbackup.BackupListFragment;
Expand Down Expand Up @@ -129,6 +131,11 @@ public void onTransferStateChanged(OCFile file, boolean downloading, boolean upl
// not needed
}

@Override
public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
super.onRemoteOperationFinish(operation, result);
}

private final OnBackPressedCallback onBackPressedCallback = new OnBackPressedCallback(true) {
@Override
public void handleOnBackPressed() {
Expand Down
Loading
Loading