From b0b0ee6678a72dcc29e8b5e40e922e926488066e Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Mon, 14 Jan 2013 09:07:51 +0100
Subject: [PATCH] Add check to display database upgrade screen to more
 activities

Through shortcuts, widgets, etc. users can start the app using another
activity than Accounts. We still want to display the database upgrade
screen in such cases.
---
 src/com/fsck/k9/activity/FolderList.java     | 6 ++++++
 src/com/fsck/k9/activity/MessageCompose.java | 6 ++++++
 src/com/fsck/k9/activity/MessageList.java    | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index a17376281..711b9e460 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -287,6 +287,12 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        if (UpgradeDatabases.actionUpgradeDatabases(this, getIntent())) {
+            finish();
+            return;
+        }
+
         mActionBarProgressView = getLayoutInflater().inflate(R.layout.actionbar_indeterminate_progress_actionview, null);
         mActionBar = getSupportActionBar();
         initializeActionBar();
diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java
index 0b7049585..746284005 100644
--- a/src/com/fsck/k9/activity/MessageCompose.java
+++ b/src/com/fsck/k9/activity/MessageCompose.java
@@ -480,6 +480,12 @@ public class MessageCompose extends K9Activity implements OnClickListener {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        if (UpgradeDatabases.actionUpgradeDatabases(this, getIntent())) {
+            finish();
+            return;
+        }
+
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setContentView(R.layout.message_compose);
 
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 47cbc3cd4..4297d7f06 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -125,6 +125,12 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        if (UpgradeDatabases.actionUpgradeDatabases(this, getIntent())) {
+            finish();
+            return;
+        }
+
         setContentView(R.layout.message_list);
 
         mActionBar = getSupportActionBar();