mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Used Log_OC in all the logs

Browse source
This commit is contained in:
David A. Velasco 2013-04-15 13:17:47 +02:00
parent c3ca5b5a4f
commit 274dfd2958
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/com/owncloud/android/files/services/FileUploader.java
View file

@ -818,7 +818,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe
try { try {
db = new DbHandler(this.getBaseContext()); db = new DbHandler(this.getBaseContext());
String message = uploadResult.getLogMessage() + " errorCode: " + uploadResult.getCode(); 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) { if (uploadResult.getCode() == ResultCode.QUOTA_EXCEEDED) {
message = getString(R.string.failed_upload_quota_exceeded_text); message = getString(R.string.failed_upload_quota_exceeded_text);
} }

14
src/com/owncloud/android/media/MediaService.java
View file

@ -34,11 +34,11 @@ import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.WifiLock; import android.net.wifi.WifiManager.WifiLock;
import android.os.IBinder; import android.os.IBinder;
import android.os.PowerManager; import android.os.PowerManager;
import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import java.io.IOException; import java.io.IOException;
import com.owncloud.android.Log_OC;
import com.owncloud.android.R; import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.ui.activity.FileDetailActivity; import com.owncloud.android.ui.activity.FileDetailActivity;
@ -218,7 +218,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre
*/ */
@Override @Override
public void onCreate() { public void onCreate() {
Log.d(TAG, "Creating ownCloud media service"); Log_OC.d(TAG, "Creating ownCloud media service");
mWifiLock = ((WifiManager) getSystemService(Context.WIFI_SERVICE)). mWifiLock = ((WifiManager) getSystemService(Context.WIFI_SERVICE)).
createWifiLock(WifiManager.WIFI_MODE_FULL, MEDIA_WIFI_LOCK_TAG); createWifiLock(WifiManager.WIFI_MODE_FULL, MEDIA_WIFI_LOCK_TAG);
@ -466,22 +466,22 @@ public class MediaService extends Service implements OnCompletionListener, OnPre
} }
} catch (SecurityException e) { } 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(); Toast.makeText(this, String.format(getString(R.string.media_err_security_ex), mFile.getFileName()), Toast.LENGTH_LONG).show();
processStopRequest(true); processStopRequest(true);
} catch (IOException e) { } 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(); Toast.makeText(this, String.format(getString(R.string.media_err_io_ex), mFile.getFileName()), Toast.LENGTH_LONG).show();
processStopRequest(true); processStopRequest(true);
} catch (IllegalStateException e) { } 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(); Toast.makeText(this, String.format(getString(R.string.media_err_unexpected), mFile.getFileName()), Toast.LENGTH_LONG).show();
processStopRequest(true); processStopRequest(true);
} catch (IllegalArgumentException e) { } 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(); Toast.makeText(this, String.format(getString(R.string.media_err_unexpected), mFile.getFileName()), Toast.LENGTH_LONG).show();
processStopRequest(true); 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. * Warns the user about the error and resets the media player.
*/ */
public boolean onError(MediaPlayer mp, int what, int extra) { 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); String message = getMessageForMediaError(this, what, extra);
Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();

10
src/com/owncloud/android/media/MediaServiceBinder.java
View file

@ -19,6 +19,7 @@
package com.owncloud.android.media; package com.owncloud.android.media;
import com.owncloud.android.Log_OC;
import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.media.MediaService.State; import com.owncloud.android.media.MediaService.State;
@ -26,7 +27,6 @@ import android.accounts.Account;
import android.content.Intent; import android.content.Intent;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.os.Binder; import android.os.Binder;
import android.util.Log;
import android.widget.MediaController; import android.widget.MediaController;
@ -129,13 +129,13 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
@Override @Override
public void pause() { public void pause() {
Log.d(TAG, "Pausing through binder..."); Log_OC.d(TAG, "Pausing through binder...");
mService.processPauseRequest(); mService.processPauseRequest();
} }
@Override @Override
public void seekTo(int pos) { public void seekTo(int pos) {
Log.d(TAG, "Seeking " + pos + " through binder..."); Log_OC.d(TAG, "Seeking " + pos + " through binder...");
MediaPlayer currentPlayer = mService.getPlayer(); MediaPlayer currentPlayer = mService.getPlayer();
MediaService.State currentState = mService.getState(); MediaService.State currentState = mService.getState();
if (currentPlayer != null && currentState != State.PREPARING && currentState != State.STOPPED) { if (currentPlayer != null && currentState != State.PREPARING && currentState != State.STOPPED) {
@ -145,12 +145,12 @@ public class MediaServiceBinder extends Binder implements MediaController.MediaP
@Override @Override
public void start() { 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 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) { 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); Intent i = new Intent(mService, MediaService.class);
i.putExtra(MediaService.EXTRA_ACCOUNT, account); i.putExtra(MediaService.EXTRA_ACCOUNT, account);
i.putExtra(MediaService.EXTRA_FILE, file); i.putExtra(MediaService.EXTRA_FILE, file);

3
src/com/owncloud/android/operations/RemoteOperationResult.java
View file

@ -35,6 +35,7 @@ import org.apache.jackrabbit.webdav.DavException;
import android.util.Log; import android.util.Log;
import com.owncloud.android.Log_OC;
import com.owncloud.android.network.CertificateCombinedException; import com.owncloud.android.network.CertificateCombinedException;
/** /**
@ -91,7 +92,7 @@ public class RemoteOperationResult implements Serializable {
break; break;
default: default:
mCode = ResultCode.UNHANDLED_HTTP_CODE; 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);
} }
} }
} }

1
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
View file

@ -30,7 +30,6 @@ import com.owncloud.android.ui.dialog.ConflictsResolveDialog.OnConflictDecisionM
import android.accounts.Account; import android.accounts.Account;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
/** /**
* Wrapper activity which will be launched if keep-in-sync file will be modified by external * Wrapper activity which will be launched if keep-in-sync file will be modified by external