From e120aa9ac00a0a20c11803ae8d899ef5b7c24577 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 25 Jul 2017 16:46:30 -0400 Subject: [PATCH] update conversations on request instead of every time --- .../main/java/com/moez/QKSMS/MainActivity.kt | 6 ++--- .../data/sync/ConversationSyncManager.kt | 7 +++++- .../conversations/ConversationListFragment.kt | 22 +++++++++++++++++-- qksms/src/main/res/menu/conversations.xml | 8 ++++++- qksms/src/main/res/menu/messages.xml | 4 ++-- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt index b57f4730..a9705fcb 100644 --- a/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/MainActivity.kt @@ -10,8 +10,7 @@ import com.karumi.dexter.listener.PermissionDeniedResponse import com.karumi.dexter.listener.PermissionGrantedResponse import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.single.PermissionListener -import com.moez.QKSMS.data.sync.ConversationSyncManager -import com.moez.QKSMS.ui.conversations.ConversationFragment +import com.moez.QKSMS.ui.conversations.ConversationListFragment class MainActivity : AppCompatActivity() { val TAG = "MainActivity" @@ -25,7 +24,6 @@ class MainActivity : AppCompatActivity() { .withListener(object : PermissionListener { override fun onPermissionGranted(response: PermissionGrantedResponse) { Log.d(TAG, "Permission granted") - ConversationSyncManager.copyToRealm(this@MainActivity) } override fun onPermissionDenied(response: PermissionDeniedResponse) { @@ -37,6 +35,6 @@ class MainActivity : AppCompatActivity() { }) .check() - supportFragmentManager.beginTransaction().add(R.id.content_frame, ConversationFragment()).commit() + supportFragmentManager.beginTransaction().add(R.id.content_frame, ConversationListFragment()).commit() } } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/ConversationSyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/ConversationSyncManager.kt index 90ce1e2e..b7ce7934 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/ConversationSyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/ConversationSyncManager.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.data.sync import android.net.Uri +import android.util.Log import com.moez.QKSMS.model.Conversation import io.realm.Realm @@ -31,9 +32,12 @@ internal object ConversationSyncManager { fun copyToRealm(context: android.content.Context) { + val realm = Realm.getDefaultInstance() val cursor = context.contentResolver.query(ConversationSyncManager.CONVERSATIONS_CONTENT_PROVIDER, ConversationSyncManager.ALL_THREADS_PROJECTION, null, null, "date desc") - Realm.getDefaultInstance().executeTransaction { + realm.executeTransaction { + it.delete(Conversation::class.java) + while (cursor.moveToNext()) it.insertOrUpdate(Conversation( cursor.getLong(ID), @@ -47,6 +51,7 @@ internal object ConversationSyncManager { cursor.getInt(HAS_ATTACHMENT))) } + Log.i(TAG, "Inserted ${cursor.count} conversations") cursor.close() } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt index bd4d892f..35fc27c8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt @@ -5,14 +5,20 @@ import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView import android.view.* import com.moez.QKSMS.R +import com.moez.QKSMS.data.sync.ConversationSyncManager import com.moez.QKSMS.model.Conversation import com.moez.QKSMS.ui.base.QkFragment import io.realm.RealmResults -class ConversationFragment : QkFragment(), ConversationView { +class ConversationListFragment : QkFragment(), ConversationView { var conversationList: RecyclerView? = null + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setHasOptionsMenu(true) + } + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { val view = inflater.inflate(R.layout.conversations_fragment, container, false) @@ -28,8 +34,20 @@ class ConversationFragment : QkFragment conversationList?.adapter = ConversationAdapter(context, conversations) } - override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + inflater.inflate(R.menu.conversations, menu) super.onCreateOptionsMenu(menu, inflater) } + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.load_conversations -> { // TODO: This is for testing, remove this + ConversationSyncManager.copyToRealm(context) + return true + } + + else -> return super.onOptionsItemSelected(item) + } + } + } \ No newline at end of file diff --git a/qksms/src/main/res/menu/conversations.xml b/qksms/src/main/res/menu/conversations.xml index fe187c0c..019069da 100644 --- a/qksms/src/main/res/menu/conversations.xml +++ b/qksms/src/main/res/menu/conversations.xml @@ -1,4 +1,10 @@ - + + + \ No newline at end of file diff --git a/qksms/src/main/res/menu/messages.xml b/qksms/src/main/res/menu/messages.xml index 019069da..ef64a0a5 100644 --- a/qksms/src/main/res/menu/messages.xml +++ b/qksms/src/main/res/menu/messages.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools"> \ No newline at end of file