From aa0c4ec170058f85e359ab088c89ba4b759c6b68 Mon Sep 17 00:00:00 2001
From: Florens Douwes <Floens@gmail.com>
Date: Fri, 7 Mar 2014 20:09:42 +0100
Subject: [PATCH] Two things:

Improved string.xml
Fixed board and thread not restoring state.
---
 Chan/lint.xml                                 |  4 +-
 Chan/res/layout/reply_view.xml                |  2 +-
 Chan/res/values/strings.xml                   | 64 +++++++++----------
 Chan/res/xml/preference.xml                   |  8 +--
 .../floens/chan/activity/BoardActivity.java   | 13 +++-
 .../floens/chan/fragment/ReplyFragment.java   |  6 +-
 Chan/src/org/floens/chan/model/Loadable.java  | 20 ++++++
 Chan/src/org/floens/chan/utils/Logger.java    | 12 ++--
 8 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/Chan/lint.xml b/Chan/lint.xml
index c0625d91..468426f0 100644
--- a/Chan/lint.xml
+++ b/Chan/lint.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
-    <issue id="Registered">
-        <ignore path="src/org/floens/chan/activity/BaseActivity.java" />
+    <issue id="ButtonStyle">
+        <ignore path="res/layout/reply_view.xml" />
     </issue>
 </lint>
\ No newline at end of file
diff --git a/Chan/res/layout/reply_view.xml b/Chan/res/layout/reply_view.xml
index cc22e78f..7e25d37b 100644
--- a/Chan/res/layout/reply_view.xml
+++ b/Chan/res/layout/reply_view.xml
@@ -134,7 +134,7 @@
 	        android:layout_width="0dp"
 	        android:layout_height="wrap_content"
 	        android:layout_weight="1"
-	        android:text="@string/reply_cancel" />
+	        android:text="@string/cancel" />
 	    
 	    <Button
 	        android:id="@+id/reply_submit"
diff --git a/Chan/res/values/strings.xml b/Chan/res/values/strings.xml
index 246cf7d4..ff088721 100644
--- a/Chan/res/values/strings.xml
+++ b/Chan/res/values/strings.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="app_name">Chan</string>
+    
     <string name="cancel">Cancel</string>
     <string name="change">Change</string>
     <string name="add">Add</string>
+    <string name="close">Close</string>
+    <string name="back">Back</string>
     
-    <string name="app_name">Chan</string>
     <string name="action_settings">Settings</string>
     <string name="action_reload">Reload</string>
     <string name="action_pin">Pin</string>
@@ -15,13 +18,8 @@
     <string name="action_catalog">Open catalog</string>
     <string name="action_share">Share</string>
     
-    <string name="preference_general">General</string>
-    <string name="preference_about">About</string>
-    <string name="preference_licenses">Open Source Licenses</string>
-    <string name="preference_licences_summary">Legal information about licenses</string>
-    
-    <string name="one_reply">reply</string>
-    <string name="multiple_replies">replies</string>
+    <string name="open_unknown_title">Unsupported link</string>
+    <string name="open_unknown">Chan can\'t open this link. Opening it in your browser instead.</string>
     
     <string name="image_save">Save image</string>
     <string name="image_save_succeeded">Saved image to</string>
@@ -39,17 +37,28 @@
     
     <string name="board_edit">Edit my boards</string>
     <string name="board_add">Add board</string>
-    
     <string name="board_add_fail">Unknown board code</string>
     <string name="board_add_success">Added</string>
     <string name="board_add_duplicate">You already have that board</string>
     
     <string name="drawer_open">Open drawer</string>
     <string name="drawer_close">Close drawer</string>
-    
     <string name="drawer_pinned">Pinned threads</string>
     <string name="drawer_pinned_change_title">Enter title</string>
     
+    <string name="one_reply">reply</string>
+    <string name="multiple_replies">replies</string>
+    <string name="post_replies_back">Back</string>
+    <string name="post_replies_close">Close</string>
+    <string name="post_info">Info</string>
+    <string-array name="post_options">
+        <item>Reply</item>
+        <item>Quote</item>
+        <item>Info</item>
+        <item>Show clickables</item>
+        <item>Copy text</item>
+    </string-array>
+    
     <string name="reply">Reply to</string>
     <string name="reply_to_board">Make thread in</string>
     <string name="reply_name">Name</string>
@@ -59,10 +68,7 @@
     <string name="reply_file">Pick file</string>
     <string name="reply_file_delete">Remove file</string>
     <string name="reply_submit">Submit</string>
