From 527bb1e5e4255828f7affbf2543f7e12b08d4a80 Mon Sep 17 00:00:00 2001 From: houxg Date: Wed, 28 Dec 2016 17:11:28 +0800 Subject: [PATCH] code refactor: open url --- .../java/org/houxg/leamonax/ui/edit/EditorFragment.java | 6 +++--- app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java | 4 +++- app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java index 2350064..27831db 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java @@ -36,6 +36,7 @@ import org.houxg.leamonax.editor.MarkdownEditor; import org.houxg.leamonax.editor.RichTextEditor; import org.houxg.leamonax.utils.CollectionUtils; import org.houxg.leamonax.utils.DialogUtils; +import org.houxg.leamonax.utils.OpenUtils; import org.houxg.leamonax.widget.ToggleImageButton; import java.util.List; @@ -392,7 +393,7 @@ public class EditorFragment extends Fragment implements Editor.EditorListener { } }); } else { - //TODO: go to link + OpenUtils.openUrl(getActivity(), url); } } @@ -456,8 +457,7 @@ public class EditorFragment extends Fragment implements Editor.EditorListener { @Override public void linkTo(String url) { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - startActivity(intent); + OpenUtils.openUrl(getActivity(), url); } private void refreshFormatStatus(Map formatStatus) { diff --git a/app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java b/app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java index 400a85a..a79eb20 100644 --- a/app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/OpenUtils.java @@ -5,6 +5,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; +import org.houxg.leamonax.R; + public class OpenUtils { public static void openUrl(Context context, String url) { @@ -13,7 +15,7 @@ public class OpenUtils { try { context.startActivity(i); } catch (Exception ex) { - ToastUtils.show(context, "Can't open this url"); + ToastUtils.show(context, R.string.cant_open_url); } } } diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 1643723..b291b49 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -97,4 +97,5 @@ 重试 继续 下次再说 + 无法打开该链接 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3ae1f2f..3f056ba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -96,5 +96,6 @@ Update time Upgrade now You are using latest version + Can\'t open this url