ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix footer for AccountManagerActivity.kt 

MAILAND-1629
This commit is contained in:
Davide Farella 2021-03-15 16:58:58 +01:00
parent cadea38abf
commit f2834a3e1d
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/ch/protonmail/android/activities/AddAttachmentsActivity.java
View File

@ -18,6 +18,9 @@
*/
package ch.protonmail.android.activities;
import static ch.protonmail.android.attachments.ImportAttachmentsWorkerKt.KEY_INPUT_DATA_DELETE_ORIGINAL_FILE_BOOLEAN;
import static ch.protonmail.android.attachments.ImportAttachmentsWorkerKt.KEY_INPUT_DATA_FILE_URIS_STRING_ARRAY;
import android.app.Activity;
import android.content.ClipData;
import android.content.Intent;
@ -61,11 +64,13 @@ import ch.protonmail.android.R;
import ch.protonmail.android.activities.guest.LoginActivity;
import ch.protonmail.android.adapters.AttachmentListAdapter;
import ch.protonmail.android.attachments.AttachmentsViewModel;
import ch.protonmail.android.attachments.AttachmentsViewState;
import ch.protonmail.android.attachments.ImportAttachmentsWorker;
import ch.protonmail.android.core.Constants;
import ch.protonmail.android.core.ProtonMailApplication;
import ch.protonmail.android.data.local.MessageDao;
import ch.protonmail.android.data.local.MessageDatabase;
import ch.protonmail.android.data.local.model.Attachment;
import ch.protonmail.android.data.local.model.LocalAttachment;
import ch.protonmail.android.events.DownloadedAttachmentEvent;
import ch.protonmail.android.events.LogoutEvent;
@ -83,9 +88,6 @@ import kotlin.collections.ArraysKt;
import kotlin.collections.CollectionsKt;
import timber.log.Timber;
import static ch.protonmail.android.attachments.ImportAttachmentsWorkerKt.KEY_INPUT_DATA_DELETE_ORIGINAL_FILE_BOOLEAN;
import static ch.protonmail.android.attachments.ImportAttachmentsWorkerKt.KEY_INPUT_DATA_FILE_URIS_STRING_ARRAY;
@AndroidEntryPoint
public class AddAttachmentsActivity extends BaseStoragePermissionActivity implements AttachmentListAdapter.IAttachmentListener {

2
app/src/main/java/ch/protonmail/android/activities/multiuser/AccountManagerActivity.kt
View File

@ -200,7 +200,7 @@ class AccountManagerActivity : BaseActivity() {
user.toUiModel(loggedIn, id == currentUser)
}
accountsAdapter.items = accounts + DrawerUserModel.Footer
accountsAdapter.items = accounts + DrawerUserModel.AccFooter
accountsRecyclerView.adapter = accountsAdapter
}
}

4
app/src/main/java/ch/protonmail/android/activities/multiuser/ConnectAccountActivity.kt
View File

@ -72,10 +72,6 @@ class ConnectAccountActivity : ConnectAccountBaseActivity() {
private val viewModel: ConnectAccountViewModel by viewModels()
override fun removeAccount(username: String) {
viewModel.removeAccount(username)
}
override fun resetState() {
// noop
}

5
app/src/main/java/ch/protonmail/android/attachments/AttachmentsViewModel.kt
View File

@ -27,11 +27,12 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import ch.protonmail.android.activities.AddAttachmentsActivity.EXTRA_DRAFT_ID
import ch.protonmail.android.activities.messageDetails.repository.MessageDetailsRepository
import ch.protonmail.android.api.models.room.messages.Message
import ch.protonmail.android.core.NetworkConnectivityManager
import ch.protonmail.android.data.local.model.Message
import ch.protonmail.android.utils.MessageUtils
import kotlinx.coroutines.cancel
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import me.proton.core.util.kotlin.DispatcherProvider
@ -49,7 +50,7 @@ class AttachmentsViewModel @ViewModelInject constructor(
fun init() {
viewModelScope.launch(dispatchers.Io) {
val messageId = savedStateHandle.get<String>(EXTRA_DRAFT_ID) ?: return@launch
val message = messageDetailsRepository.findMessageById(messageId)
val message = messageDetailsRepository.findMessageById(messageId).first()
message?.let { existingMessage ->
val messageDbId = requireNotNull(existingMessage.dbId)

2
app/src/main/java/ch/protonmail/android/attachments/AttachmentsViewState.kt
View File

@ -19,7 +19,7 @@
package ch.protonmail.android.attachments
import ch.protonmail.android.api.models.room.messages.Attachment
import ch.protonmail.android.data.local.model.Attachment
sealed class AttachmentsViewState {
object MissingConnectivity : AttachmentsViewState()