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

Merge pull request #7160 from nextcloud/fixActivityFetching

Browse source 
Fix activity fetching
This commit is contained in:
Andy Scherzinger 2020-10-29 09:39:46 +01:00 committed by GitHub
commit 1730499609
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 93 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/analysis/findbugs-results.txt
View file

@ -1 +1 @@
316
315

97
src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.java
View file

@ -1,97 +0,0 @@
/*
* Nextcloud Android client application
*
* @author Alejandro Bautista
* @author Chris Narkiewicz
*
* Copyright (C) 2017 Alejandro Bautista
* Copyright (C) 2019 Chris Narkiewicz <hello@ezaquarii.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.utils.glide;
import com.bumptech.glide.Priority;
import com.bumptech.glide.load.data.DataFetcher;
import com.nextcloud.client.account.CurrentAccountProvider;
import com.nextcloud.client.account.User;
import com.nextcloud.client.network.ClientFactory;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.utils.Log_OC;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
import java.io.InputStream;
/**
* Fetcher with OwnCloudClient
*/
public class HttpStreamFetcher implements DataFetcher<InputStream> {
private static final String TAG = HttpStreamFetcher.class.getName();
private final String url;
private final CurrentAccountProvider currentAccount;
private final ClientFactory clientFactory;
HttpStreamFetcher(final CurrentAccountProvider currentAccount, ClientFactory clientFactory, final String url) {
this.currentAccount = currentAccount;
this.clientFactory = clientFactory;
this.url = url;
}
@Override
public InputStream loadData(Priority priority) throws Exception {
User user = currentAccount.getUser();
OwnCloudClient client = clientFactory.create(user);
if (client != null) {
GetMethod get = null;
try {
get = new GetMethod(url);
get.setRequestHeader("Cookie", "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true");
get.setRequestHeader(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE);
int status = client.executeMethod(get);
if (status == HttpStatus.SC_OK) {
return get.getResponseBodyAsStream();
} else {
client.exhaustResponse(get.getResponseBodyAsStream());
}
} catch (Exception e) {
Log_OC.e(TAG, e.getMessage(), e);
} finally {
if (get != null) {
get.releaseConnection();
}
}
}
return null;
}
@Override
public void cleanup() {
Log_OC.i(TAG,"Cleanup");
}
@Override
public String getId() {
return url;
}
@Override
public void cancel() {
Log_OC.i(TAG,"Cancel");
}
}

92
src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.kt Normal file
View file

@ -0,0 +1,92 @@
/*
* Nextcloud Android client application
*
* @author Alejandro Bautista
* @author Chris Narkiewicz
*
* Copyright (C) 2017 Alejandro Bautista
* Copyright (C) 2019 Chris Narkiewicz <hello@ezaquarii.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.owncloud.android.utils.glide
import com.bumptech.glide.Priority
import com.bumptech.glide.load.data.DataFetcher
import com.nextcloud.client.account.CurrentAccountProvider
import com.nextcloud.client.network.ClientFactory
import com.owncloud.android.lib.common.operations.RemoteOperation
import com.owncloud.android.lib.common.utils.Log_OC
import org.apache.commons.httpclient.HttpStatus
import org.apache.commons.httpclient.methods.GetMethod
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
import java.io.InputStream
/**
* Fetcher with OwnCloudClient
*/
class HttpStreamFetcher internal constructor(
private val currentAccount: CurrentAccountProvider,
private val clientFactory: ClientFactory,
private val url: String
) : DataFetcher<InputStream?> {
@Throws(Exception::class)
override fun loadData(priority: Priority): InputStream? {
val user = currentAccount.user
val client = clientFactory.create(user)
if (client != null) {
var get: GetMethod? = null
try {
get = GetMethod(url)
get.setRequestHeader("Cookie", "nc_sameSiteCookielax=true;nc_sameSiteCookiestrict=true")
get.setRequestHeader(RemoteOperation.OCS_API_HEADER, RemoteOperation.OCS_API_HEADER_VALUE)
val status = client.executeMethod(get)
if (status == HttpStatus.SC_OK) {
val byteOutputStream = ByteArrayOutputStream()
get.responseBodyAsStream.use { input ->
byteOutputStream.use { output ->
input.copyTo(output)
}
}
return ByteArrayInputStream(byteOutputStream.toByteArray())
} else {
client.exhaustResponse(get.responseBodyAsStream)
}
} catch (e: Exception) {
Log_OC.e(TAG, e.message, e)
} finally {
get?.releaseConnection()
}
}
return null
}
override fun cleanup() {
Log_OC.i(TAG, "Cleanup")
}
override fun getId(): String {
return url
}
override fun cancel() {
Log_OC.i(TAG, "Cancel")
}
companion object {
private val TAG = HttpStreamFetcher::class.java.name
}
}