From c9c3aa3d36064fde040ed56cf438da69f098ae2b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 18 Sep 2012 18:36:11 +0400
Subject: several android lint fixes

---
 res/layout/article_fragment.xml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'res/layout/article_fragment.xml')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 94e0a42e..e46de546 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -1,18 +1,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/article_fragment"
     android:layout_width="fill_parent"
+    android:padding="5sp"
     android:layout_height="fill_parent"
-    android:orientation="horizontal" >
-
-    <LinearLayout
-        xmlns:ads="http://schemas.android.com/apk/lib/com.google.ads"
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/article_holder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:padding="5sp" >
+    android:orientation="vertical" >
 
         <LinearLayout
             android:id="@+id/article_header"
@@ -98,6 +89,5 @@
                 android:layout_weight="0"
                 android:text="@string/attachment_copy" />
         </LinearLayout>
-    </LinearLayout>
-
+    
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From 8f88419419f9e12c5c1ad1aeaff10e3c3457f07d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 19 Sep 2012 09:45:03 +0400
Subject: add enclosure url share button

---
 res/layout/article_fragment.xml        |  7 +++++++
 res/values/strings.xml                 |  1 +
 src/org/fox/ttrss/ApiRequest.java      | 18 ++++++++++--------
 src/org/fox/ttrss/ArticleFragment.java | 20 +++++++++++++++++++-
 src/org/fox/ttrss/OnlineActivity.java  | 10 ++++++++++
 5 files changed, 47 insertions(+), 9 deletions(-)

(limited to 'res/layout/article_fragment.xml')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index e46de546..cbcf672d 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -82,6 +82,13 @@
                 android:layout_weight="0"
                 android:text="@string/attachment_view" />
 
+            <Button
+                android:id="@+id/attachment_share"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:text="@string/attachment_share" />
+            
             <Button
                 android:id="@+id/attachment_copy"
                 android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf475012..f777c2e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -129,4 +129,5 @@
     <string name="notify_article_unpublished">Article unpublished</string>
     <string name="notify_article_note_set">Article note saved</string>
     <string name="update_headlines">Refresh</string>
+    <string name="attachment_share">Share</string>
 </resources>
\ No newline at end of file
diff --git a/src/org/fox/ttrss/ApiRequest.java b/src/org/fox/ttrss/ApiRequest.java
index ee510987..c1c85e39 100644
--- a/src/org/fox/ttrss/ApiRequest.java
+++ b/src/org/fox/ttrss/ApiRequest.java
@@ -42,7 +42,8 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 	private String m_api;
 	private boolean m_trustAny = false;
 	private boolean m_transportDebugging = false;
-	protected int m_httpStatusCode = 0;
+	protected int m_responseCode = 0;
+	protected String m_responseMessage;
 	protected int m_apiStatusCode = 0;
 	protected Context m_context;
 	private SharedPreferences m_prefs;
@@ -154,10 +155,11 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 		    out.write(postData);
 		    out.close();
 
-		    m_httpStatusCode = conn.getResponseCode();
+		    m_responseCode = conn.getResponseCode();
+		    m_responseMessage = conn.getResponseMessage();
 
-		    switch (m_httpStatusCode) {
-			case 200:
+		    switch (m_responseCode) {
+			case HttpURLConnection.HTTP_OK:
 				BufferedReader buffer = new BufferedReader(
 						new InputStreamReader(conn.getInputStream()), 8192);
 	
@@ -201,16 +203,16 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 				}
 
 				return null;
-			case 401:
+			case HttpURLConnection.HTTP_UNAUTHORIZED:
 				m_lastError = ApiError.HTTP_UNAUTHORIZED;
 				break;
-			case 403:
+			case HttpURLConnection.HTTP_FORBIDDEN:
 				m_lastError = ApiError.HTTP_FORBIDDEN;
 				break;
-			case 404:
+			case HttpURLConnection.HTTP_NOT_FOUND:
 				m_lastError = ApiError.HTTP_NOT_FOUND;
 				break;
-			case 500:
+			case HttpURLConnection.HTTP_INTERNAL_ERROR:
 				m_lastError = ApiError.HTTP_SERVER_ERROR;
 				break;
 			default:
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 429cc7f6..d001fc8f 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -214,7 +214,7 @@ public class ArticleFragment extends Fragment {
 								String strUrl = url.toString().trim();
 								
 								if (a.content_type.indexOf("image") != -1 && !articleContent.contains(strUrl)) {
-									content += "<br/><img src=\"" + strUrl.replace("\"", "\\\"") + "\">";
+									content += "<p><img src=\"" + strUrl.replace("\"", "\\\"") + "\"></p>";
 								}
 								
 								spinnerArray.add(a);
@@ -256,7 +256,25 @@ public class ArticleFragment extends Fragment {
 							}
 						}
 					});
