Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
Initial implementation of a progress dialog while db init/migration
Arka Prava Basu7f78254afe50
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex cf3a857..215d14f 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -18,9 +18,13 @@package org.havenapp.main;import android.annotation.SuppressLint;+import android.app.ProgressDialog;import android.arch.lifecycle.LiveData;import android.arch.lifecycle.Observer;+import android.content.BroadcastReceiver;+import android.content.Context;import android.content.Intent;+import android.content.IntentFilter;import android.database.sqlite.SQLiteException;import android.graphics.Color;import android.graphics.PorterDuff;@@ -31,6 +35,7 @@ import android.support.annotation.NonNull;import android.support.design.widget.FloatingActionButton;import android.support.design.widget.Snackbar;import android.support.v4.content.ContextCompat;+import android.support.v4.content.LocalBroadcastManager;import android.support.v4.graphics.drawable.DrawableCompat;import android.support.v7.app.AppCompatActivity;import android.support.v7.widget.LinearLayoutManager;@@ -66,6 +71,10 @@ import java.util.Date;import java.util.List;import java.util.StringTokenizer;+import static org.havenapp.main.database.DbConstantsKt.DB_INIT_END;+import static org.havenapp.main.database.DbConstantsKt.DB_INIT_START;+import static org.havenapp.main.database.DbConstantsKt.DB_INIT_STATUS;+public class ListActivity extends AppCompatActivity {private RecyclerView recyclerView;@@ -97,6 +106,23 @@ public class ListActivity extends AppCompatActivity {}};+ private BroadcastReceiver dbBroadcastReceiver = new BroadcastReceiver() {+ @Override+ public void onReceive(Context context, Intent intent) {+ if (intent.getIntExtra(DB_INIT_STATUS, 0) == DB_INIT_START) {+ progressDialog = new ProgressDialog(ListActivity.this);+ progressDialog.setTitle(getString(R.string.please_wait));+ progressDialog.setMessage(getString(R.string.migrating_data));+ progressDialog.show();+ } else if (intent.getIntExtra(DB_INIT_STATUS, 0) == DB_INIT_END) {+ if (progressDialog != null)+ progressDialog.dismiss();+ }+ }+ };++ private ProgressDialog progressDialog;+@Overrideprotected void onCreate(Bundle savedInstanceState) {super.onCreate(savedInstanceState);@@ -109,6 +135,8 @@ public class ListActivity extends AppCompatActivity {fab = findViewById(R.id.fab);toolbar = findViewById(R.id.toolbar);setSupportActionBar(toolbar);+ LocalBroadcastManager.getInstance(this).registerReceiver(dbBroadcastReceiver,+ new IntentFilter(DB_INIT_STATUS));LinearLayoutManager llm = new LinearLayoutManager(this);recyclerView.setLayoutManager(llm);@@ -309,6 +337,12 @@ public class ListActivity extends AppCompatActivity {return true;}+ @Override+ protected void onDestroy() {+ super.onDestroy();+ LocalBroadcastManager.getInstance(this).unregisterReceiver(dbBroadcastReceiver);+ }+private void removeAllEvents(){final List<Event> removedEvents = new ArrayList<Event>(events);diff --git a/src/main/java/org/havenapp/main/database/DbConstants.kt b/src/main/java/org/havenapp/main/database/DbConstants.ktnew file mode 100644index 0000000..7ba2547--- /dev/null+++ b/src/main/java/org/havenapp/main/database/DbConstants.kt@@ -0,0 +1,10 @@+package org.havenapp.main.database++/**+ * Created by Arka Prava Basu <[email protected]> on 19/10/18.+ */++const val DB_INIT_START = 0x1+const val DB_INIT_END = 0x2++const val DB_INIT_STATUS = "db_init_status"diff --git a/src/main/java/org/havenapp/main/database/HavenEventDB.kt b/src/main/java/org/havenapp/main/database/HavenEventDB.ktindex ca8f83c..d45e767 100644--- a/src/main/java/org/havenapp/main/database/HavenEventDB.kt+++ b/src/main/java/org/havenapp/main/database/HavenEventDB.kt@@ -5,6 +5,8 @@ import android.arch.persistence.room.Roomimport android.arch.persistence.room.RoomDatabaseimport android.arch.persistence.room.TypeConvertersimport android.content.Context+import android.content.Intent+import android.support.v4.content.LocalBroadcastManagerimport org.havenapp.main.dao.EventDAOimport org.havenapp.main.dao.EventTriggerDAOimport org.havenapp.main.database.converter.HavenEventDBConverters@@ -17,26 +19,40 @@ import org.havenapp.main.model.EventTrigger*/@Database(entities = [(Event::class), (EventTrigger::class)], version = 4)@TypeConverters(HavenEventDBConverters::class)-abstract class HavenEventDB: RoomDatabase() {+abstract class HavenEventDB : RoomDatabase() {abstract fun getEventDAO(): EventDAO- abstract fun getEventTriggerDAO() : EventTriggerDAO+ abstract fun getEventTriggerDAO(): EventTriggerDAOcompanion object {- private var INSTANCE : HavenEventDB? = null+ private var INSTANCE: HavenEventDB? = null@JvmStatic- fun getDatabase(context: Context) : HavenEventDB {+ fun getDatabase(context: Context): HavenEventDB {if (INSTANCE == null) {synchronized(HavenEventDB::class) {if (INSTANCE == null) {++ // notify interested components that db initialization is starting+ var dbIntent = Intent()+ dbIntent.putExtra(DB_INIT_STATUS, DB_INIT_START)+ dbIntent.action = DB_INIT_STATUS+ LocalBroadcastManager.getInstance(context).sendBroadcast(dbIntent)+INSTANCE = Room.databaseBuilder(context.applicationContext,HavenEventDB::class.java, "haven.db").allowMainThreadQueries() // todo remove this.addMigrations(RoomMigration()).build()++ // notify interested components that db initialization has succeeded+ dbIntent = Intent()+ dbIntent.putExtra(DB_INIT_STATUS, DB_INIT_END)+ dbIntent.action = DB_INIT_STATUS+ LocalBroadcastManager.getInstance(context).sendBroadcast(dbIntent)+}}}diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex d26b675..17ba1ab 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -159,5 +159,7 @@<string name="config_storage_path">Storage Folder Path</string><string name="config_storage_page_hint">Where captured media is stored</string><string name="event_trigger_deleted">Event Trigger deleted</string>+ <string name="please_wait">Please wait</string>+ <string name="migrating_data">Looking for your old data</string></resources>