|
@@ -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();
|