iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS-for-Honeycomb

Browse Source
This commit is contained in:
Andrew Dolgov 2013-05-12 18:44:38 +04:00
commit 7d1cca8bd5
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values-fr/strings.xml
View File

@ -59,7 +59,7 @@
<string name="no_headlines_to_display">Aucun titre à afficher</string> <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">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="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_unknown">Erreur: Erreur inconnue (voir journal)</string>
<string name="error_http_unauthorized">Erreur: 401 non-authorisé</string> <string name="error_http_unauthorized">Erreur: 401 non-authorisé</string>
<string name="error_http_forbidden">Erreur: 403 interdit</string> <string name="error_http_forbidden">Erreur: 403 interdit</string>

16
src/org/fox/ttrss/ArticleFragment.java
View File

@ -1,6 +1,7 @@
package org.fox.ttrss; package org.fox.ttrss;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL; import java.net.URL;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@ -115,8 +116,10 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
@Override @Override
public void onClick(View v) { public void onClick(View v) {
try { try {
Intent intent = new Intent(Intent.ACTION_VIEW, URL url = new URL(m_article.link.trim());
Uri.parse(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); startActivity(intent);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -139,11 +142,12 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
@Override @Override
public void onClick(View v) { public void onClick(View v) {
try { try {
String link = (m_article.comments_link != null && m_article.comments_link.length() > 0) ? URL url = new URL((m_article.comments_link != null && m_article.comments_link.length() > 0) ?
m_article.comments_link : m_article.link; 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, Intent intent = new Intent(Intent.ACTION_VIEW,
Uri.parse(link.trim())); Uri.parse(uri));
startActivity(intent); startActivity(intent);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

2
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -240,7 +240,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
} else { } else {
AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo;
Article article = getArticleAtPosition(info.position); Article article = getArticleAtPosition(info.position);
menu.setHeaderTitle(article.title); menu.setHeaderTitle(Html.fromHtml(article.title));
menu.setGroupVisible(R.id.menu_group_single_article, true); menu.setGroupVisible(R.id.menu_group_single_article, true);
} }