From: David A. Velasco Date: Mon, 15 Apr 2013 11:17:47 +0000 (+0200) Subject: Used Log_OC in all the logs X-Git-Tag: oc-android-1.4.3~36^2~3 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/274dfd295815a7071c34d19ffe8eb9b81b78a805 Used Log_OC in all the logs --- diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index efdae3d8..43639e26 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -818,7 +818,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe try { db = new DbHandler(this.getBaseContext()); String message = uploadResult.getLogMessage() + " errorCode: " + uploadResult.getCode(); - Log.e(TAG, message + " Http-Code: " + uploadResult.getHttpCode()); + Log_OC.e(TAG, message + " Http-Code: " + uploadResult.getHttpCode()); if (uploadResult.getCode() == ResultCode.QUOTA_EXCEEDED) { message = getString(R.string.failed_upload_quota_exceeded_text); } diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java index 9fd0037d..77bccaf0 100644 --- a/src/com/owncloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -34,11 +34,11 @@ import android.net.wifi.WifiManager; import android.net.wifi.WifiManager.WifiLock; import android.os.IBinder; import android.os.PowerManager; -import android.util.Log; import android.widget.Toast; import java.io.IOException; +import com.owncloud.android.Log_OC; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.ui.activity.FileDetailActivity; @@ -218,7 +218,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre */ @Override public void onCreate() { - Log.d(TAG, "Creating ownCloud media service"); + Log_OC.d(TAG, "Creating ownCloud media service"); mWifiLock = ((WifiManager) getSystemService(Context.WIFI_SERVICE)). createWifiLock(WifiManager.WIFI_MODE_FULL, MEDIA_WIFI_LOCK_TAG); @@ -466,22 +466,22 @@ public class MediaService extends Service implements OnCompletionListener, OnPre } } catch (SecurityException e) { - Log.e(TAG, "SecurityException playing " + mAccount.name + mFile.getRemotePath(), e); + Log_OC.e(TAG, "SecurityException playing " + mAccount.name + mFile.getRemotePath(), e); Toast.makeText(this, String.format(getString(R.string.media_err_security_ex), mFile.getFileName()), Toast.LENGTH_LONG).show(); processStopRequest(true); } catch (IOException e) { - Log.e(TAG, "IOException playing " + mAccount.name + mFile.getRemotePath(), e); + Log_OC.e(TAG, "IOException playing " + mAccount.name + mFile.getRemotePath(), e); Toast.makeText(this, String.format(getString(R.string.media_err_io_ex), mFile.getFileName()), Toast.LENGTH_LONG).show(); processStopRequest(true); } catch (IllegalStateException e) { - Log.e(TAG, "IllegalStateException " + mAccount.name + mFile.getRemotePath(), e); + Log_OC.e(TAG, "IllegalStateException " + mAccount.name + mFile.getRemotePath(), e); Toast.makeText(this, String.format(getString(R.string.media_err_unexpected), mFile.getFileName()), Toast.LENGTH_LONG).show(); processStopRequest(true); } catch (IllegalArgumentException e) { - Log.e(TAG, "IllegalArgumentException " + mAccount.name + mFile.getRemotePath(), e); + Log_OC.e(TAG, "IllegalArgumentException " + mAccount.name + mFile.getRemotePath(), e); Toast.makeText(this, String.format(getString(R.string.media_err_unexpected), mFile.getFileName()), Toast.LENGTH_LONG).show(); processStopRequest(true); } @@ -593,7 +593,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre * Warns the user about the error and resets the media player. */ public boolean onError(MediaPlayer mp, int what, int extra) { - Log.e(TAG, "Error in audio playback, what = " + what + ", extra = " + extra); + Log_OC.e(TAG, "Error in audio playback, what = " + what + ", extra = " + extra); String message = getMessageForMediaError(this, what, extra); Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show(); diff --git a/src/com/owncloud/android/media/MediaServiceBinder.java b/src/com/owncloud/android/media/MediaServiceBinder.java index 7b401ed1..d2c52484 100644 --- a/src/com/owncloud/android/media/MediaServiceBinder.java +++ b/src/com/owncloud/android/media/MediaServiceBinder.java @@ -19,6 +19,7 @@ package com.owncloud.android.media; +import com.owncloud.android.Log_OC; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.media.MediaService.State; @@ -26,7 +27,6 @@ import android.accounts.Account; import android.content.Intent; import android.media.MediaPlayer; import android.os.Binder; -import android.util.Log; import android.widget.MediaController; @@ -129,13 +129,13 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP @Override public void pause() { - Log.d(TAG, "Pausing through binder..."); + Log_OC.d(TAG, "Pausing through binder..."); mService.processPauseRequest(); } @Override public void seekTo(int pos) { - Log.d(TAG, "Seeking " + pos + " through binder..."); + Log_OC.d(TAG, "Seeking " + pos + " through binder..."); MediaPlayer currentPlayer = mService.getPlayer(); MediaService.State currentState = mService.getState(); if (currentPlayer != null && currentState != State.PREPARING && currentState != State.STOPPED) { @@ -145,12 +145,12 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP @Override public void start() { - Log.d(TAG, "Starting through binder..."); + Log_OC.d(TAG, "Starting through binder..."); mService.processPlayRequest(); // this will finish the service if there is no file preloaded to play } public void start(Account account, OCFile file, boolean playImmediately, int position) { - Log.d(TAG, "Loading and starting through binder..."); + Log_OC.d(TAG, "Loading and starting through binder..."); Intent i = new Intent(mService, MediaService.class); i.putExtra(MediaService.EXTRA_ACCOUNT, account); i.putExtra(MediaService.EXTRA_FILE, file); diff --git a/src/com/owncloud/android/operations/RemoteOperationResult.java b/src/com/owncloud/android/operations/RemoteOperationResult.java index 0ef5b31b..ea0c3fa2 100644 --- a/src/com/owncloud/android/operations/RemoteOperationResult.java +++ b/src/com/owncloud/android/operations/RemoteOperationResult.java @@ -35,6 +35,7 @@ import org.apache.jackrabbit.webdav.DavException; import android.util.Log; +import com.owncloud.android.Log_OC; import com.owncloud.android.network.CertificateCombinedException; /** @@ -91,7 +92,7 @@ public class RemoteOperationResult implements Serializable { break; default: mCode = ResultCode.UNHANDLED_HTTP_CODE; - Log.d(TAG, "RemoteOperationResult has prcessed UNHANDLED_HTTP_CODE: " + httpCode); + Log_OC.d(TAG, "RemoteOperationResult has prcessed UNHANDLED_HTTP_CODE: " + httpCode); } } } diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java index 3ccc07dc..1ae06118 100644 --- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java +++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java @@ -30,7 +30,6 @@ import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionM import android.accounts.Account; import android.content.Intent; import android.os.Bundle; -import android.util.Log; /** * Wrapper activity which will be launched if keep-in-sync file will be modified by external