summaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-09-20 15:01:38 +0400
committerAndrew Dolgov <[email protected]>2012-09-20 15:01:38 +0400
commitf3376172aa1e48af9e6faf1ea9dc3835597c79cd (patch)
treee8dbf393625981eaf11c138eb9967dde7901b5ec /src/org
parent869868c5d6ce227b0fa1bfc0c10ff78b0d1ad417 (diff)
fix http basic auth
Diffstat (limited to 'src/org')
-rw-r--r--src/org/fox/ttrss/ApiRequest.java2
-rw-r--r--src/org/fox/ttrss/FeedsFragment.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/org/fox/ttrss/ApiRequest.java b/src/org/fox/ttrss/ApiRequest.java
index 57c4699c..53661885 100644
--- a/src/org/fox/ttrss/ApiRequest.java
+++ b/src/org/fox/ttrss/ApiRequest.java
@@ -157,7 +157,7 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
if (m_transportDebugging) Log.d(TAG, "Using HTTP Basic authentication.");
conn.setRequestProperty("Authorization", "Basic " +
- Base64.encode((httpLogin + ":" + httpPassword).getBytes("UTF-8"), Base64.NO_WRAP));
+ Base64.encodeToString((httpLogin + ":" + httpPassword).getBytes("UTF-8"), Base64.NO_WRAP));
}
conn.setDoInput(true);
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index d88134ac..2c26fd9b 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -637,7 +637,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
if (httpLogin.length() > 0) {
conn.setRequestProperty("Authorization", "Basic " +
- Base64.encode((httpLogin + ":" + httpPassword).getBytes("UTF-8"), Base64.NO_WRAP));
+ Base64.encodeToString((httpLogin + ":" + httpPassword).getBytes("UTF-8"), Base64.NO_WRAP));
}
InputStream content = conn.getInputStream();