Skip to content

Log.wtf() should not be used unless an assertion fails #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 2 commits into from
Jul 21, 2016
Merged

Log.wtf() should not be used unless an assertion fails #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7295e5
Replace Log.wtf calls with Log.e
kruton Apr 20, 2016
a6bd603
Replace Log.wtf calls with Log.e
AndyScherzinger Jul 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
//Log_OC.wtf(TAG, "onCreate init");
//Log_OC.e(TAG, "onCreate init");
super.onCreate(savedInstanceState);

// Workaround, for fixing a problem with Android Library Suppor v7 19
Expand Down Expand Up @@ -285,7 +285,7 @@ public void onClick(View v) {
/// initialize block to be moved to single Fragment to retrieve and validate credentials
initAuthorizationPreFragment(savedInstanceState);

//Log_OC.wtf(TAG, "onCreate end");
//Log_OC.e(TAG, "onCreate end");
}

private void initAuthTokenType() {
Expand Down Expand Up @@ -602,7 +602,7 @@ private void updateAuthenticationPreFragmentVisibility () {
*/
@Override
protected void onSaveInstanceState(Bundle outState) {
//Log_OC.wtf(TAG, "onSaveInstanceState init" );
//Log_OC.e(TAG, "onSaveInstanceState init" );
super.onSaveInstanceState(outState);

/// global state
Expand Down Expand Up @@ -642,7 +642,7 @@ protected void onSaveInstanceState(Bundle outState) {
}
mAsyncTask = null;

//Log_OC.wtf(TAG, "onSaveInstanceState end" );
//Log_OC.e(TAG, "onSaveInstanceState end" );
}

@Override
Expand Down Expand Up @@ -759,7 +759,7 @@ private void getOAuth2AccessTokenFromCapturedRedirection() {
queryParameters);

if (mOperationsServiceBinder != null) {
//Log_OC.wtf(TAG, "getting access token..." );
//Log_OC.e(TAG, "getting access token..." );
mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);
}
}
Expand Down Expand Up @@ -836,7 +836,7 @@ private void checkOcServer() {
if (mOperationsServiceBinder != null) {
mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);
} else {
Log_OC.wtf(TAG, "Server check tried with OperationService unbound!" );
Log_OC.e(TAG, "Server check tried with OperationService unbound!" );
}

} else {
Expand Down Expand Up @@ -1869,7 +1869,7 @@ public void onCancelCertificate() {


private void doOnResumeAndBound() {
//Log_OC.wtf(TAG, "registering to listen for operation callbacks" );
//Log_OC.e(TAG, "registering to listen for operation callbacks" );
mOperationsServiceBinder.addOperationListener(AuthenticatorActivity.this, mHandler);
if (mWaitingForOpId <= Integer.MAX_VALUE) {
mOperationsServiceBinder.dispatchResultIfFinished((int)mWaitingForOpId, this);
Expand Down
2 changes: 1 addition & 1 deletion src/com/owncloud/android/files/BootupBroadcastReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class BootupBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
if (!intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) {
Log_OC.wtf(TAG, "Incorrect action sent " + intent.getAction());
Log_OC.e(TAG, "Incorrect action sent " + intent.getAction());
return;
}
Log_OC.d(TAG, "Starting file observer service...");
Expand Down
10 changes: 5 additions & 5 deletions src/com/owncloud/android/files/FileOperationsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void openFile(OCFile file) {
}

} else {
Log_OC.wtf(TAG, "Trying to open a NULL OCFile");
Log_OC.e(TAG, "Trying to open a NULL OCFile");
}
}

Expand Down Expand Up @@ -166,7 +166,7 @@ public void shareFileViaLink(OCFile file, String password) {
mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);

} else {
Log_OC.wtf(TAG, "Trying to share a NULL OCFile");
Log_OC.e(TAG, "Trying to share a NULL OCFile");
// TODO user-level error?
}

Expand All @@ -193,7 +193,7 @@ public void getFileWithLink(OCFile file){
mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);

} else {
Log_OC.wtf(TAG, "Trying to share a NULL OCFile");
Log_OC.e(TAG, "Trying to share a NULL OCFile");
}
} else {
// Show a Message
Expand Down Expand Up @@ -229,7 +229,7 @@ public void shareFileWithSharee(OCFile file, String shareeName, ShareType shareT
mWaitingForOpId = mFileActivity.getOperationsServiceBinder().queueNewOperation(service);

} else {
Log_OC.wtf(TAG, "Trying to share a NULL OCFile");
Log_OC.e(TAG, "Trying to share a NULL OCFile");
}
}

