fix http basic auth

This commit is contained in:
Andrew Dolgov 2012-09-20 15:01:38 +04:00
parent 869868c5d6
commit f3376172aa
3 changed files with 4 additions and 4 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="102" android:versionCode="103"
android:versionName="0.8.1" > android:versionName="0.8.2" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

View File

@ -157,7 +157,7 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
if (m_transportDebugging) Log.d(TAG, "Using HTTP Basic authentication."); if (m_transportDebugging) Log.d(TAG, "Using HTTP Basic authentication.");
conn.setRequestProperty("Authorization", "Basic " + 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); conn.setDoInput(true);

View File

@ -637,7 +637,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
if (httpLogin.length() > 0) { if (httpLogin.length() > 0) {
conn.setRequestProperty("Authorization", "Basic " + 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(); InputStream content = conn.getInputStream();