+
+					Button attachmentsShare = (Button) view.findViewById(R.id.attachment_share);
 					
+					if (!m_activity.isPortrait()) {
+						attachmentsShare.setOnClickListener(new OnClickListener() {
+							
+							@Override
+							public void onClick(View v) {
+								Attachment attachment = (Attachment) spinner.getSelectedItem();
+	
+								if (attachment != null) {
+									m_activity.shareText(attachment.content_url);
+								}
+							}
+						});
+					} else {
+						attachmentsShare.setVisibility(View.GONE);
+					}
+
 				} else {
 					view.findViewById(R.id.attachments_holder).setVisibility(View.GONE);
 				}
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index 63429465..65da3d61 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -964,6 +964,16 @@ public class OnlineActivity extends CommonActivity {
 		return tmp.replaceAll(",$", "");
 	}
 	
+	public void shareText(String text) {
+
+		Intent intent = new Intent(Intent.ACTION_SEND);
+
+		intent.setType("text/plain");
+		intent.putExtra(Intent.EXTRA_TEXT, text);
+
+		startActivity(Intent.createChooser(intent, text));
+	}
+	
 	public void shareArticle(Article article) {
 		if (article != null) {
 
-- 
cgit v1.2.3-54-g00ecf


From d3e0ce0f83c117573840eaa777c7cae45361fe6e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 19 Sep 2012 23:23:26 +0400
Subject: less-crashy handling on article title

---
 res/layout/article_fragment.xml                    |  1 +
 src/org/fox/ttrss/ArticleFragment.java             | 21 ++++++++++++++++---
 .../fox/ttrss/offline/OfflineArticleFragment.java  | 24 ++++++++++++++++++++--
 3 files changed, 41 insertions(+), 5 deletions(-)

(limited to 'res/layout/article_fragment.xml')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index cbcf672d..0b847017 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -15,6 +15,7 @@
 
             <TextView
                 android:id="@+id/title"
+                android:textColor="?linkColor"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 1788b691..7df4349b 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -17,6 +17,7 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
@@ -121,9 +122,23 @@ public class ArticleFragment extends Fragment {
 				else
 					titleStr = m_article.title;
 				
-				title.setMovementMethod(LinkMovementMethod.getInstance());
-				title.setText(Html.fromHtml("<a href=\""+m_article.link.trim().replace("\"", "\\\"")+"\">" + titleStr + "</a>"));
-				registerForContextMenu(title);
+				title.setText(titleStr);
+				title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+				title.setOnClickListener(new OnClickListener() {					
+					@Override
+					public void onClick(View v) {
+						try {
+							Intent intent = new Intent(Intent.ACTION_VIEW, 
+									Uri.parse(m_article.link.trim()));
+								startActivity(intent);
+						} catch (Exception e) {
+							e.printStackTrace();
+							m_activity.toast(R.string.error_other_error);
+						}
+					}
+				});
+				
+				registerForContextMenu(title); 
 			}
 			
 			WebView web = (WebView)view.findViewById(R.id.content);
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index 6fd7ad01..98ce59f4 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -12,8 +12,11 @@ import org.jsoup.select.Elements;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.graphics.Paint;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.provider.BaseColumns;
@@ -24,6 +27,7 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.View.OnClickListener;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -118,8 +122,24 @@ public class OfflineArticleFragment extends Fragment {
 				else
 					titleStr = m_cursor.getString(m_cursor.getColumnIndex("title"));
 				
-				title.setMovementMethod(LinkMovementMethod.getInstance());
-				title.setText(Html.fromHtml("<a href=\""+m_cursor.getString(m_cursor.getColumnIndex("link")).trim().replace("\"", "\\\"")+"\">" + titleStr + "</a>"));
+				final String link = m_cursor.getString(m_cursor.getColumnIndex("link"));
+				
+				title.setText(titleStr);
+				title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+				title.setOnClickListener(new OnClickListener() {					
+					@Override
+					public void onClick(View v) {
+						try {
+							Intent intent = new Intent(Intent.ACTION_VIEW, 
+									Uri.parse(link.trim()));
+								startActivity(intent);
+						} catch (Exception e) {
+							e.printStackTrace();
+							m_activity.toast(R.string.error_other_error);
+						}
+					}
+				});
+				
 				registerForContextMenu(title);
 			}
 			
-- 
cgit v1.2.3-54-g00ecf