Merge pull request #137 from nextcloud/userDebugPhone

Log.wtf() should not be used unless an assertion fails
This commit is contained in:
Andy Scherzinger 2016-07-21 13:03:11 +02:00 committed by GitHub
commit 2e3d3a1aa0
9 changed files with 23 additions and 23 deletions

View file

@ -206,7 +206,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
@ -286,7 +286,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
/// 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() {
@ -603,7 +603,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
*/
@Override
protected void onSaveInstanceState(Bundle outState) {
//Log_OC.wtf(TAG, "onSaveInstanceState init" );
//Log_OC.e(TAG, "onSaveInstanceState init" );
super.onSaveInstanceState(outState);
/// global state
@ -643,7 +643,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
}
mAsyncTask = null;
//Log_OC.wtf(TAG, "onSaveInstanceState end" );
//Log_OC.e(TAG, "onSaveInstanceState end" );
}
@Override
@ -760,7 +760,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
queryParameters);
if (mOperationsServiceBinder != null) {
//Log_OC.wtf(TAG, "getting access token..." );
//Log_OC.e(TAG, "getting access token..." );
mWaitingForOpId = mOperationsServiceBinder.queueNewOperation(getServerInfoIntent);
}
}
@ -837,7 +837,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
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 {
@ -1882,7 +1882,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
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);

View file

@ -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...");

View file

@ -130,7 +130,7 @@ public class FileOperationsHelper {
}
} else {
Log_OC.wtf(TAG, "Trying to open a NULL OCFile");
Log_OC.e(TAG, "Trying to open a NULL OCFile");
}
}
@ -169,7 +169,7 @@ public class FileOperationsHelper {
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?
}
@ -196,7 +196,7 @@ public class FileOperationsHelper {
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
@ -232,7 +232,7 @@ public class FileOperationsHelper {
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");
}
}
@ -425,7 +425,7 @@ public class FileOperationsHelper {
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");
}
}

View file

@ -366,7 +366,7 @@ public class OperationsService extends Service {
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());
}
@ -433,7 +433,7 @@ public class OperationsService extends Service {
*/
private void nextOperation() {
//Log_OC.wtf(TAG, "nextOperation init" );
//Log_OC.e(TAG, "nextOperation init" );
Pair<Target, RemoteOperation> next = null;
synchronized(mPendingOperations) {

View file

@ -152,7 +152,7 @@ public abstract class BaseActivity extends AppCompatActivity {
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!");
}
}

View file

@ -72,7 +72,7 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
finish();
return;
default:
Log_OC.wtf(TAG, "Unhandled conflict decision " + decision);
Log_OC.e(TAG, "Unhandled conflict decision " + decision);
return;
}

View file

@ -353,12 +353,12 @@ public class FileDisplayActivity extends HookActivity
}
} 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");
}
}
}
@ -435,7 +435,7 @@ public class FileDisplayActivity extends HookActivity
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;
}

View file

@ -171,7 +171,7 @@ public class FolderPickerActivity extends FileActivity implements FileFragment.C
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;
}

View file

@ -117,7 +117,7 @@ public class ShareActivity extends FileActivity
);
} else {
Log_OC.wtf(TAG, "Unexpected intent " + intent.toString());
Log_OC.e(TAG, "Unexpected intent " + intent.toString());
}
}