|
@@ -526,7 +526,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
|
inputText.setText(filename);
|
|
|
int selectionStart = 0;
|
|
|
int extensionStart = filename.lastIndexOf(".");
|
|
|
- int selectionEnd = (extensionStart >= 0) ? extensionStart : filename.length();
|
|
|
+ int selectionEnd = extensionStart >= 0 ? extensionStart : filename.length();
|
|
|
if (selectionEnd >= 0) {
|
|
|
inputText.setSelection(
|
|
|
Math.min(selectionStart, selectionEnd),
|
|
@@ -544,7 +544,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
|
}
|
|
|
|
|
|
private boolean isIntentStartWithUrl(String extraText) {
|
|
|
- return (extraText.startsWith("http://") || extraText.startsWith("https://"));
|
|
|
+ return extraText.startsWith("http://") || extraText.startsWith("https://");
|
|
|
}
|
|
|
|
|
|
@Nullable
|
|
@@ -728,7 +728,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
|
ListView mListView = findViewById(android.R.id.list);
|
|
|
|
|
|
String current_dir = mParents.peek();
|
|
|
- boolean notRoot = (mParents.size() > 1);
|
|
|
+ boolean notRoot = mParents.size() > 1;
|
|
|
|
|
|
if (actionBar != null) {
|
|
|
if ("".equals(current_dir)) {
|
|
@@ -1063,7 +1063,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
|
dialog.show(getSupportFragmentManager(), CreateFolderDialogFragment.CREATE_FOLDER_FRAGMENT);
|
|
|
break;
|
|
|
case android.R.id.home:
|
|
|
- if ((mParents.size() > 1)) {
|
|
|
+ if (mParents.size() > 1) {
|
|
|
onBackPressed();
|
|
|
}
|
|
|
break;
|
|
@@ -1115,8 +1115,8 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
|
String syncFolderRemotePath = intent.getStringExtra(FileSyncAdapter.EXTRA_FOLDER_PATH);
|
|
|
RemoteOperationResult syncResult = (RemoteOperationResult)
|
|
|
DataHolderUtil.getInstance().retrieve(intent.getStringExtra(FileSyncAdapter.EXTRA_RESULT));
|
|
|
- boolean sameAccount = (getAccount() != null &&
|
|
|
- accountName.equals(getAccount().name) && getStorageManager() != null);
|
|
|
+ boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name)
|
|
|
+ && getStorageManager() != null;
|
|
|
|
|
|
if (sameAccount) {
|
|
|
|
|
@@ -1150,13 +1150,12 @@ public class ReceiveExternalFilesActivity extends FileActivity
|
|
|
mFile = currentFile;
|
|
|
}
|
|
|
|
|
|
- mSyncInProgress = (!FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
|
|
|
- !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event));
|
|
|
+ mSyncInProgress = !FileSyncAdapter.EVENT_FULL_SYNC_END.equals(event) &&
|
|
|
+ !RefreshFolderOperation.EVENT_SINGLE_FOLDER_SHARES_SYNCED.equals(event);
|
|
|
|
|
|
- if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.
|
|
|
- equals(event) &&
|
|
|
+ if (RefreshFolderOperation.EVENT_SINGLE_FOLDER_CONTENTS_SYNCED.equals(event)
|
|
|
/// TODO refactor and make common
|
|
|
- syncResult != null && !syncResult.isSuccess()) {
|
|
|
+ && syncResult != null && !syncResult.isSuccess()) {
|
|
|
|
|
|
if (syncResult.getCode() == ResultCode.UNAUTHORIZED ||
|
|
|
(syncResult.isException() && syncResult.getException()
|