Merge branch 'master' into deltalab

src/org/thoughtcrime/securesms/ConversationFragment.java

@@ -715,6 +715,15 @@ public class ConversationFragment extends Fragment
             else if(DozeReminder.isDozeReminderMsg(getContext(), messageRecord)) {
                 DozeReminder.dozeReminderTapped(getContext());
             }
+            else {
+                String self_mail = dcContext.getConfig("configured_mail_user");
+                if (self_mail != null && !self_mail.isEmpty()
+                        && messageRecord.getText().contains(self_mail)
+                        && getListAdapter().getChat().isDeviceTalk()) {
+                    // This is a device message informing the user that the password is wrong
+                    startActivity(new Intent(getActivity(), RegistrationActivity.class));
+                }
+            }
         }
 
         @Override

src/org/thoughtcrime/securesms/notifications/NotificationCenter.java

@@ -321,12 +321,6 @@ public class NotificationCenter {
                 return;
             }
 
-            if (dcChat.isDeviceTalk()) {
-                // currently, we just never notify on device chat.
-                // esp. on first start, this is annoying.
-                return;
-            }
-
             NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
 
             // get notification text as a single line