X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c13741ba2056f175978ecdbc05b81cf473781e3d..13a73dd56872b6fcbc12ab8c62806cbfd48dc93b:/src/com/owncloud/android/ui/activity/FileActivity.java diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java index 154aa7d6..3edd40c9 100644 --- a/src/com/owncloud/android/ui/activity/FileActivity.java +++ b/src/com/owncloud/android/ui/activity/FileActivity.java @@ -315,12 +315,26 @@ public class FileActivity extends AppCompatActivity super.onBackPressed(); } + /** + * checks if the drawer exists and is opened. + * + * @return true if the drawer is open, else false + */ public boolean isDrawerOpen() { - return mDrawerLayout.isDrawerOpen(GravityCompat.START); + if(mDrawerLayout != null) { + return mDrawerLayout.isDrawerOpen(GravityCompat.START); + } else { + return false; + } } + /** + * closes the navigation drawer. + */ public void closeNavDrawer() { - mDrawerLayout.closeDrawer(GravityCompat.START); + if(mDrawerLayout != null) { + mDrawerLayout.closeDrawer(GravityCompat.START); + } } protected void initDrawer(){ @@ -506,7 +520,7 @@ public class FileActivity extends AppCompatActivity */ private void swapToDefaultAccount() { // default to the most recently used account - Account newAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()); + Account newAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext()); if (newAccount == null) { /// no account available: force account creation createFirstAccount(); @@ -598,7 +612,7 @@ public class FileActivity extends AppCompatActivity } /** - * @return 'True' when the Activity is finishing to enforce the setup of a new account. + * @return 'True' when the Activity is finishing to enforce the setup of a new account. */ protected boolean isRedirectingToSetupAccount() { return mRedirectingToSetupAccount; @@ -748,6 +762,7 @@ public class FileActivity extends AppCompatActivity } + private void onCreateShareOperationFinish(CreateShareOperation operation, RemoteOperationResult result) { dismissLoadingDialog(); @@ -853,7 +868,7 @@ public class FileActivity extends AppCompatActivity /** * Dismiss loading dialog */ - public void dismissLoadingDialog(){ + public void dismissLoadingDialog() { Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG); if (frag != null) { LoadingDialog loading = (LoadingDialog) frag;