diff options
author | Andrew Dolgov <[email protected]> | 2013-05-12 18:44:38 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-05-12 18:44:38 +0400 |
commit | 7d1cca8bd5af1bac616d7650ba94e409e352c92d (patch) | |
tree | 70a46e07f99c8ece1ad1f918b78f1744dc2c3b94 | |
parent | c3e3987923444357a495a62088ab2ca533fbfdca (diff) | |
parent | 5eceb57e2f84977084f7111e5bc4e5769c9234cb (diff) |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb
-rw-r--r-- | res/values-fr/strings.xml | 2 | ||||
-rw-r--r-- | src/org/fox/ttrss/ArticleFragment.java | 18 | ||||
-rw-r--r-- | src/org/fox/ttrss/HeadlinesFragment.java | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index ccd16f8e..c0e8b9d6 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -59,7 +59,7 @@ <string name="no_headlines_to_display">Aucun titre à afficher</string> <string name="browse_cats_like_feeds">Parcourir les catégories comme les flux</string> <string name="browse_cats_like_feeds_summary">Utilisez le menu contexte des catégories pour redéfinir ce paramètre.</string> - <string name="headlines_mark_as_read">Marqué comme lu</string> + <string name="headlines_mark_as_read">Marquer comme lu</string> <string name="error_unknown">Erreur: Erreur inconnue (voir journal)</string> <string name="error_http_unauthorized">Erreur: 401 non-authorisé</string> <string name="error_http_forbidden">Erreur: 403 interdit</string> diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index a7a7de0f..396ef730 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -1,6 +1,7 @@ package org.fox.ttrss; import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; import java.text.SimpleDateFormat; import java.util.Date; @@ -115,9 +116,11 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl @Override public void onClick(View v) { try { - Intent intent = new Intent(Intent.ACTION_VIEW, - Uri.parse(m_article.link.trim())); - startActivity(intent); + URL url = new URL(m_article.link.trim()); + String uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), + url.getPort(), url.getPath(), url.getQuery(), url.getRef()).toString(); + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(uri)); + startActivity(intent); } catch (Exception e) { e.printStackTrace(); m_activity.toast(R.string.error_other_error); @@ -139,11 +142,12 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl @Override public void onClick(View v) { try { - String link = (m_article.comments_link != null && m_article.comments_link.length() > 0) ? - m_article.comments_link : m_article.link; - + URL url = new URL((m_article.comments_link != null && m_article.comments_link.length() > 0) ? + m_article.comments_link : m_article.link); + String uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), + url.getPort(), url.getPath(), url.getQuery(), url.getRef()).toString(); Intent intent = new Intent(Intent.ACTION_VIEW, - Uri.parse(link.trim())); + Uri.parse(uri)); startActivity(intent); } catch (Exception e) { e.printStackTrace(); diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 215e1560..f9cc51d8 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -240,7 +240,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } else { AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo; Article article = getArticleAtPosition(info.position); - menu.setHeaderTitle(article.title); + menu.setHeaderTitle(Html.fromHtml(article.title)); menu.setGroupVisible(R.id.menu_group_single_article, true); } |