-    <string name="reply_back">Back</string>
-    <string name="reply_cancel">Cancel</string>
     <string name="reply_captcha">Enter captcha</string>
-    <string name="reply_close">Close</string>
     <string name="reply_error">Error sending reply</string>
     <string name="reply_error_captcha">Wrong captcha</string>
     <string name="reply_error_file">No file selected</string>
@@ -70,19 +76,6 @@
     <string name="reply_captcha_load_error">Failed to load captcha</string>
     <string name="reply_captcha_tap_to_reload">Tap to reload the captcha</string>
     
-    <string name="open_link_confirmation_preference">Ask before opening links</string>
-    <string name="open_link_confirmation">Open link?</string>
-    <string name="default_name_preference">Default name</string>
-    <string name="default_email_preference">Default email</string>
-    
-    <string name="open_unknown_title">Unsupported link</string>
-    <string name="open_unknown">Chan can\'t open this link. Opening it in your browser instead.</string>
-    
-    <string name="post_replies_back">Back</string>
-    <string name="post_replies_close">Close</string>
-    
-    <string name="developer">Developer options</string>
-    
     <string name="delete">Delete</string>
     <string name="delete_confirm">Delete your post?</string>
     <string name="delete_wait">Deleting post…</string>
@@ -93,13 +86,16 @@
     <string name="delete_fail">Error deleting post</string>
     <string name="delete_image_only">Only delete the image</string>
     
-    <string name="post_info">Info</string>
-    <string-array name="post_options">
-        <item>Reply</item>
-        <item>Quote</item>
-        <item>Info</item>
-        <item>Show clickables</item>
-        <item>Copy text</item>
-    </string-array>
+    <string name="preference_general">General</string>
+    <string name="preference_open_link_confirmation">Ask before opening links</string>
+    <string name="preference_default_name">Default name</string>
+    <string name="preference_default_email">Default email</string>
+    
+    <string name="preference_about">About</string>
+    <string name="preference_licenses">Open Source Licenses</string>
+    <string name="preference_licences_summary">Legal information about licenses</string>
+    <string name="preference_developer">Developer options</string>
+    
+    <string name="open_link_confirmation">Open link?</string>
     
 </resources>
diff --git a/Chan/res/xml/preference.xml b/Chan/res/xml/preference.xml
index 8c98a726..63b7699c 100644
--- a/Chan/res/xml/preference.xml
+++ b/Chan/res/xml/preference.xml
@@ -12,16 +12,16 @@
 	    </Preference>
 	    
 	    <CheckBoxPreference
-	        android:title="@string/open_link_confirmation_preference"
+	        android:title="@string/preference_open_link_confirmation"
 	        android:key="preference_open_link_confirmation"
 	        android:defaultValue="true" />
 	    
 	    <EditTextPreference 
-	        android:title="@string/default_name_preference"
+	        android:title="@string/preference_default_name"
 	        android:key="preference_default_name" />
 	    
 	    <EditTextPreference 
-            android:title="@string/default_email_preference"
+            android:title="@string/preference_default_email"
             android:key="preference_default_email" />
 	    
 	</PreferenceCategory>
@@ -40,7 +40,7 @@
             android:key="about_version" />
         
         <Preference
-            android:title="@string/developer"
+            android:title="@string/preference_developer"
             android:key="about_developer" >
             <intent
                  android:action="android.intent.action.VIEW"
diff --git a/Chan/src/org/floens/chan/activity/BoardActivity.java b/Chan/src/org/floens/chan/activity/BoardActivity.java
index 7e4be858..509602fb 100644
--- a/Chan/src/org/floens/chan/activity/BoardActivity.java
+++ b/Chan/src/org/floens/chan/activity/BoardActivity.java
@@ -64,11 +64,15 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio
         Uri startUri = startIntent.getData();
         
         if (savedInstanceState != null) {
-            boardLoadable.readFromBundle(this, savedInstanceState);
+            boardLoadable.readFromBundle(this, "board", savedInstanceState);
             boardLoadable.no = 0;
             boardLoadable.listViewIndex = 0;
             boardLoadable.listViewTop = 0;
+            
+            threadLoadable.readFromBundle(this, "thread", savedInstanceState);
+            
             setNavigationFromBoardValue(boardLoadable.board);
+            startLoadingThread(threadLoadable);
         } else if (startUri != null) {
             handleIntentURI(startUri);
         } else {
@@ -80,7 +84,8 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         
-        boardLoadable.writeToBundle(this, outState);
+        boardLoadable.writeToBundle(this, "board", outState);
+        threadLoadable.writeToBundle(this, "thread", outState);
     }
     
     @Override
