From f3376172aa1e48af9e6faf1ea9dc3835597c79cd Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 20 Sep 2012 15:01:38 +0400
Subject: fix http basic auth

---
 AndroidManifest.xml                  | 4 ++--
 src/org/fox/ttrss/ApiRequest.java    | 2 +-
 src/org/fox/ttrss/FeedsFragment.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 66a38b00..c254e64c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="102"
-    android:versionName="0.8.1" >
+    android:versionCode="103"
+    android:versionName="0.8.2" >
 
     <uses-sdk
         android:minSdkVersion="8"
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();
-- 
cgit v1.2.3-54-g00ecf