X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/8638936ce70e28f64f4ffd2fddff8595d4814bf1..52bd01bcedf1b8f13c49b67ee40a848bae1a9d40:/src/com/owncloud/android/ui/activity/UploadFilesActivity.java diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java index d16b2637..16e05f89 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -2,9 +2,8 @@ * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,7 +25,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; import android.support.v4.app.DialogFragment; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; @@ -44,6 +42,7 @@ import com.owncloud.android.ui.fragment.LocalFileListFragment; import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; import com.owncloud.android.utils.FileStorageUtils; +import com.owncloud.android.Log_OC; import com.owncloud.android.R; /** @@ -78,7 +77,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements @Override public void onCreate(Bundle savedInstanceState) { - Log.d(TAG, "onCreate() start"); + Log_OC.d(TAG, "onCreate() start"); super.onCreate(savedInstanceState); if(savedInstanceState != null) { @@ -125,7 +124,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements mCurrentDialog = null; } - Log.d(TAG, "onCreate() end"); + Log_OC.d(TAG, "onCreate() end"); } @@ -181,10 +180,10 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements @Override protected void onSaveInstanceState(Bundle outState) { // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved - Log.d(TAG, "onSaveInstanceState() start"); + Log_OC.d(TAG, "onSaveInstanceState() start"); super.onSaveInstanceState(outState); outState.putString(UploadFilesActivity.KEY_DIRECTORY_PATH, mCurrentDir.getAbsolutePath()); - Log.d(TAG, "onSaveInstanceState() end"); + Log_OC.d(TAG, "onSaveInstanceState() end"); } @@ -354,7 +353,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements @Override public void onConfirmation(String callerTag) { - Log.d(TAG, "Positive button in dialog was clicked; dialog tag is " + callerTag); + Log_OC.d(TAG, "Positive button in dialog was clicked; dialog tag is " + callerTag); if (callerTag.equals(QUERY_TO_MOVE_DIALOG_TAG)) { // return the list of selected files to the caller activity (success), signaling that they should be moved to the ownCloud folder, instead of copied Intent data = new Intent(); @@ -367,14 +366,14 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements @Override public void onNeutral(String callerTag) { - Log.d(TAG, "Phantom neutral button in dialog was clicked; dialog tag is " + callerTag); + Log_OC.d(TAG, "Phantom neutral button in dialog was clicked; dialog tag is " + callerTag); } @Override public void onCancel(String callerTag) { /// nothing to do; don't finish, let the user change the selection - Log.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag); + Log_OC.d(TAG, "Negative button in dialog was clicked; dialog tag is " + callerTag); }