pupup

6 files changed, 23 insertions, 28 deletions

diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
index 0a039da0..49de85f0 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.kt
@@ -130,22 +130,26 @@ class MainActivity : AppCompatActivity() {
                 val statusMatcher = TWITTER_STATUS_PATTERN.matcher(uri.path)
                 if (statusMatcher.find()) {
                     return launchUi {
+                        val id = statusMatcher.group(1)
                         try {
-                            val tweet = world.getTweetAsync(statusMatcher.group(1).toLong()).await()
-                            DialogHelper.showDialog(world.getMainActivityOrCancel(), StatusDetailDialogFragment.newInstance(tweet))
-                        } catch (e: TwitterTaskException) {
-                            world.notifyError(R.string.error_intent_status_cannot_load)
+                            val tweet = world.getTweetAsync(id.toLong()).await()
+                            DialogHelper.showDialog(world.getMainActivityOrCancel(),
+                                    StatusDetailDialogFragment.newInstance(tweet))
+                        } catch (e: Exception) {
+                            world.notifyError("Could not retrieve tweet id=$id")
                         }
                     }
                 }
                 val userMatcher = TWITTER_USER_PATTERN.matcher(uri.path)
                 if (userMatcher.find()) {
                     return launchUi {
+                        val username = userMatcher.group(1)
                         try {
-                            val user = world.getUserAsync(userMatcher.group(1)).await()
-                            DialogHelper.showDialog(world.getMainActivityOrCancel(), UserDetailDialogFragment.newInstance(user))
-                        } catch (e: TwitterTaskException) {
-                            world.notifyError(R.string.notice_error_show_user)
+                            val user = world.getUserAsync(username).await()
+                            DialogHelper.showDialog(world.getMainActivityOrCancel(),
+                                    UserDetailDialogFragment.newInstance(user))
+                        } catch (e: Exception) {
+                            world.notifyError("Could not retrieve user screen_name=$username")
                         }
                     }
                 }
@@ -181,7 +185,7 @@ class MainActivity : AppCompatActivity() {
         if (view_pager.currentItem != homeIndex)
             view_pager.setCurrentItem(homeIndex, true)
         else
-            confirm(R.string.dialog_confirm_exit) { finish() }
+            confirm("Are you sure you want to exit?") { finish() }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
index aef591b1..14d81dbf 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageProfilesActivity.kt
@@ -7,7 +7,7 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.support.design.widget.Snackbar
-import android.support.v13.app.ActivityCompat
+import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat
 import android.support.v4.content.pm.ShortcutInfoCompat
 import android.support.v4.content.pm.ShortcutManagerCompat
@@ -138,7 +138,7 @@ class ManageProfilesActivity : AppCompatActivity() {
             view.profile_name.text = "@${world.user.screenName}"
             view.profile_action_menu.clear()
             view.profile_action_menu.add("Remove") {
-                confirm(R.string.dialog_confirm_remove_profile, world.user.screenName) {
+                confirm("Are you sure you want to remove @${world.user.screenName}?") {
                     val index = profiles.indexOf(world)
                     profiles.removeAt(index)
                     notifyItemRemoved(index)
diff --git a/app/src/main/java/net/lacolaco/smileessence/twitter/PoePoeStreaming.kt b/app/src/main/java/net/lacolaco/smileessence/twitter/PoePoeStreaming.kt
index e5c1d600..d4f9b528 100644
--- a/app/src/main/java/net/lacolaco/smileessence/twitter/PoePoeStreaming.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/twitter/PoePoeStreaming.kt
@@ -1,7 +1,6 @@
 package net.lacolaco.smileessence.twitter
 
 import net.lacolaco.smileessence.Logger
-import net.lacolaco.smileessence.R
 import net.lacolaco.smileessence.World
 import net.lacolaco.smileessence.entity.Event
 import net.lacolaco.smileessence.entity.Tweet
@@ -51,7 +50,7 @@ class PoePoeStreaming(private val world: World) {
                     } catch (te: TwitterException) {
                         if (te.statusCode in 400..499) {
                             // Non-recoverable
-                            world.notifyError("Could not connect to twitter-event-unstream. " +
+                            world.notifyError("Could not connect to twitter-event-stream. " +
                                     "Unauthorized?")
                             return@thread
                         }
@@ -59,7 +58,7 @@ class PoePoeStreaming(private val world: World) {
                     }
                     retryCount = 0
                     connected = true
-                    world.notify(R.string.notice_stream_connect)
+                    world.notify("Connected to twitter-event-stream")
 
                     esr = EventStreamReader(response!!.asStream())
                     esr.subscribe { event, data ->
@@ -109,7 +108,7 @@ class PoePoeStreaming(private val world: World) {
                                     // TODO
                                 }
                                 "twitter_event_stream_home_timeline" -> onTweets(JSONArray(data))
-                                "twitter_event_stream_message" -> Logger.warn("usp_message: $data")
+                                "twitter_event_stream_message" -> world.notify("tes_message: $data")
                                 else -> world.notifyError("unknown message type: $event=$data")
                             }
                         } catch (e: Exception) {
@@ -125,7 +124,8 @@ class PoePoeStreaming(private val world: World) {
                     retryCount += 1
 
                     val sleep = 1000L * retryCount
-                    world.notifyError("Streaming disconnected; reconnecting after $sleep ms")
+                    world.notifyError("Disconnected from twitter-event-stream; " +
+                            "reconnecting in $sleep ms")
                     try {
                         Thread.sleep(sleep)
                     } catch (e: InterruptedException) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
index 33353d17..e9014a4c 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/dialog/UserDetailDialogFragment.kt
@@ -86,7 +86,7 @@ class UserDetailDialogFragment : StackableDialogFragment() {
                         adapter.addAll(tweets)
                     }
                 } catch (e: TwitterTaskException) {
-                    world.notifyError(R.string.notice_error_get_user_timeline)
+                    world.notifyError("Could not retrieve user timeline")
                 }
                 refreshLayout.isRefreshing = false
             }
@@ -98,7 +98,7 @@ class UserDetailDialogFragment : StackableDialogFragment() {
                 val tweets = world.getUserTimelineAsync(user.id).await()
                 adapter.addAll(tweets)
             } catch (e: TwitterTaskException) {
-                world.notifyError(R.string.notice_error_get_user_timeline)
+                world.notifyError("Could not retrieve user timeline")
             }
         }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt b/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt
index 6d471816..b97824f2 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt
+++ b/app/src/main/java/net/lacolaco/smileessence/view/page/ListPageFragment.kt
@@ -81,7 +81,7 @@ class ListPageFragment : RefreshableTimelinePageFragment<Tweet, PageInfo.ListPag
             world.addTweetAll(tweets)
             adapter.sortedList.addAll(tweets)
         } catch (e: TwitterTaskException) {
-            world.notifyError(R.string.notice_error_get_list)
+            world.notifyError("Could not retrieve list timeline")
         }
         onFinish()
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 638d8530..75890a80 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,6 @@
     <string name="message_oauth_text">Please get PIN code at a URL below, and input it.</string>
     <string name="message_oauth_hint">PIN code</string>
     <string name="message_oauth_authenticate">Authenticate</string>
-    <string name="error_intent_status_cannot_load">Failed to get tweet</string>
     <string name="alert_dialog_ok">OK</string>
     <string name="alert_dialog_cancel">Cancel</string>
     <string name="post_button_tweet">Tweet</string>
@@ -16,9 +15,7 @@
     <string name="user_detail_followed">Followed</string>
     <string name="user_detail_not_followed">Not Followed</string>
     <string name="user_detail_loading">Loading</string>
-    <string name="dialog_confirm_exit">Are you sure you want to exit?</string>
     <string name="dialog_confirm_commands">Execute, OK?</string>
-    <string name="dialog_confirm_remove_profile">Are you sure you want to remove the profile for @%s?</string>
     <string name="dialog_confirm_delete_query">Delete this query, OK?</string>
     <string name="notice_favorite_succeeded">Succeeded to favorite</string>
     <string name="notice_favorite_failed">Failed to favorite</string>
@@ -38,8 +35,6 @@
     <string name="notice_unblock_failed">Failed to unblock</string>
     <string name="notice_r4s_succeeded">Succeeded to report</string>
     <string name="notice_r4s_failed">Failed to report</string>
-    <string name="notice_stream_connect">Connect to stream</string>
-    <string name="notice_stream_disconnect">Disconnect from stream</string>
     <string name="notice_unfavorite_succeeded">Succeeded to unfavorite</string>
     <string name="notice_unfavorite_failed">Failed to unfavorite</string>
     <string name="notice_add_to_reply">Added to reply</string>
@@ -48,8 +43,6 @@
     <string name="notice_query_saved">Query is saved</string>
     <string name="notice_error_show_user">Can\'t show this user</string>
     <string name="notice_error_get_home">Failed to get home timeline</string>
-    <string name="notice_error_authenticate">Failed to authenticate. Please try later again.</string>
-    <string name="notice_error_authenticate_request">Failed to prepare for authentication. Please check internet access.</string>
     <string name="notice_error_search">Failed to search</string>
     <string name="command_user_add_to_reply">Add to reply</string>
     <string name="command_user_block">Block</string>
@@ -59,7 +52,5 @@
     <string name="command_status_copy_url_to_clipboard">Copy permalink to clipboard</string>
     <string name="command_status_open_in_browser">Open in browser</string>
     <string name="command_status_add_to_reply">Add to reply</string>
-    <string name="notice_error_get_user_timeline">Failed to get user timeline</string>
-    <string name="notice_error_get_list">Failed to get list timeline</string>
     <string name="title_activity_page_manage">PageManageActivity</string>
 </resources>