projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #152 from owncloud/oauth_login
[pub/Android/ownCloud.git]
/
src
/
com
/
owncloud
/
android
/
ui
/
preview
/
FileDownloadFragment.java
diff --git
a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
index
b11d341
..
773350a
100644
(file)
--- a/
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@
-3,8
+3,8
@@
* Copyright (C) 2012-2013 ownCloud Inc.
*
* This program is free software: you can redistribute it and/or modify
* 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 3 of the License
.
+ * 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
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,7
+23,6
@@
import android.accounts.Account;
import android.app.Activity;
import android.os.Bundle;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.app.Activity;
import android.os.Bundle;
import android.support.v4.app.FragmentStatePagerAdapter;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@
-38,6
+37,7
@@
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
import com.owncloud.android.ui.fragment.FileFragment;
+import com.owncloud.android.Log_OC;
import com.owncloud.android.R;
import eu.alefzero.webdav.OnDatatransferProgressListener;
import com.owncloud.android.R;
import eu.alefzero.webdav.OnDatatransferProgressListener;
@@
-239,7
+239,7
@@
public class FileDownloadFragment extends SherlockFragment implements OnClickLis
break;
}
default:
break;
}
default:
- Log.e(TAG, "Incorrect view clicked!");
+ Log
_OC
.e(TAG, "Incorrect view clicked!");
}
}
}
}