summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/java
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-12-01 14:50:28 +0300
committerAndrew Dolgov <[email protected]>2015-12-01 14:50:28 +0300
commit729209f1f5a2c86d4d2ccead1d222ec8392c470b (patch)
treeac2ad878d880b886d9777f62f819d0951704a6e8 /org.fox.ttrss/src/main/java
parent69e68447111e5497f12a62b3430e37818ebc8370 (diff)
cleanup horrible code in displayImageCaption
Diffstat (limited to 'org.fox.ttrss/src/main/java')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java22
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java33
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java35
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java9
4 files changed, 24 insertions, 75 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 8f7e556d..f8b191a6 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -223,12 +223,7 @@ public class ArticleFragment extends Fragment {
@Override
public void onClick(View view) {
try {
- 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();
-
- m_activity.openUri(Uri.parse(uri));
-
+ m_activity.openUri(Uri.parse(m_article.link));
} catch (Exception e) {
e.printStackTrace();
m_activity.toast(R.string.error_other_error);
@@ -262,11 +257,7 @@ public class ArticleFragment extends Fragment {
@Override
public void onClick(View v) {
try {
- 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();
-
- m_activity.openUri(Uri.parse(uri));
+ m_activity.openUri(Uri.parse(m_article.link));
} catch (Exception e) {
e.printStackTrace();
m_activity.toast(R.string.error_other_error);
@@ -274,7 +265,6 @@ public class ArticleFragment extends Fragment {
}
});
- registerForContextMenu(title);
}
ImageView share = (ImageView)view.findViewById(R.id.share);
@@ -301,12 +291,10 @@ public class ArticleFragment extends Fragment {
@Override
public void onClick(View v) {
try {
- 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();
+ String url = (m_article.comments_link != null && m_article.comments_link.length() > 0) ?
+ m_article.comments_link : m_article.link;
- m_activity.openUri(Uri.parse(uri));
+ m_activity.openUri(Uri.parse(url));
} catch (Exception e) {
e.printStackTrace();
m_activity.toast(R.string.error_other_error);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index 914e63d4..4451b4ee 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -355,24 +355,21 @@ public class CommonActivity extends ActionBarActivity implements SharedPreferenc
Elements es = doc.getElementsByAttributeValue("src", url);
if (es.size() > 0) {
if (es.get(0).hasAttr("title")) {
- Dialog dia = new Dialog(this);
- if (es.get(0).hasAttr("alt")) {
- dia.setTitle(es.get(0).attr("alt"));
- } else {
- dia.setTitle(es.get(0).attr("title"));
- }
- TextView titleText = new TextView(this);
-
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
- titleText.setPaddingRelative(24, 24, 24, 24);
- } else {
- titleText.setPadding(24, 24, 24, 24);
- }
-
- titleText.setTextSize(16);
- titleText.setText(es.get(0).attr("title"));
- dia.setContentView(titleText);
- dia.show();
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(this)
+ .setCancelable(true)
+ .setMessage(es.get(0).attr("title"))
+ .setPositiveButton(R.string.dialog_close, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ dialog.cancel();
+ }
+ }
+ );
+
+ AlertDialog dialog = builder.create();
+ dialog.show();
+
} else {
toast(R.string.no_caption_to_display);
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index 4575dd22..20298956 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -117,39 +117,8 @@ public class OfflineActivity extends CommonActivity {
content = article.getString(article.getColumnIndex("content"));
article.close();
}
-
- // Android doesn't give us an easy way to access title tags;
- // we'll use Jsoup on the body text to grab the title text
- // from the first image tag with this url. This will show
- // the wrong text if an image is used multiple times.
- Document doc = Jsoup.parse(content);
- Elements es = doc.getElementsByAttributeValue("src", getLastContentImageHitTestUrl());
- if (es.size() > 0){
- if (es.get(0).hasAttr("title")){
- Dialog dia = new Dialog(this);
- if (es.get(0).hasAttr("alt")){
- dia.setTitle(es.get(0).attr("alt"));
- } else {
- dia.setTitle(es.get(0).attr("title"));
- }
- TextView titleText = new TextView(this);
-
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
- titleText.setPaddingRelative(24, 24, 24, 24);
- } else {
- titleText.setPadding(24, 24, 24, 24);
- }
-
- titleText.setTextSize(16);
- titleText.setText(es.get(0).attr("title"));
- dia.setContentView(titleText);
- dia.show();
- } else {
- toast(R.string.no_caption_to_display);
- }
- } else {
- toast(R.string.no_caption_to_display);
- }
+
+ displayImageCaption(getLastContentImageHitTestUrl(), content);
}
return true;
default:
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index d71d38b6..31d3c195 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -203,19 +203,14 @@ public class OfflineArticleFragment extends Fragment {
@Override
public void onClick(View v) {
try {
- URL url = new URL(link.trim());
- String uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(),
- url.getPort(), url.getPath(), url.getQuery(), url.getRef()).toString();
-
- m_activity.openUri(Uri.parse(uri));
+ m_activity.openUri(Uri.parse(link));
} catch (Exception e) {
e.printStackTrace();
m_activity.toast(R.string.error_other_error);
}
}
});
-
- registerForContextMenu(title);
+
}
ImageView share = (ImageView)view.findViewById(R.id.share);