@@ -269,6 +274,8 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio
     }
     
     private void startLoadingBoard(Loadable loadable) {
+        if (loadable.mode == Loadable.Mode.INVALID) return;
+        
         this.boardLoadable = loadable;
         
         boardFragment.startLoading(loadable);
@@ -278,6 +285,8 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio
     }
     
     private void startLoadingThread(Loadable loadable) {
+        if (loadable.mode == Loadable.Mode.INVALID) return;
+        
         Pin pin = PinnedManager.getInstance().findPinByLoadable(loadable);
         if (pin != null) {
             // Use the loadable from the pin.
diff --git a/Chan/src/org/floens/chan/fragment/ReplyFragment.java b/Chan/src/org/floens/chan/fragment/ReplyFragment.java
index 8b01f211..9f6520d6 100644
--- a/Chan/src/org/floens/chan/fragment/ReplyFragment.java
+++ b/Chan/src/org/floens/chan/fragment/ReplyFragment.java
@@ -286,11 +286,11 @@ public class ReplyFragment extends DialogFragment {
         }
         
         if (page == 0) {
-            cancelButton.setText(R.string.reply_cancel);
+            cancelButton.setText(R.string.cancel);
         } else if (page == 1) {
-            cancelButton.setText(R.string.reply_back);
+            cancelButton.setText(R.string.back);
         } else if (page == 2) {
-            cancelButton.setText(R.string.reply_close);
+            cancelButton.setText(R.string.close);
         }
     }
     
diff --git a/Chan/src/org/floens/chan/model/Loadable.java b/Chan/src/org/floens/chan/model/Loadable.java
index 48b2e270..f49882d9 100644
--- a/Chan/src/org/floens/chan/model/Loadable.java
+++ b/Chan/src/org/floens/chan/model/Loadable.java
@@ -126,6 +126,26 @@ public class Loadable {
         bundle.putInt(p + ".listViewTop", listViewTop);
     }
     
+    public void readFromBundle(Context context, String tag, Bundle bundle) {
+        String p = context.getPackageName();
+        mode = bundle.getInt(p + "." + tag + ".mode", Mode.INVALID);
+        board = bundle.getString(p + "." + tag + ".board", "");
+        no = bundle.getInt(p + "." + tag + ".no", -1);
+        title = bundle.getString(p + "." + tag + ".subject", "");
+        listViewIndex = bundle.getInt(p + "." + tag + ".listViewIndex");
+        listViewTop = bundle.getInt(p + "." + tag + ".listViewTop");
+    }
+    
+    public void writeToBundle(Context context, String tag, Bundle bundle) {
+        String p = context.getPackageName();
+        bundle.putInt(p + "." + tag + ".mode", mode);
+        bundle.putString(p + "." + tag + ".board", board);
+        bundle.putInt(p + "." + tag + ".no", no);
+        bundle.putString(p + "." + tag + ".subject", title);
+        bundle.putInt(p + "." + tag + ".listViewIndex", listViewIndex);
+        bundle.putInt(p + "." + tag + ".listViewTop", listViewTop);
+    }
+    
     public Loadable copy() {
         Loadable copy = new Loadable();
         copy.mode = mode;
diff --git a/Chan/src/org/floens/chan/utils/Logger.java b/Chan/src/org/floens/chan/utils/Logger.java
index e9e6552a..e52898e5 100644
--- a/Chan/src/org/floens/chan/utils/Logger.java
+++ b/Chan/src/org/floens/chan/utils/Logger.java
@@ -17,11 +17,15 @@ public class Logger {
     }
     
     public static void d(String tag, String message) {
-        Log.d(TAG + TAG_SPACER + tag, message);
+        if (ChanApplication.DEVELOPER_MODE) {
+            Log.d(TAG + TAG_SPACER + tag, message);
+        }
     }
     
     public static void d(String tag, String message, Throwable throwable) {
-        Log.d(TAG + TAG_SPACER + tag, message, throwable);
+        if (ChanApplication.DEVELOPER_MODE) {
+            Log.d(TAG + TAG_SPACER + tag, message, throwable);
+        }
     }
     
     public static void i(String tag, String message) {
@@ -69,7 +73,3 @@ public class Logger {
     }
 }
 
-
-
-
-