Expand Down Expand Up @@ -422,7 +422,7 @@ public void sendDownloadedFile(OCFile file) {
chooserDialog.show(mFileActivity.getSupportFragmentManager(), FTAG_CHOOSER_DIALOG);

} else {
Log_OC.wtf(TAG, "Trying to send a NULL OCFile");
Log_OC.e(TAG, "Trying to send a NULL OCFile");
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/com/owncloud/android/services/OperationsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public boolean dispatchResultIfFinished(int operationId,
if (undispatched != null) {
listener.onRemoteOperationFinish(undispatched.first, undispatched.second);
return true;
//Log_OC.wtf(TAG, "Sending callback later");
//Log_OC.e(TAG, "Sending callback later");
} else {
return (!mServiceHandler.mPendingOperations.isEmpty());
}
Expand Down Expand Up @@ -432,7 +432,7 @@ public void handleMessage(Message msg) {
*/
private void nextOperation() {

//Log_OC.wtf(TAG, "nextOperation init" );
//Log_OC.e(TAG, "nextOperation init" );

Pair<Target, RemoteOperation> next = null;
synchronized(mPendingOperations) {
Expand Down
2 changes: 1 addition & 1 deletion src/com/owncloud/android/ui/activity/BaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ protected void onAccountSet(boolean stateWasRecovered) {
mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver());
mCapabilities = mStorageManager.getCapability(mCurrentAccount.name);
} else {
Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
Log_OC.e(TAG, "onAccountChanged was called with NULL account associated!");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void conflictDecisionMade(Decision decision) {
finish();
return;
default:
Log_OC.wtf(TAG, "Unhandled conflict decision " + decision);
Log_OC.e(TAG, "Unhandled conflict decision " + decision);
return;
}

Expand Down
8 changes: 4 additions & 4 deletions src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,12 +352,12 @@ private void initFragmentsWithFile() {
}

} else {
Log_OC.wtf(TAG, "initFragments() called with invalid NULLs!");
Log_OC.e(TAG, "initFragments() called with invalid NULLs!");
if (getAccount() == null) {
Log_OC.wtf(TAG, "\t account is NULL");
Log_OC.e(TAG, "\t account is NULL");
}
if (getFile() == null) {
Log_OC.wtf(TAG, "\t file is NULL");
Log_OC.e(TAG, "\t file is NULL");
}
}
}
Expand Down Expand Up @@ -434,7 +434,7 @@ private OCFileListFragment getListOfFilesFragment() {
if (listOfFiles != null) {
return (OCFileListFragment) listOfFiles;
}
Log_OC.wtf(TAG, "Access to unexisting list of files fragment!!");
Log_OC.e(TAG, "Access to unexisting list of files fragment!!");
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/com/owncloud/android/ui/activity/FolderPickerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ protected OCFileListFragment getListOfFilesFragment() {
if (listOfFiles != null) {
return (OCFileListFragment)listOfFiles;
}
Log_OC.wtf(TAG, "Access to unexisting list of files fragment!!");
Log_OC.e(TAG, "Access to unexisting list of files fragment!!");
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/com/owncloud/android/ui/activity/ShareActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ protected void onNewIntent(Intent intent) {
);

} else {
Log_OC.wtf(TAG, "Unexpected intent " + intent.toString());
Log_OC.e(TAG, "Unexpected intent " + intent.toString());
}
}

Expand Down