Bläddra i källkod

for null checks

Andy Scherzinger 9 år sedan
förälder
incheckning
dc8e596546

+ 13 - 9
src/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -324,7 +324,9 @@ public abstract class DrawerActivity extends ToolbarActivity {
         super.updateActionBarTitleAndHomeButton(chosenFile);
 
         /// set home button properties
-        mDrawerToggle.setDrawerIndicatorEnabled(isRoot(chosenFile));
+        if(mDrawerToggle != null) {
+            mDrawerToggle.setDrawerIndicatorEnabled(isRoot(chosenFile));
+        }
     }
 
     /**
@@ -381,14 +383,16 @@ public abstract class DrawerActivity extends ToolbarActivity {
      * depending on the #mIsAccountChooserActive flag shows the account chooser or the standard menu.
      */
     private void showMenu() {
-        if (mIsAccountChooserActive) {
-            mAccountChooserToggle.setImageResource(R.drawable.ic_up);
-            mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, true);
-            mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_standard, false);
-        } else {
-            mAccountChooserToggle.setImageResource(R.drawable.ic_down);
-            mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, false);
-            mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_standard, true);
+        if(mNavigationView != null) {
+            if (mIsAccountChooserActive) {
+                mAccountChooserToggle.setImageResource(R.drawable.ic_up);
+                mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, true);
+                mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_standard, false);
+            } else {
+                mAccountChooserToggle.setImageResource(R.drawable.ic_down);
+                mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_accounts, false);
+                mNavigationView.getMenu().setGroupVisible(R.id.drawer_menu_standard, true);
+            }
         }
     }
 

+ 1 - 2
src/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -54,9 +54,8 @@ import java.io.File;
 
 /**
  * Displays local files and let the user choose what of them wants to upload
- * to the current ownCloud account
+ * to the current ownCloud account.
  */
-
 public class UploadFilesActivity extends FileActivity implements
     LocalFileListFragment.ContainerActivity, ActionBar.OnNavigationListener,
         OnClickListener, ConfirmationDialogFragmentListener {