Wont exit app when back is pressed in the chat window

markwinter · Sep 23, 2014 · 6e4784b · 6e4784b
1 parent 55ad0bf
commit 6e4784b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/im/tox/antox/activities/MainActivity.java b/app/src/main/java/im/tox/antox/activities/MainActivity.java
@@ -276,7 +276,10 @@ public void onClick(DialogInterface dialog, int which) {
 
     @Override
     public void onBackPressed() {
-        finish();
+        if(pane.isDrawerOpen(Gravity.RIGHT))
+            pane.closeDrawers();
+        else
+            finish();
     }
 
     /* Needed for Tox ID dialog in settings fragment */

diff --git a/app/src/main/java/im/tox/antox/tox/ToxSingleton.java b/app/src/main/java/im/tox/antox/tox/ToxSingleton.java
@@ -568,7 +568,7 @@ public void sendUnsentMessages(Context ctx) {
                     Log.d(TAG, e.toString());
                 }
                 try {
-                    if (friend != null) {
+                    if (friend != null && friend.isOnline() && jTox != null) {
                         // TODO: fix for withid change
                         jTox.sendMessage(friend, unsentMessageList.get(i).message);
                     }