one last fix with activity state and intents for notifications

zom · Feb 16, 2018 · 0271ee0 · 0271ee0
1 parent 178a84f
commit 0271ee0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -385,6 +385,7 @@
             android:name="org.awesomeapp.messenger.ui.ConversationDetailActivity"
             android:exported="false"
             android:theme="@style/AppThemeNoAction"
+            android:launchMode="singleInstance"
             android:windowSoftInputMode="stateHidden|adjustPan" />
         <activity
             android:name="org.awesomeapp.messenger.ui.ContactListActivity"

diff --git a/app/src/main/java/org/awesomeapp/messenger/MainActivity.java b/app/src/main/java/org/awesomeapp/messenger/MainActivity.java
@@ -341,7 +341,7 @@ public void onResume() {
         }
 
 
-        handleIntent();
+        handleIntent(getIntent());
 
         if (mApp.getDefaultAccountId() == -1)
         {
@@ -436,16 +436,13 @@ private boolean isNetworkAvailable() {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-
         setIntent(intent);
-
-        handleIntent();
+        handleIntent(intent);
     }
 
-    private void handleIntent ()
+    private void handleIntent (Intent intent)
     {
 
-        Intent intent = getIntent();
 
         if (intent != null)
         {

diff --git a/app/src/main/java/org/awesomeapp/messenger/ui/ConversationDetailActivity.java b/app/src/main/java/org/awesomeapp/messenger/ui/ConversationDetailActivity.java
@@ -190,9 +190,6 @@ public void onCreate(Bundle savedInstanceState) {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         applyStyleForToolbar();
 
-        Intent intent = getIntent();
-        processIntent(intent);
-
         collapseToolbar();
 
         getWindow().setSoftInputMode(
@@ -336,6 +333,9 @@ public void expandToolbar(){
     protected void onResume() {
         super.onResume();
 
+        Intent intent = getIntent();
+        processIntent(intent);
+
         mConvoView.setSelected(true);
 
         IntentFilter regFilter = new IntentFilter();
@@ -393,6 +393,7 @@ protected void onPause() {
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
 
+        setIntent(intent);
         processIntent(intent);
     }