Refactored code. Removed temporary files.| #793

FlowCrypt · Dec 17, 2019 · 68b6f6b · 68b6f6b
1 parent d692783
commit 68b6f6b
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 237 deletions.
diff --git a/FlowCrypt/src/main/AndroidManifest.xml b/FlowCrypt/src/main/AndroidManifest.xml
@@ -233,9 +233,6 @@
             android:name=".ui.activity.UserRecoverableAuthExceptionActivity"
             android:launchMode="singleTask" />
 
-        <activity android:name=".ui.activity.ui.paging.PagingActivity" />
-
-
         <!-- Providers -->
         <provider
             android:name=".database.provider.SecurityContentProvider"

diff --git a/.../ui/activity/ui/paging/PagingViewModel.kt → ...il/jetpack/viewmodel/MessagesViewModel.kt b/.../ui/activity/ui/paging/PagingViewModel.kt → ...il/jetpack/viewmodel/MessagesViewModel.kt
@@ -3,17 +3,22 @@
  * Contributors: DenBond7
  */
 
-package com.flowcrypt.email.ui.activity.ui.paging
+package com.flowcrypt.email.jetpack.viewmodel
 
 import android.app.Application
 import androidx.lifecycle.LiveData
 import androidx.paging.PagedList
 import androidx.paging.toLiveData
 import com.flowcrypt.email.database.FlowCryptRoomDatabase
 import com.flowcrypt.email.database.entity.MessageEntity
-import com.flowcrypt.email.jetpack.viewmodel.BaseAndroidViewModel
 
-class PagingViewModel(application: Application) : BaseAndroidViewModel(application) {
+/**
+ * @author Denis Bondarenko
+ *         Date: 12/17/19
+ *         Time: 4:37 PM
+ *         E-mail: [email protected]
+ */
+class MessagesViewModel(application: Application) : BaseAndroidViewModel(application) {
   private val roomDatabase = FlowCryptRoomDatabase.getDatabase(application)
   val concertList: LiveData<PagedList<MessageEntity>> = roomDatabase.msgDao().msgs().toLiveData(pageSize = 20)
-}
+}
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.kt
@@ -529,7 +529,7 @@ class EmailManagerActivity : BaseEmailListActivity(), NavigationView.OnNavigatio
     val fragment = supportFragmentManager
         .findFragmentById(R.id.emailListFragment) as EmailListFragment?
 
-    fragment?.onForceLoadNewMsgsCompleted(refreshListNeeded)
+    //fragment?.onForceLoadNewMsgsCompleted(refreshListNeeded)
   }
 
   /**