gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-01-31 03:22:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve code base from review comments

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-06-09 12:02:15 +02:00
parent 3d0f154d7d
commit 3e99dc065b
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
8 changed files with 76 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFolderListingOperation.kt
View File

@ -54,6 +54,26 @@ class ReadFolderListingOperation(okHttpClient: OkHttpClient, currentUser: UserEn
private val url: String
private val depth: Int
private val basePath: String
init {
val okHttpClientBuilder: OkHttpClient.Builder = okHttpClient.newBuilder()
okHttpClientBuilder.followRedirects(false)
okHttpClientBuilder.followSslRedirects(false)
okHttpClientBuilder.authenticator(
MagicAuthenticator(
ApiUtils.getCredentials(
currentUser.username,
currentUser.token
),
"Authorization"
)
)
this.okHttpClient = okHttpClientBuilder.build()
basePath = currentUser.baseUrl + DavUtils.DAV_PATH + currentUser.userId
url = basePath + path
this.depth = depth
}
fun readRemotePath(): DavResponse {
val davResponse = DavResponse()
val memberElements: MutableList<Response> = ArrayList()
@ -96,29 +116,6 @@ class ReadFolderListingOperation(okHttpClient: OkHttpClient, currentUser: UserEn
return davResponse
}
companion object {
private const val TAG = "ReadFilesystemOperation"
}
init {
val okHttpClientBuilder: OkHttpClient.Builder = okHttpClient.newBuilder()
okHttpClientBuilder.followRedirects(false)
okHttpClientBuilder.followSslRedirects(false)
okHttpClientBuilder.authenticator(
MagicAuthenticator(
ApiUtils.getCredentials(
currentUser.username,
currentUser.token
),
"Authorization"
)
)
this.okHttpClient = okHttpClientBuilder.build()
basePath = currentUser.baseUrl + DavUtils.DAV_PATH + currentUser.userId
url = basePath + path
this.depth = depth
}
private fun getModelFromResponse(response: Response, remotePath: String): RemoteFileBrowserItem {
val remoteFileBrowserItem = RemoteFileBrowserItem()
remoteFileBrowserItem.path = Uri.decode(remotePath)
@ -127,7 +124,9 @@ class ReadFolderListingOperation(okHttpClient: OkHttpClient, currentUser: UserEn
for (property in properties) {
mapPropertyToBrowserFile(property, remoteFileBrowserItem)
}
if (remoteFileBrowserItem.permissions != null && remoteFileBrowserItem.permissions!!.contains("R")) {
if (remoteFileBrowserItem.permissions != null &&
remoteFileBrowserItem.permissions!!.contains(READ_PERMISSION)
) {
remoteFileBrowserItem.isAllowedToReShare = true
}
if (TextUtils.isEmpty(remoteFileBrowserItem.mimeType) && !remoteFileBrowserItem.isFile) {
@ -172,4 +171,9 @@ class ReadFolderListingOperation(okHttpClient: OkHttpClient, currentUser: UserEn
}
}
}
companion object {
private const val TAG = "ReadFilesystemOperation"
private const val READ_PERMISSION = "R"
}
}

7
app/src/main/java/com/nextcloud/talk/controllers/ProfileController.kt
View File

@ -514,11 +514,11 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
try {
FileUtils.removeTempCacheFile(
this.context!!,
"photos/avatar.png"
AVATAR_PATH
)
file = FileUtils.getTempCacheFile(
this.context!!,
"photos/avatar.png"
AVATAR_PATH
)
try {
FileOutputStream(file).use { out -> bitmap.compress(Bitmap.CompressFormat.PNG, FULL_QUALITY, out) }
@ -558,7 +558,7 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
} else if (resultCode == ImagePicker.RESULT_ERROR) {
Toast.makeText(activity, getError(intent), Toast.LENGTH_SHORT).show()
} else {
Toast.makeText(activity, "Task Cancelled", Toast.LENGTH_SHORT).show()
Log.i(TAG, "Task Cancelled")
}
}
@ -808,6 +808,7 @@ class ProfileController : NewBaseController(R.layout.controller_profile) {
companion object {
private const val TAG: String = "ProfileController"
private const val AVATAR_PATH = "photos/avatar.png"
private const val REQUEST_CODE_SELECT_REMOTE_FILES = 22
private const val DEFAULT_CACHE_SIZE: Int = 20
private const val DEFAULT_RETRIES: Long = 3

58
app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt
View File

@ -113,6 +113,36 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe
showEmpty()
}
is RemoteFileBrowserItemsViewModel.LoadedState -> {
loadList(state, mimeTypeSelectionFilter)
}
is RemoteFileBrowserItemsViewModel.FinishState -> {
finishWithResult(state.selectedPaths)
}
}
}
viewModel.fileSortOrder.observe(this) { sortOrder ->
if (sortOrder != null) {
binding.sortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder))
}
}
viewModel.currentPath.observe(this) { path ->
if (path != null) {
supportActionBar?.title = path
}
}
viewModel.selectedPaths.observe(this) { selectedPaths ->
filesSelectionDoneMenuItem?.isVisible = !selectedPaths.isNullOrEmpty()
binding.recyclerView.adapter?.notifyDataSetChanged()
}
}
private fun loadList(
state: RemoteFileBrowserItemsViewModel.LoadedState,
mimeTypeSelectionFilter: String?
) {
val remoteFileBrowserItems = state.items
Log.d(TAG, "Items received: $remoteFileBrowserItems")
@ -140,29 +170,6 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe
showList()
}
is RemoteFileBrowserItemsViewModel.FinishState -> {
finishWithResult(state.selectedPaths)
}
}
}
viewModel.fileSortOrder.observe(this) { sortOrder ->
if (sortOrder != null) {
binding.sortButton.setText(DisplayUtils.getSortOrderStringId(sortOrder))
}
}
viewModel.currentPath.observe(this) { path ->
if (path != null) {
supportActionBar?.title = path
}
}
viewModel.selectedPaths.observe(this) { selectedPaths ->
filesSelectionDoneMenuItem?.isVisible = !selectedPaths.isNullOrEmpty()
binding.recyclerView.adapter?.notifyDataSetChanged()
}
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
super.onCreateOptionsMenu(menu)
@ -171,6 +178,11 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe
return true
}
override fun onBackPressed() {
setResult(Activity.RESULT_CANCELED)
super.onBackPressed()
}
override fun onResume() {
super.onResume()
refreshCurrentPath()

7
app/src/main/java/com/nextcloud/talk/remotefilebrowser/model/RemoteFileBrowserItem.kt
View File

@ -23,11 +23,9 @@
package com.nextcloud.talk.remotefilebrowser.model
import android.os.Parcelable
import com.bluelinelabs.logansquare.annotation.JsonObject
import kotlinx.android.parcel.Parcelize
@Parcelize
@JsonObject
data class RemoteFileBrowserItem(
var path: String? = null,
var displayName: String? = null,
@ -43,7 +41,4 @@ data class RemoteFileBrowserItem(
var isEncrypted: Boolean = false,
var permissions: String? = null,
var isAllowedToReShare: Boolean = false
) : Parcelable {
// This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject'
constructor() : this(null, null, null, 0, 0, false, null, false, false, false, null, false)
}
) : Parcelable

2
app/src/main/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt
View File

@ -150,7 +150,7 @@ class RemoteFileBrowserItemsViewModel @Inject constructor(
}
}
fun changePath(path: String) {
private fun changePath(path: String) {
_currentPath.value = path
loadItems()
}

6
app/src/main/java/com/nextcloud/talk/utils/FileSortOrderByName.kt
View File

@ -40,17 +40,17 @@ class FileSortOrderByName internal constructor(name: String, ascending: Boolean)
* Comparator for RemoteFileBrowserItems, sorts by name.
*/
class RemoteFileBrowserItemNameComparator(private val multiplier: Int) : Comparator<RemoteFileBrowserItem> {
private val alphanumComparator = AlphanumComparator<RemoteFileBrowserItem>()
override fun compare(left: RemoteFileBrowserItem, right: RemoteFileBrowserItem): Int {
return if (!left.isFile && !right.isFile) {
return multiplier * AlphanumComparator<RemoteFileBrowserItem>()
.compareRemoteFileBrowserItem(left, right)
return multiplier * alphanumComparator.compare(left.path, right.path)
} else if (!left.isFile) {
-1
} else if (!right.isFile) {
1
} else {
multiplier * AlphanumComparator<RemoteFileBrowserItem>().compareRemoteFileBrowserItem(left, right)
multiplier * alphanumComparator.compare(left.path, right.path)
}
}
}

9
app/src/main/java/third_parties/daveKoeller/AlphanumComparator.java
View File

@ -24,8 +24,6 @@
package third_parties.daveKoeller;
import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem;
import java.io.Serializable;
import java.math.BigInteger;
import java.text.Collator;
@ -86,13 +84,6 @@ public class AlphanumComparator<T> implements Comparator<T>, Serializable {
return chunk.toString();
}
public int compareRemoteFileBrowserItem(RemoteFileBrowserItem f1, RemoteFileBrowserItem f2) {
String s1 = f1.getPath();
String s2 = f2.getPath();
return compare(s1, s2);
}
public int compare(T t1, T t2) {
return compare(t1.toString(), t2.toString());
}

2
detekt.yml
View File

@ -1,5 +1,5 @@
build:
maxIssues: 89
maxIssues: 88
weights:
# complexity: 2
# LongParameterList: 1