Hide usergroup list when not on friends list

markwinter · Mar 30, 2014 · 2b1f70a · 2b1f70a
1 parent 9c2e550
commit 2b1f70a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 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
@@ -23,6 +23,7 @@
 import android.support.v7.app.ActionBar;
 import android.util.Log;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
@@ -733,6 +734,10 @@ public boolean onMenuItemClick(MenuItem item) {
                 updateChat(toxSingleton.activeFriendKey);
             }
             clearUselessNotifications();
+
+            //Hide group menu
+            ActionBar bar = MainActivity.this.getSupportActionBar();
+            bar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
         }
 
         @Override
@@ -753,6 +758,10 @@ public void onPanelOpened(View view) {
             /* This is causing a null pointer exception */
             //imm.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 0);
             System.out.println("Panel opened");
+
+            //Show group menu
+            ActionBar bar = MainActivity.this.getSupportActionBar();
+            bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         }
 
         @Override

diff --git a/app/src/main/java/im/tox/antox/data/AntoxDB.java b/app/src/main/java/im/tox/antox/data/AntoxDB.java
@@ -66,8 +66,10 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
                     break;
                 }
             case 4:
-                db.execSQL("ALTER TABLE " + Constants.TABLE_FRIENDS + " ADD COLUMN isblocked boolean");
-                break;
+                if (!isColumnInTable(db, Constants.TABLE_FRIENDS, Constants.COLUMN_NAME_ISBLOCKED)) {
+                    db.execSQL("ALTER TABLE " + Constants.TABLE_FRIENDS + " ADD COLUMN isblocked boolean");
+                    break;
+                }
         }
     }
 

diff --git a/app/src/main/java/im/tox/antox/utils/Constants.java b/app/src/main/java/im/tox/antox/utils/Constants.java
@@ -34,7 +34,7 @@ public final class Constants {
 
     //All DB Constants
     public static final String DATABASE_NAME = "antoxdb";
-    public static final int DATABASE_VERSION = 4;
+    public static final int DATABASE_VERSION = 5;
     public static final String TABLE_FRIENDS = "friends";
     public static final String TABLE_CHAT_LOGS = "chat_logs";
     public static final String TABLE_FRIEND_REQUEST = "friend_request";