\n (.+?)\n
", "");
+ bbMap.put("\n\\s+?\n (.+?)\n
", "");
+ bbMap.put("\n\\s+?\n (.+?)\n
", "");
+ bbMap.put("", "\n"); + //bold + bbMap.put("\n\\s+?(.+?)", "\\[b\\]$1\\[/b\\]"); + //italics + bbMap.put("\n\\s+?(.+?)", "\\[i\\]$1\\[/i\\]"); + //underline + bbMap.put("\n\\s+?(.+?)", "\\[u\\]$1\\[/u\\]"); + //deleted + bbMap.put("\n\\s+?
\n (.+?)\n
", "\\[center\\]$1\\[/center\\]");
+ bbMap.put("\n\\s+?\n (.+?)\n
", "\\[$1\\]$2\\[/$1\\]");
+ //preformated
+ bbMap.put("\n\\s+?(.+?)", "\\[pre\\]$1\\[/pre\\]"); + //horizontal rule + bbMap.put("\n\\s+?
", "\\[hr\\]"); + //resize + bbMap.put("\n\\s+?(.+?)", "\\[size=$1\\]$3\\[/size\\]"); + //font + bbMap.put("\n\\s+?(.+?)", "\\[font=$1\\]$2\\[/font\\]"); + //lists + bbMap.put("\\s+
- ([\\S\\s]+?)\n\\s+
\n (.+?)\n
", "\\[code\\]$1\\[/code\\]");
+ //teletype
+ bbMap.put("\n\\s+?(.+?)", "\\[tt\\]$1\\[/tt\\]");
+ //superscript/subscript
+ bbMap.put("\n\\s+?(.+?)", "\\[sub\\]$1\\[/sub\\]");
+ bbMap.put("\n\\s+?(.+?)", "\\[sup\\]$1\\[/sup\\]");
+ //tables
+ bbMap.put("\\s+?\n",
+ "[youtube]https://www.youtube.com/watch?v=$1[/youtube]");
+ //ftp
+ bbMap.put("([\\S\\s]+?)", "\\[fpt=ftp:$1\\]$2\\[/ftp\\]");
+ //mailto
+ bbMap.put("\n\\s+?([\\S\\s]+?)", "\\[email\\]$2\\[/email\\]");
+ //links
+ bbMap.put("\n\\s+?([\\S\\s]+?)", "\\[url=$1\\]$2\\[/url\\]");
+ //smileys
+ for (Map.Entry entry : smileysMap1.entrySet()) {
+ bbMap.put("\n ![\""](\"(.+?)//www.thmmy.gr/smf/Smileys/default_dither/(.+?))
", entry.getValue().toString());
+ }
+ for (Map.Entry entry : smileysMap2.entrySet()) { //Those that have empty alt tag
+ bbMap.put("\n ![](\"(.+?)//www.thmmy.gr/smf/Smileys/default_dither/")
", entry.getValue().toString());
+ }
+
+ bbMap.put("\n ![\"Undecided\"](\"(.+?)//www.thmmy.gr/smf/Smileys/default_dither/undecided.gif\")
"
+ , Matcher.quoteReplacement(":-\\"));
+
+ //html stuff on the end
+ bbMap.put("\n
", "");
+
+ for (Map.Entry entry : bbMap.entrySet()) {
+ html = html.replaceAll(entry.getKey().toString(), entry.getValue().toString());
+ }
+
+ //img need to be done last or it messes up everything else
+ html = html.replaceAll("\\s+"
+ , Matcher.quoteReplacement(":-\\"));
+
+ //html stuff on the end
+ bbMap.put("\n"); - for (int i = 0; i < errors.length; ++i) { //TODO test - Log.d("TAG", String.valueOf(i)); - Log.d("TAG", errors[i]); - } - for (String error : errors) { - if (error.contains("Your session timed out while posting") || - error.contains("Υπερβήκατε τον μέγιστο χρόνο σύνδεσης κατά την αποστολή")) - return REPLY_STATUS.SESSION_ENDED; - if (error.contains("No subject was filled in") - || error.contains("Δεν δόθηκε τίτλος")) - return REPLY_STATUS.NO_SUBJECT; - if (error.contains("The message body was left empty") - || error.contains("Δεν δόθηκε κείμενο για το μήνυμα")) - return REPLY_STATUS.EMPTY_BODY; - } - return REPLY_STATUS.NEW_REPLY_WHILE_POSTING; - } - return REPLY_STATUS.SUCCESSFUL; - } -} diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java index 942dd50c..9e35e942 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java @@ -1,5 +1,6 @@ package gr.thmmy.mthmmy.activities.topic; +import android.content.Context; import android.content.Intent; import android.graphics.Rect; import android.net.Uri; @@ -17,12 +18,14 @@ import android.text.method.LinkMovementMethod; import android.text.method.ScrollingMovementMethod; import android.text.style.ClickableSpan; import android.text.style.URLSpan; +import android.util.Log; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; +import android.view.inputmethod.InputMethodManager; import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.ProgressBar; @@ -60,7 +63,7 @@ import static gr.thmmy.mthmmy.activities.board.BoardActivity.BUNDLE_BOARD_URL; import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_THUMBNAIL_URL; import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_URL; import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_USERNAME; -import static gr.thmmy.mthmmy.activities.topic.ReplyParser.replyStatus; +import static gr.thmmy.mthmmy.activities.topic.Posting.replyStatus; /** * Activity for topics. When creating an Intent of this activity you need to bundle a String @@ -117,6 +120,7 @@ public class TopicActivity extends BaseActivity { private String parsedTitle; private RecyclerView recyclerView; private String loadedPageUrl = ""; + private boolean reloadingPage = false; @Override @@ -480,7 +484,7 @@ public class TopicActivity extends BaseActivity { } } //Checks if the page to be loaded is the one already shown - if (!Objects.equals(loadedPageUrl, "") && loadedPageUrl.contains(base_url)) { + if (!reloadingPage && !Objects.equals(loadedPageUrl, "") && loadedPageUrl.contains(base_url)) { if (newPageUrl.contains("topicseen#new") || newPageUrl.contains("#new")) if (thisPage == numberOfPages) return SAME_PAGE; @@ -497,6 +501,7 @@ public class TopicActivity extends BaseActivity { } else if (Integer.parseInt(newPageUrl.substring(base_url.length() + 1)) / 15 + 1 == thisPage) //TODO fix bug return SAME_PAGE; } else if (!Objects.equals(loadedPageUrl, "")) topicTitle = null; + if (reloadingPage) reloadingPage = !reloadingPage; loadedPageUrl = newPageUrl; replyPageUrl = null; @@ -735,13 +740,34 @@ public class TopicActivity extends BaseActivity { @Override protected void onPostExecute(Boolean result) { + View view = getCurrentFocus(); + if (view != null) { + InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); + imm.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + + postsList.remove(postsList.size() - 1); + topicAdapter.notifyItemRemoved(postsList.size()); + progressBar.setVisibility(ProgressBar.GONE); replyFAB.setVisibility(View.VISIBLE); bottomNavBar.setVisibility(View.VISIBLE); + if (!result) Toast.makeText(TopicActivity.this, "Post failed!", Toast.LENGTH_SHORT).show(); paginationEnabled(true); replyFAB.setEnabled(true); + + if (result) { + topicTask = new TopicTask(); + if ((postsList.get(postsList.size() - 1).getPostNumber() + 1) % 15 == 0) + topicTask.execute(base_url + "." + 2147483647); + else { + reloadingPage = true; + topicTask.execute(loadedPageUrl); + } + Log.d("TAG", "sent"); + } } } } \ No newline at end of file diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java index 6f1d438c..db548985 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java @@ -42,12 +42,9 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.Objects; -import java.util.regex.Matcher; import gr.thmmy.mthmmy.R; import gr.thmmy.mthmmy.activities.board.BoardActivity; @@ -66,6 +63,7 @@ import static gr.thmmy.mthmmy.activities.board.BoardActivity.BUNDLE_BOARD_URL; import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_THUMBNAIL_URL; import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_URL; import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_USERNAME; +import static gr.thmmy.mthmmy.activities.topic.Posting.htmlToBBcode; import static gr.thmmy.mthmmy.base.BaseActivity.getSessionManager; /** @@ -144,6 +142,7 @@ class TopicAdapter extends RecyclerView.Adapter
\n (.+?)\n
", "");
- bbMap.put("\n\\s+?\n (.+?)\n
", "");
- bbMap.put("\n\\s+?\n (.+?)\n
", "");
- bbMap.put("", "\n"); - //bold - bbMap.put("\n\\s+?(.+?)", "\\[b\\]$1\\[/b\\]"); - //italics - bbMap.put("\n\\s+?(.+?)", "\\[i\\]$1\\[/i\\]"); - //underline - bbMap.put("\n\\s+?(.+?)", "\\[u\\]$1\\[/u\\]"); - //deleted - bbMap.put("\n\\s+?
\n (.+?)\n
", "\\[center\\]$1\\[/center\\]");
- bbMap.put("\n\\s+?\n (.+?)\n
", "\\[$1\\]$2\\[/$1\\]");
- //preformated
- bbMap.put("\n\\s+?(.+?)", "\\[pre\\]$1\\[/pre\\]"); - //horizontal rule - bbMap.put("\n\\s+?
", "\\[hr\\]"); - //resize - bbMap.put("\n\\s+?(.+?)", "\\[size=$1\\]$3\\[/size\\]"); - //font - bbMap.put("\n\\s+?(.+?)", "\\[font=$1\\]$2\\[/font\\]"); - //lists - bbMap.put("\\s+
- ([\\S\\s]+?)\n\\s+
\n (.+?)\n
", "\\[code\\]$1\\[/code\\]");
- //teletype
- bbMap.put("\n\\s+?(.+?)", "\\[tt\\]$1\\[/tt\\]");
- //superscript/subscript
- bbMap.put("\n\\s+?(.+?)", "\\[sub\\]$1\\[/sub\\]");
- bbMap.put("\n\\s+?(.+?)", "\\[sup\\]$1\\[/sup\\]");
- //tables
- bbMap.put("\\s+?\n",
- "[youtube]https://www.youtube.com/watch?v=$1[/youtube]");
- //ftp
- bbMap.put("([\\S\\s]+?)", "\\[fpt=ftp:$1\\]$2\\[/ftp\\]");
- //mailto
- bbMap.put("\n\\s+?([\\S\\s]+?)", "\\[email\\]$2\\[/email\\]");
- //links
- bbMap.put("\n\\s+?([\\S\\s]+?)", "\\[url=$1\\]$2\\[/url\\]");
- //smileys
- for (Map.Entry entry : smileysMap1.entrySet()) {
- bbMap.put("\n ", entry.getValue().toString());
- }
- for (Map.Entry entry : smileysMap2.entrySet()) { //Those that have empty alt tag
- bbMap.put("\n ", entry.getValue().toString());
- }
-
- bbMap.put("\n "
- , Matcher.quoteReplacement(":-\\"));
-
- //html stuff on the end
- bbMap.put("\n
", "");
-
- for (Map.Entry entry : bbMap.entrySet()) {
- html = html.replaceAll(entry.getKey().toString(), entry.getValue().toString());
- }
-
- //img need to be done last or it messes up everything else
- html = html.replaceAll("\\s+"
- , Matcher.quoteReplacement(":-\\"));
-
- //html stuff on the end
- bbMap.put("\n