Merge branch 'master' of github.com:aminecmi/ReaderforSelfoss

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

* New translations strings.xml (Korean)

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt

@@ -1,11 +1,9 @@
 package apps.amine.bou.readerforselfoss.fragments
 
 import android.content.Context
-import android.content.Intent
 import android.content.SharedPreferences
 import android.content.res.ColorStateList
 import android.graphics.drawable.ColorDrawable
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.preference.PreferenceManager
@@ -14,7 +12,6 @@ import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
 import android.support.v4.content.ContextCompat
 import android.support.v4.widget.NestedScrollView
-import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -58,7 +55,6 @@ class ArticleFragment : Fragment() {
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
-    private var showMalformedUrl: Boolean = false
     private lateinit var editor: SharedPreferences.Editor
     private lateinit var fab: FloatingActionButton
     private lateinit var appColors: AppColors
@@ -97,7 +93,6 @@ class ArticleFragment : Fragment() {
         val prefs = PreferenceManager.getDefaultSharedPreferences(activity)
         editor = prefs.edit()
         fontSize = prefs.getString("reader_font_size", "14").toInt()
-        showMalformedUrl = prefs.getBoolean("show_error_malformed_url", true)
 
         val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         val debugReadingItems = prefs.getBoolean("read_debug", false)
@@ -233,7 +228,13 @@ class ArticleFragment : Fragment() {
                         if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
                             try {
                                 rootView.titleView.text = response.body()!!.title
+                                try {
+                                    // Note: Mercury may return relative urls... If it does the url val will not be changed.
+                                    URL(response.body()!!.url)
                                     url = response.body()!!.url
+                                } catch (e: MalformedURLException) {
+                                    ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
+                                }
                             } catch (e: Exception) {
                                 if (context != null) {
                                     ACRA.getErrorReporter().maybeHandleSilentException(e, context!!)
@@ -362,41 +363,7 @@ class ArticleFragment : Fragment() {
             val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-            if (showMalformedUrl && context != null) {
+            ACRA.getErrorReporter().maybeHandleSilentException(e, activity!!)
-                val alertDialog = AlertDialog.Builder(context!!).create()
-                alertDialog.setTitle("Error")
-                alertDialog.setMessage("You are encountering a bug that I can't solve. Can you please contact me to solve the issue, please ?")
-                alertDialog.setButton(
-                    AlertDialog.BUTTON_POSITIVE,
-                    "Send mail"
-                ) { dialog, _ ->
-
-                    // This won't be translated because it should only be temporary.
-                    val to = Config.feedbackEmail
-                    val subject= "[ReaderForSelfoss MalformedURLException]"
-                    val body= "Please specify the source, item and spout you are using for the url below : \n ${e.message}"
-                    val mailTo = "mailto:" + to + "?&subject=" + Uri.encode(subject) + "&body=" + Uri.encode(body)
-
-                    val emailIntent = Intent(Intent.ACTION_VIEW)
-                    emailIntent.data = Uri.parse(mailTo)
-                    startActivity(emailIntent)
-
-                    dialog.dismiss()
-                }
-                alertDialog.setButton(
-                    AlertDialog.BUTTON_NEUTRAL,
-                    "Not now"
-                ) { dialog, _ -> dialog.dismiss() }
-                alertDialog.setButton(
-                    AlertDialog.BUTTON_NEGATIVE,
-                    "Don't show anymore."
-                ) { dialog, _ ->
-                    editor.putBoolean("show_error_malformed_url", false)
-                    editor.apply()
-                    dialog.dismiss()
-                }
-                alertDialog.show()
-            }
         }
 
         rootView.webcontent.loadDataWithBaseURL(

app/src/main/res/values-ko-rKR/strings.xml

@@ -2,61 +2,61 @@
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">"Reader for Selfoss"</string>
-  <string name="title_activity_login">"Log in"</string>
+  <string name="title_activity_login">"로그인"</string>
-  <string name="prompt_password">"Password"</string>
+  <string name="prompt_password">"비밀번호"</string>
-  <string name="prompt_http_password">"HTTP Password"</string>
+  <string name="prompt_http_password">"HTTP 암호"</string>
   <string name="action_sign_in">"Go"</string>
-  <string name="error_invalid_password">"Password not long enough"</string>
+  <string name="error_invalid_password">"패스워드가 짧습니다."</string>
-  <string name="error_field_required">"Field required"</string>
+  <string name="error_field_required">"필수 항목"</string>
   <string name="prompt_url">"Url"</string>
-  <string name="withLoginSwitch">"Login required ?"</string>
+  <string name="withLoginSwitch">"로그인이 필요합니까?"</string>
-  <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
+  <string name="withHttpLoginSwitch">"HTTP 로그인이 필요 합니까?"</string>
-  <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
+  <string name="login_url_problem">"죄송합니다. Url의 끝에 \"/\"를 추가할 필요가 있습니다."</string>
-  <string name="prompt_login">"Username"</string>
+  <string name="prompt_login">"사용자 이름"</string>
-  <string name="prompt_http_login">"HTTP Username"</string>
+  <string name="prompt_http_login">"HTTP 사용자 이름"</string>
-  <string name="label_share">"Share"</string>
+  <string name="label_share">"공유"</string>
-  <string name="readAll">"Read all"</string>
+  <string name="readAll">"모두 읽기"</string>
-  <string name="action_disconnect">"Disconnect"</string>
+  <string name="action_disconnect">"연결 해제"</string>
-  <string name="title_activity_settings">"Settings"</string>
+  <string name="title_activity_settings">"설정"</string>
-  <string name="pref_header_general">"General"</string>
+  <string name="pref_header_general">"일반"</string>
-  <string name="pref_switch_actions_tap_title">"Tap action on the articles"</string>
+  <string name="pref_switch_actions_tap_title">"기사에 탭 액션"</string>
-  <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
+  <string name="add_source_hint_tags">"태그1, 태그2, 태그3"</string>
-  <string name="add_source_hint_url">"Link"</string>
+  <string name="add_source_hint_url">"링크"</string>
-  <string name="add_source_hint_name">"Name"</string>
+  <string name="add_source_hint_name">"이름"</string>
-  <string name="add_source">"Add a source"</string>
+  <string name="add_source">"소스 추가"</string>
-  <string name="add_source_save">"Save"</string>
+  <string name="add_source_save">"저장"</string>
-  <string name="wrong_infos">"Check your details again."</string>
+  <string name="wrong_infos">"세부 정보를 다시 확인하세요."</string>
-  <string name="all_posts_not_read">"All posts weren't read"</string>
+  <string name="all_posts_not_read">"모든 게시물을 읽지 않았습니다."</string>
-  <string name="all_posts_read">"All posts were read"</string>
+  <string name="all_posts_read">"모든 게시물을 읽었습니다."</string>
-  <string name="cant_get_favs">"Can't get favorites"</string>
+  <string name="cant_get_favs">"즐겨찾기를 가져올 수 없습니다."</string>
-  <string name="cant_get_new_elements">"Can't get new articles"</string>
+  <string name="cant_get_new_elements">"새로운 기사를 가져올 수 없습니다."</string>
-  <string name="cant_get_read">"Can't get read articles"</string>
+  <string name="cant_get_read">"읽은 기사를 가져올 수 없습니다."</string>
-  <string name="nothing_here">"Nothing here"</string>
+  <string name="nothing_here">"비어있음"</string>
-  <string name="tab_new">"New"</string>
+  <string name="tab_new">"새로운"</string>
-  <string name="tab_read">"All"</string>
+  <string name="tab_read">"전체"</string>
-  <string name="tab_favs">"Favorites"</string>
+  <string name="tab_favs">"즐겨찾기"</string>
-  <string name="action_about">"About"</string>
+  <string name="action_about">"정보"</string>
-  <string name="marked_as_read">"Item read"</string>
+  <string name="marked_as_read">"항목 읽기"</string>
-  <string name="undo_string">"Undo"</string>
+  <string name="undo_string">"실행 취소"</string>
-  <string name="addStringNoUrl">"Log in to add sources."</string>
+  <string name="addStringNoUrl">"로그인 소스를 추가 해야 합니다."</string>
-  <string name="cant_get_sources">"Can't get sources list."</string>
+  <string name="cant_get_sources">"소스 리스트를 얻을 수 없습니다."</string>
-  <string name="cant_create_source">"Can't create source."</string>
+  <string name="cant_create_source">"소스를 만들 수 없습니다."</string>
-  <string name="cant_get_spouts">"Can't get spouts list."</string>
+  <string name="cant_get_spouts">"Spouts 목록을 가져올 수 없습니다."</string>
-  <string name="form_not_complete">"The form is not complete"</string>
+  <string name="form_not_complete">"양식이 완료되지 않았습니다."</string>
-  <string name="pref_header_links">"Links"</string>
+  <string name="pref_header_links">"링크"</string>
-  <string name="issue_tracker_link">"Issue Tracker"</string>
+  <string name="issue_tracker_link">"이슈 트래커"</string>
-  <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
+  <string name="issue_tracker_summary">"버그를 보고 하거나 새기능에 대해 요청하세요."</string>
-  <string name="warning_wrong_url">"WARNING"</string>
+  <string name="warning_wrong_url">"경고"</string>
-  <string name="pref_switch_card_view_title">"Card View"</string>
+  <string name="pref_switch_card_view_title">"카드 형식 보기"</string>
-  <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
+  <string name="cant_mark_favortie">"좋아하는 문서를 마크할 수 없습니다."</string>
-  <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
+  <string name="cant_unmark_favortie">"좋아하는 항목에서 제거할 수 없습니다."</string>
-  <string name="share">"Share"</string>
+  <string name="share">"공유"</string>
-  <string name="rating_prompt_title">"Enjoying the app ?"</string>
+  <string name="rating_prompt_title">"이 앱에 만족하십니까?"</string>
-  <string name="rating_prompt_yes">"Yes !"</string>
+  <string name="rating_prompt_yes">"예!"</string>
-  <string name="rating_prompt_no">"Not really …"</string>
+  <string name="rating_prompt_no">"설마..."</string>
-  <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+  <string name="rating_prompt_feedback_title">"이유를 우리에게 말해줄 수 있습니까?"</string>
   <string name="rating_prompt_feedback_yes">"OK!"</string>
-  <string name="rating_prompt_feedback_no">"Not now."</string>
+  <string name="rating_prompt_feedback_no">"나중에"</string>
   <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
   <string name="rating_prompt_rating_yes">"Sure !"</string>
   <string name="rating_prompt_rating_no">"Not right now."</string>