AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'main' into develop

Browse Source
This commit is contained in:
Julian Raufelder 2021-02-22 12:23:41 +01:00
commit f8cc7aedc1
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
10 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -42,7 +42,7 @@ allprojects {
ext {
androidApplicationId = 'org.cryptomator'
androidVersionCode = getVersionCode()
androidVersionName = '1.5.12-SNAPSHOT'
androidVersionName = '1.5.12'
}
repositories {
mavenCentral()

5
fastlane/metadata/android/de-DE/changelogs/default.txt
View File

@ -1 +1,4 @@
- Foo
- Möglichkeit zum Sortieren der Tresorliste hinzugefügt
- Logging in Google Drive Cloud hinzugefügt
- Verhalten bei Änderung des OneDrive-Passworts verbessert
- CryptoBot-Symbole aufpoliert

5
fastlane/metadata/android/en-US/changelogs/default.txt
View File

@ -1 +1,4 @@
- Foo
- Added possibility to sort vault list
- Added logging to Google drive cloud
- Enhanced behavior when OneDrive password changed
- Polished CryptoBot icons

1
fastlane/metadata/android/fr-FR/changelogs/default.txt
View File

@ -1 +0,0 @@
- Foo

5
fastlane/release-notes.html
View File

@ -1,3 +1,6 @@
<ul>
<li>Foo</li>
<li>Added possibility to sort vault list</li>
<li>Added logging to Google drive cloud</li>
<li>Enhanced behavior when OneDrive password changed</li>
<li>Polished CryptoBot icons</li>
</ul>

10
presentation/src/main/java/org/cryptomator/presentation/model/comparator/VaultPositionComparator.kt Normal file
View File

@ -0,0 +1,10 @@
package org.cryptomator.presentation.model.comparator
import org.cryptomator.presentation.model.VaultModel
class VaultPositionComparator : Comparator<VaultModel> {
override fun compare(v1: VaultModel, v2: VaultModel): Int {
return v1.position - v2.position
}
}

3
presentation/src/main/java/org/cryptomator/presentation/ui/adapter/BiometricAuthSettingsAdapter.kt
View File

@ -4,6 +4,7 @@ import android.view.View
import com.google.android.material.switchmaterial.SwitchMaterial
import org.cryptomator.presentation.R
import org.cryptomator.presentation.model.VaultModel
import org.cryptomator.presentation.model.comparator.VaultPositionComparator
import org.cryptomator.presentation.ui.adapter.BiometricAuthSettingsAdapter.BiometricAuthSettingsViewHolder
import javax.inject.Inject
import kotlinx.android.synthetic.main.item_biometric_auth_vault.view.cloud
@ -12,7 +13,7 @@ import kotlinx.android.synthetic.main.item_biometric_auth_vault.view.vaultName
class BiometricAuthSettingsAdapter //
@Inject
constructor() : RecyclerViewBaseAdapter<VaultModel, BiometricAuthSettingsAdapter.OnVaultBiometricAuthSettingsChanged, BiometricAuthSettingsViewHolder>() {
constructor() : RecyclerViewBaseAdapter<VaultModel, BiometricAuthSettingsAdapter.OnVaultBiometricAuthSettingsChanged, BiometricAuthSettingsViewHolder>(VaultPositionComparator()) {
private var onVaultBiometricAuthSettingsChanged: OnVaultBiometricAuthSettingsChanged? = null

3
presentation/src/main/java/org/cryptomator/presentation/ui/adapter/SharedLocationsAdapter.kt
View File

@ -3,6 +3,7 @@ package org.cryptomator.presentation.ui.adapter
import android.view.View
import org.cryptomator.presentation.R
import org.cryptomator.presentation.model.VaultModel
import org.cryptomator.presentation.model.comparator.VaultPositionComparator
import org.cryptomator.presentation.ui.adapter.SharedLocationsAdapter.VaultViewHolder
import javax.inject.Inject
import kotlinx.android.synthetic.main.item_shareable_location.view.chooseFolderLocation
@ -12,7 +13,7 @@ import kotlinx.android.synthetic.main.item_shareable_location.view.selectedVault
import kotlinx.android.synthetic.main.item_shareable_location.view.vaultName
class SharedLocationsAdapter @Inject
constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callback, VaultViewHolder>() {
constructor() : RecyclerViewBaseAdapter<VaultModel, SharedLocationsAdapter.Callback, VaultViewHolder>(VaultPositionComparator()) {
private var selectedVault: VaultModel? = null
private var selectedLocation: String? = null

10
presentation/src/main/java/org/cryptomator/presentation/ui/adapter/VaultsAdapter.kt
View File

@ -3,6 +3,7 @@ package org.cryptomator.presentation.ui.adapter
import android.view.View
import org.cryptomator.presentation.R
import org.cryptomator.presentation.model.VaultModel
import org.cryptomator.presentation.model.comparator.VaultPositionComparator
import org.cryptomator.presentation.ui.adapter.VaultsAdapter.VaultViewHolder
import javax.inject.Inject
import kotlinx.android.synthetic.main.item_vault.view.cloudImage
@ -12,7 +13,7 @@ import kotlinx.android.synthetic.main.item_vault.view.vaultName
import kotlinx.android.synthetic.main.item_vault.view.vaultPath
class VaultsAdapter @Inject
internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnItemInteractionListener, VaultViewHolder>(VaultModelComparator()), VaultsMoveListener.Listener {
internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnItemInteractionListener, VaultViewHolder>(VaultPositionComparator()), VaultsMoveListener.Listener {
interface OnItemInteractionListener {
@ -82,11 +83,4 @@ internal constructor() : RecyclerViewBaseAdapter<VaultModel, VaultsAdapter.OnIte
override fun onRowMoved(fromPosition: Int, toPosition: Int) {
callback.onRowMoved(fromPosition, toPosition)
}
internal class VaultModelComparator : java.util.Comparator<VaultModel> {
override fun compare(o1: VaultModel, o2: VaultModel): Int {
return o1.position - o2.position
}
}
}

8
presentation/src/main/java/org/cryptomator/presentation/ui/fragment/SharedFilesFragment.kt
View File

@ -6,6 +6,7 @@ import org.cryptomator.presentation.R
import org.cryptomator.presentation.model.CloudFolderModel
import org.cryptomator.presentation.model.SharedFileModel
import org.cryptomator.presentation.model.VaultModel
import org.cryptomator.presentation.model.comparator.VaultPositionComparator
import org.cryptomator.presentation.presenter.SharedFilesPresenter
import org.cryptomator.presentation.ui.adapter.SharedFilesAdapter
import org.cryptomator.presentation.ui.adapter.SharedFilesAdapter.Callback
@ -70,9 +71,10 @@ class SharedFilesFragment : BaseFragment() {
}
fun displayVaults(vaults: List<VaultModel>?) {
if (vaults?.isNotEmpty() == true) {
presenter.selectedVault?.let { presenter.selectedVault = vaults[vaults.indexOf(it)] }
val preselectedVault = presenter.selectedVault ?: vaults[0]
val sortedVaults = vaults?.sortedWith(VaultPositionComparator())
if (sortedVaults?.isNotEmpty() == true) {
presenter.selectedVault?.let { presenter.selectedVault = sortedVaults[sortedVaults.indexOf(it)] }
val preselectedVault = presenter.selectedVault ?: sortedVaults[0]
locationsAdapter.setPreselectedVault(preselectedVault)
presenter.onVaultSelected(preselectedVault)
}