Browse Source

add icons & gpl license files

Andrew Dolgov 5 years ago
parent
commit
5f0ce9d850
37 changed files with 5866 additions and 5096 deletions
  1. 674 0
      COPYING
  2. 96 0
      license-icons.txt
  3. 69 69
      org.fox.ttirc/src/main/AndroidManifest.xml
  4. 853 853
      org.fox.ttirc/src/main/java/org/fox/ttirc/ChannelFragment.java
  5. 366 366
      org.fox.ttirc/src/main/java/org/fox/ttirc/ChannelPager.java
  6. 116 116
      org.fox.ttirc/src/main/java/org/fox/ttirc/CommonActivity.java
  7. 517 517
      org.fox.ttirc/src/main/java/org/fox/ttirc/ConnectionsFragment.java
  8. 240 240
      org.fox.ttirc/src/main/java/org/fox/ttirc/LoginActivity.java
  9. 612 612
      org.fox.ttirc/src/main/java/org/fox/ttirc/MainActivity.java
  10. 48 48
      org.fox.ttirc/src/main/java/org/fox/ttirc/PreferencesActivity.java
  11. 121 121
      org.fox.ttirc/src/main/java/org/fox/ttirc/QuickViewActivity.java
  12. 56 56
      org.fox.ttirc/src/main/java/org/fox/ttirc/SendTask.java
  13. 922 922
      org.fox.ttirc/src/main/java/org/fox/ttirc/backend/UpdateService.java
  14. 38 38
      org.fox.ttirc/src/main/java/org/fox/ttirc/backend/UpdateServiceApi.java
  15. 5 5
      org.fox.ttirc/src/main/java/org/fox/ttirc/backend/UpdateServiceListener.java
  16. 314 314
      org.fox.ttirc/src/main/java/org/fox/ttirc/net/HttpRequestTask.java
  17. 45 45
      org.fox.ttirc/src/main/res/layout-sw600dp-port/activity_main.xml
  18. 39 39
      org.fox.ttirc/src/main/res/layout-sw600dp/activity_main.xml
  19. 113 113
      org.fox.ttirc/src/main/res/layout-sw600dp/fragment_channel.xml
  20. 15 15
      org.fox.ttirc/src/main/res/layout/activity_login.xml
  21. 60 60
      org.fox.ttirc/src/main/res/layout/activity_main.xml
  22. 20 20
      org.fox.ttirc/src/main/res/layout/activity_preferences.xml
  23. 56 56
      org.fox.ttirc/src/main/res/layout/activity_quickview.xml
  24. 14 14
      org.fox.ttirc/src/main/res/layout/drawer_divider.xml
  25. 26 26
      org.fox.ttirc/src/main/res/layout/emoticons_row.xml
  26. 88 88
      org.fox.ttirc/src/main/res/layout/fragment_channel.xml
  27. 13 13
      org.fox.ttirc/src/main/res/layout/fragment_connections.xml
  28. 11 11
      org.fox.ttirc/src/main/res/layout/toolbar.xml
  29. 19 19
      org.fox.ttirc/src/main/res/menu/activity_login.xml
  30. 55 55
      org.fox.ttirc/src/main/res/menu/activity_main.xml
  31. 7 7
      org.fox.ttirc/src/main/res/menu/context_channel.xml
  32. 15 15
      org.fox.ttirc/src/main/res/menu/context_connection.xml
  33. 8 8
      org.fox.ttirc/src/main/res/menu/context_nick.xml
  34. 3 3
      org.fox.ttirc/src/main/res/values-v11/style.xml
  35. 16 16
      org.fox.ttirc/src/main/res/values-v21/style.xml
  36. 114 114
      org.fox.ttirc/src/main/res/values/strings.xml
  37. 82 82
      org.fox.ttirc/src/main/res/values/style.xml

+ 674 - 0
COPYING

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

+ 96 - 0
license-icons.txt

@@ -0,0 +1,96 @@
+Copyright (c) 2014, Austin Andrews (http://materialdesignicons.com/),
+with Reserved Font Name Material Design Icons.
+Copyright (c) 2014, Google (http://www.google.com/design/)
+uses the license at https://github.com/google/material-design-icons/blob/master/LICENSE
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

+ 69 - 69
org.fox.ttirc/src/main/AndroidManifest.xml

@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.fox.ttirc"
-    android:versionCode="75"
-    android:versionName="1.26" >
-
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:name=".Application"
-        android:allowBackup="true"
-    	android:backupAgent=".utils.PrefsBackupAgent"
-        android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" >
-        <activity            
-            android:label="@string/app_name"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:name=".LaunchActivity" >
-            <intent-filter >
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:label="@string/app_name"
-            android:name=".LoginActivity" />
-        <activity
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:name=".MainActivity" />
-        <activity
-            android:label="@string/app_name"
-            android:name=".CommonActivity" />
-        <activity
-            android:label="@string/app_name"
-            android:theme="@style/QuickViewTheme"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:name=".QuickViewActivity">
-    		<intent-filter>
-    			<category android:name="android.intent.category.DEFAULT" />
-    			<action android:name="android.intent.action.VIEW" />
-    			<data android:scheme="org.fox.ttirc.quickview" />  
-			</intent-filter>    
-        </activity>
-        <activity
-            android:label="@string/preferences"
-            android:name=".PreferencesActivity" />
-        <service
-            android:name=".utils.GetFileService"
-            android:enabled="true" />
-        <service
-            android:enabled="true"
-            android:name=".backend.UpdateService" >
-        </service>
-
-        <activity android:name="org.acra.CrashReportDialog"
-            android:theme="@style/DialogTheme"
-            android:launchMode="singleInstance"
-            android:excludeFromRecents="true"
-            android:finishOnTaskLaunch="true" />
-
-        <meta-data android:name="com.google.android.backup.api_key"
-    	    android:value="AEdPqrEAAAAIzTOnby3D3J_gziDRZE_Ls5QC88I19ARoAUxXFQ" />
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.fox.ttirc"
+    android:versionCode="75"
+    android:versionName="1.26" >
+
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+        android:name=".Application"
+        android:allowBackup="true"
+    	android:backupAgent=".utils.PrefsBackupAgent"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <activity            
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:name=".LaunchActivity" >
+            <intent-filter >
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:label="@string/app_name"
+            android:name=".LoginActivity" />
+        <activity
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:name=".MainActivity" />
+        <activity
+            android:label="@string/app_name"
+            android:name=".CommonActivity" />
+        <activity
+            android:label="@string/app_name"
+            android:theme="@style/QuickViewTheme"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:name=".QuickViewActivity">
+    		<intent-filter>
+    			<category android:name="android.intent.category.DEFAULT" />
+    			<action android:name="android.intent.action.VIEW" />
+    			<data android:scheme="org.fox.ttirc.quickview" />  
+			</intent-filter>    
+        </activity>
+        <activity
+            android:label="@string/preferences"
+            android:name=".PreferencesActivity" />
+        <service
+            android:name=".utils.GetFileService"
+            android:enabled="true" />
+        <service
+            android:enabled="true"
+            android:name=".backend.UpdateService" >
+        </service>
+
+        <activity android:name="org.acra.CrashReportDialog"
+            android:theme="@style/DialogTheme"
+            android:launchMode="singleInstance"
+            android:excludeFromRecents="true"
+            android:finishOnTaskLaunch="true" />
+
+        <meta-data android:name="com.google.android.backup.api_key"
+    	    android:value="AEdPqrEAAAAIzTOnby3D3J_gziDRZE_Ls5QC88I19ARoAUxXFQ" />
+    </application>
+
 </manifest>

+ 853 - 853
org.fox.ttirc/src/main/java/org/fox/ttirc/ChannelFragment.java

@@ -1,853 +1,853 @@
-package org.fox.ttirc;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.ImageSpan;
-import android.text.util.Linkify;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
-
-import com.google.gson.JsonElement;
-
-import org.fox.ttirc.backend.UpdateService;
-import org.fox.ttirc.backend.UpdateServiceApi;
-import org.fox.ttirc.backend.UpdateServiceListener;
-import org.fox.ttirc.types.Constants;
-import org.fox.ttirc.types.Message;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ChannelFragment extends Fragment implements OnEditorActionListener, ChannelView {
-	private final String TAG = this.getClass().getSimpleName();
-	private String m_listenerId = "ChannelFragment";
-
-	private UpdateServiceApi m_api;
-	private int m_connectionId;
-	private int m_lastId = -1;
-	private String m_channelName = "";	
-	private String m_selfNick;
-	private NickListAdapter m_nickAdapter;
-	private MessageListAdapter m_messageAdapter;	
-	private List<String> m_nickList = new ArrayList<String>();
-	private List<Message> m_messages = new ArrayList<Message>();
-	private String m_topic = "";
-	private SharedPreferences m_prefs;
-	private MainActivity m_activity;
-	private ConcurrentHashMap<String, Bitmap> m_emoticonBitmaps = Application.getInstance().m_emoticonBitmaps;
-
-	public static int[] ColorMapLight = { 0xff00aaaa, 0xff000000, 0xff0000CC,
-			0xffCC00CC, 0xff606060, 0xff00cc00, 0xff30a030, 0xff8040cc,
-			0xff000080, 0xff707000, 0xff800080, 0xffcc3030, 0xff707070,
-			0xff008080, 0xffaaaa00 };
-
-	public static int[] ColorMapDark = { 0xff40CCCC, 0xffcccccc, 0xff4040CC,
-			0xffCC40CC, 0xff909090, 0xff40FF40, 0xff40CC40, 0xff8040ff,
-			0xff9090f0, 0xff808040, 0xffcc80cc, 0xffFF4040, 0xff909090,
-			0xff40a0a0, 0xffCCCC40 };
-	
-	public static enum MessageEventType { TOPIC, MODE, KICK, PART, JOIN, QUIT, DISCONNECT, 
-		REQUEST_CONNECTION, CONNECTING, PING_REPLY, NOTICE, CTCP, CTCP_REPLY, PING, CONNECT,
-		UNKNOWN_CMD, NICK, TWITTER_MSG, ERROR, SERVER_PONG }
-
-    public ChannelFragment() {
-		super();
-	}
-
-	public void initialize(int connectionId, String channelName) {
-		m_connectionId = connectionId;
-		m_channelName = channelName;
-		
-		m_listenerId += channelName + ":" + connectionId;
-	}
-
-	public int getConnectionId() {
-		return m_connectionId;
-	}
-	
-	public String getChannel() {
-		return m_channelName;
-	}
-	
-	@Override
-	public void onResume() {
-		super.onResume();
-
-		m_activity.bindService(new Intent(m_activity,
-	            UpdateService.class), m_serviceConnection, 0);
-	}
-
-	@Override
-	public boolean onContextItemSelected(MenuItem item) {
-		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-		
-		switch (item.getItemId()) {
-		case R.id.nick_start_conversation:
-			String nick = getNickAtPosition(info.position);
-				
-			if (nick != null) {				
-				if (nick.charAt(0) == '+' || nick.charAt(0) == '@') nick = nick.substring(1);
-			
-				final String fNick = nick;
-				
-				m_activity.showProgressBar(true);
-				
-				m_api.send(m_connectionId, m_channelName, "/QUERY " + nick, new UpdateServiceApi.OnSendCompleted() {
-					@Override
-					public void onSendCompleted(JsonElement result) {
-						m_activity.showProgressBar(false);
-						m_activity.onChannelSelected(m_connectionId, fNick, true);
-					}
-				});
-			}
-			return true;
-		default:
-			return super.onContextItemSelected(item);
-		}		
-	}
-	
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-
-		m_activity = (MainActivity) activity;
-		m_prefs = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext());
-    }
-	
-	@Override
-	public void onCreateContextMenu(ContextMenu menu, View v,
-	    ContextMenuInfo menuInfo) {
-		
-		m_activity.getMenuInflater().inflate(R.menu.context_nick, menu);
-		
-		AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo;
-		String nick = m_nickAdapter.getItem(info.position);
-		
-		if (nick.charAt(0) == '+' || nick.charAt(0) == '@')
-			nick = nick.substring(1);
-		
-		menu.setHeaderTitle(nick);
-		
-		super.onCreateContextMenu(menu, v, menuInfo);		
-	}
-	
-	public String getNickAtPosition(int position) {
-		return m_nickAdapter.getItem(position);
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
-
-		final View view = inflater.inflate(R.layout.fragment_channel, container, false);
-
-		if (savedInstanceState != null) {
-			m_connectionId = savedInstanceState.getInt("connectionId", m_connectionId);
-			//m_lastId = savedInstanceState.getInt("lastId", m_lastId);
-			m_channelName = savedInstanceState.getString("channelName");
-			m_topic = savedInstanceState.getString("topic");			
-		}
-
-        view.findViewById(R.id.loading_progress).setVisibility(View.VISIBLE);
-
-        final EditText input = (EditText)view.findViewById(R.id.channel_input_text);
-		input.setOnEditorActionListener(ChannelFragment.this);
-
-		ImageView sendButton = (ImageView)view.findViewById(R.id.send_button);
-		
-		if (sendButton != null) {
-			sendButton.setOnClickListener(new View.OnClickListener() {
-				
-				@Override
-				public void onClick(View v) {
-					String inputStr = input.getText().toString();
-
-					if (input.length() > 0) {
-						m_activity.showProgressBar(true);
-
-						m_api.send(m_connectionId, m_channelName, inputStr, new UpdateServiceApi.OnSendCompleted() {
-							@Override
-							public void onSendCompleted(JsonElement result) {
-								m_activity.showProgressBar(false);
-							}
-						});
-						
-						input.setText("");
-					}
-				}
-			});
-		}
-
-        if (m_channelName.charAt(0) != '#' || (m_activity.isPortrait() && m_activity.isSmallScreen())) {
-            view.findViewById(R.id.channel_nick_list).setVisibility(View.GONE);
-        } else {
-            view.findViewById(R.id.channel_nick_list).setVisibility(m_activity.getShowNicks() ? View.VISIBLE : View.GONE);
-        }
-
-        new Handler().postDelayed(new Runnable() {
-
-			@Override
-			public void run() {
-
-				if (isAdded()) {
-
-					ListView nickList = (ListView)view.findViewById(R.id.channel_nick_list);
-					m_nickAdapter = new NickListAdapter(m_activity, R.layout.nicklist_row, (ArrayList<String>)m_nickList);
-					nickList.setAdapter(m_nickAdapter);
-					registerForContextMenu(nickList);
-
-					nickList.setOnItemClickListener(new OnItemClickListener() {
-	
-						@Override
-						public void onItemClick(AdapterView<?> parent, View view, int position,
-								long id) {
-							
-							String nick = m_nickAdapter.getItem(position);
-	
-							if (nick.charAt(0) == '+' || nick.charAt(0) == '@')
-								nick = nick.substring(1);
-							
-							EditText input = (EditText)getView().findViewById(R.id.channel_input_text);
-							
-							if (input != null) {
-								nick = nick + ": "; // TODO customize completion character
-								
-								String text = input.getText().toString();
-	
-								if (text.indexOf(nick) != 0) {
-									input.setText(nick + text);
-									input.setSelection(input.getText().length());
-								}
-							}				
-						}
-						
-					});
-
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (isAdded()) {
-                                ListView messageList = (ListView)getView().findViewById(R.id.channel_message_list);
-                                m_messageAdapter = new MessageListAdapter(m_activity, R.layout.messagelist_row_system, (ArrayList<Message>)m_messages);
-                                messageList.setAdapter(m_messageAdapter);
-
-                                messageList.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
-                                messageList.setStackFromBottom(true);
-
-                                if (m_channelName.equals("---")) {
-                                    getView().findViewById(R.id.channel_nick_list).setVisibility(View.GONE);
-                                }
-                            }
-                        }
-                    }, 100);
-
-                }
-			}
-			
-		}, 100);
-
-		return view;    	
-	}
-
-    public void appendText(String text) {
-        EditText input = (EditText)getView().findViewById(R.id.channel_input_text);
-
-        if (input.getText().length() > 0) {
-            input.append(" ");
-        }
-
-        input.append(text + " ");
-    }
-	
-	@Override
-	public void onSaveInstanceState (Bundle out) {
-		super.onSaveInstanceState(out);
-
-		out.putInt("connectionId", m_connectionId);
-		//out.putInt("lastId", m_lastId);
-		out.putString("channelName", m_channelName);
-		out.putString("topic", m_topic);
-	}
-
-	@Override
-	public void onPause() {
-		super.onPause();
-
-		if (m_api != null) {
-			m_api.removeListener(m_listenerId);
-		}
-
-		m_activity.unbindService(m_serviceConnection);
-	}
-	
-	public UpdateServiceListener m_updateListener = new UpdateServiceListener() {
-		@Override
-		public void handleUpdate()  {
-			//Log.i(TAG, "Received update request from the service");		
-			
-			if (m_api == null || m_activity == null)
-				return;
-
-            AsyncTask handleUpdateTask = new AsyncTask<Object, Object, Object>() {
-
-                List<String> nicks;
-                List<Message> messages;
-                //HashMap<String, String> emoticons;
-                String topicStr;
-                boolean loadingComplete = false;
-
-                @Override
-                protected void onProgressUpdate(Object... params) {
-                    onPostExecute(null);
-                }
-
-                @Override
-                protected String doInBackground(Object... params) {
-
-                    nicks = m_api.getNicks(m_connectionId, m_channelName);
-                    messages = m_api.getMessages(m_connectionId, m_channelName, m_lastId);
-                    HashMap<String, String> emoticons = (HashMap<String, String>) m_api.getEmoticons();
-
-                    if (m_emoticonBitmaps.size() != emoticons.size()) {
-
-                        for (String key : emoticons.keySet()) {
-                            if (!m_emoticonBitmaps.containsKey(key)) {
-                                File imageFile = new File(emoticons.get(key));
-
-                                if (imageFile.exists()) {
-                                    try {
-                                        BitmapFactory.Options options = new BitmapFactory.Options();
-                                        DisplayMetrics metrics = m_activity.getApplicationContext().getResources().getDisplayMetrics();
-
-                                        options.inJustDecodeBounds = true;
-                                        BitmapFactory.decodeFile(imageFile.getAbsolutePath(), options);
-
-                                        options.inJustDecodeBounds = false;
-                                        Bitmap bitmap = BitmapFactory.decodeFile(imageFile.getAbsolutePath(), options);
-
-                                        if (bitmap != null) {
-                                            Bitmap scaledBitmap = Bitmap.createScaledBitmap(bitmap,
-                                                    (int) (options.outWidth * metrics.density),
-                                                    (int) (options.outHeight * metrics.density), true);
-
-                                            m_emoticonBitmaps.put(key, scaledBitmap);
-
-                                            publishProgress(null);
-                                        }
-
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    topicStr = m_api.getTopic(m_connectionId, m_channelName);
-
-                    m_selfNick = m_api.getSelfNick(m_connectionId);
-
-                    if (nicks != null && getActivity() != null) {
-                        getActivity().runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                m_nickList.clear();
-
-                                for (String nick : nicks) {
-                                    m_nickList.add(nick);
-                                    publishProgress(null);
-                                }
-                            }
-                        });
-                    }
-
-                    loadingComplete = true;
-                    publishProgress(null);
-
-                    if (getActivity() != null) {
-                        getActivity().runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                while (m_messages.size() > 1000)
-                                    m_messages.remove(m_messages.get(0));
-
-                                if (messages != null) {
-                                    for (Message msg : messages) {
-                                        if (msg.id > m_lastId) {
-
-                                            // filter out SERVER_PONG events
-                                            if (!(msg.message_type == Constants.MSGT_EVENT &&
-                                                    msg.message != null && msg.message.indexOf("SERVER_PONG:") == 0)) {
-
-                                                m_messages.add(msg);
-                                            }
-
-                                            m_lastId = msg.id;
-                                            publishProgress(null);
-                                        }
-                                    }
-                                }
-                            }
-                        });
-                    }
-
-                    return null;
-                }
-
-                @Override
-                protected void onPostExecute(Object result) {
-                    if (m_nickAdapter != null) {
-                        m_nickAdapter.notifyDataSetChanged();
-                    }
-
-                    if (m_messageAdapter != null) {
-                        m_messageAdapter.notifyDataSetChanged();
-                    }
-
-                    /* if (m_emoticonsAdapter != null) {
-                        m_emoticonsAdapter.notifyDataSetChanged();
-                    } */
-
-                    if (getView() != null) {
-                        TextView nick = (TextView) getView().findViewById(R.id.channel_nick);
-                        if (nick != null)
-                            nick.setText(m_selfNick);
-
-                        TextView topic = (TextView) getView().findViewById(R.id.channel_topic_text);
-                        if (topic != null && topicStr != null) {
-
-                            SpannableString span = new SpannableString(topicStr);
-
-                            span = rewriteEmoticons(span);
-
-                            topic.setText(span);
-                        }
-
-                        if (loadingComplete) {
-                            getView().findViewById(R.id.loading_progress).setVisibility(View.GONE);
-                        }
-                    }
-
-                }
-            };
-
-            handleUpdateTask.execute(new Object());
-		}
-	};
-
-
-	public ServiceConnection m_serviceConnection = new ServiceConnection() {
-		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {
-			Log.d(TAG, "Service connection established");
-			m_api = (UpdateServiceApi)service;
-			
-			m_api.addListener(m_listenerId, m_updateListener);
-			m_updateListener.handleUpdate();
-		
-		}
-
-		@Override
-		public void onServiceDisconnected(ComponentName name) {
-			Log.d(TAG, "Service connection closed");
-			m_api = null;
-		}
-	}; 
-
-	private class NickListAdapter extends ArrayAdapter<String> {
-		private ArrayList<String> items;
-
-		public NickListAdapter(Context context, int textViewResourceId, ArrayList<String> items) {
-			super(context, textViewResourceId, items);
-			this.items = items;
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-
-			View v = convertView;
-
-			String nick = items.get(position);
-
-			if (v == null) {
-				LayoutInflater vi = (LayoutInflater)m_activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-				v = vi.inflate(R.layout.nicklist_row, null);
-			}
-
-			TextView nt = (TextView) v.findViewById(R.id.nicklist_row_nick);
-			ImageView icon = (ImageView) v.findViewById(R.id.nicklist_row_icon);
-
-			if (icon != null && nt != null) {
-				char prefix = nick.charAt(0);
-
-				switch (prefix) {
-				case '@':
-					icon.setImageResource(R.drawable.user_op);
-					nt.setText(nick.substring(1));
-					break;            	 
-				case '+':
-					icon.setImageResource(R.drawable.user_voice);
-					nt.setText(nick.substring(1));
-					break; 
-				default:
-					icon.setImageResource(R.drawable.user_normal);
-					nt.setText(nick);
-					break;
-				}        	 
-
-				//        	 icon.setBackgroundResource(R.drawable.user_normal);
-				//        	 icon.setAdjustViewBounds(true);        	 
-			}           
-
-			return v;
-		}
-	}
-
-    private class MessageListHolder {
-
-        public TextView message;
-    }
-
-	private class MessageListAdapter extends ArrayAdapter<Message> {
-		private ArrayList<Message> items;
-
-		public static final int VIEW_PRIVMSG = 0;
-		public static final int VIEW_ACTION = 1;
-		public static final int VIEW_NOTICE = 2;
-		public static final int VIEW_SYSTEM = 3;
-		
-		public static final int VIEW_COUNT = VIEW_SYSTEM + 1;
-
-		public MessageListAdapter(Context context, int textViewResourceId, ArrayList<Message> items) {
-			super(context, textViewResourceId, items);
-			this.items = items;
-		}
-
-		public int getViewTypeCount() {
-			return VIEW_COUNT;
-		}
-
-		@Override
-		public int getItemViewType(int position) {
-			Message msg = items.get(position);
-
-			switch (msg.message_type) {
-			case Constants.MSGT_PRIVMSG:
-			case Constants.MSGT_PRIVATE_PRIVMSG:
-				return VIEW_PRIVMSG;
-			case Constants.MSGT_NOTICE:
-				return VIEW_NOTICE;
-			case Constants.MSGT_ACTION:
-				return VIEW_ACTION;
-			default:
-				return VIEW_SYSTEM;
-			}
-		}
-
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-
-			View v = convertView;
-
-			Message msg = items.get(position);
-			Bundle fmt = formatMessage(msg);
-            MessageListHolder holder;
-
-            if (v == null) {
-				LayoutInflater vi = (LayoutInflater)m_activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-				int layoutId; 
-
-				switch (getItemViewType(position)) {
-				case VIEW_PRIVMSG:
-					layoutId = R.layout.messagelist_row_privmsg;
-					break;
-				case VIEW_ACTION:
-					layoutId = R.layout.messagelist_row_action;
-					break;
-				case VIEW_NOTICE:
-					layoutId = R.layout.messagelist_row_notice;
-					break;            		
-				default:
-					layoutId = R.layout.messagelist_row_system;
-				}
-
-				v = vi.inflate(layoutId, null);
-
-                holder = new MessageListHolder();
-
-                holder.message = (TextView) v.findViewById(R.id.message);
-
-                v.setTag(holder);
-			} else {
-                holder = (MessageListHolder) v.getTag();
-            }
-
-			//TextView message = (TextView) v.findViewById(R.id.message);
-		
-			if (holder.message != null) {
-				
-				SpannableString span; 
-
-				String ts = msg.ts.substring(11);
-				
-				TypedValue tv = new TypedValue();
-			    m_activity.getTheme().resolveAttribute(R.attr.messageTsColor, tv, true);
-			    int tsColor = tv.data;
-
-				switch (msg.message_type) {
-				case Constants.MSGT_PRIVMSG:
-				case Constants.MSGT_PRIVATE_PRIVMSG:
-				case Constants.MSGT_NOTICE:
-					String nick = fmt.getString("sender");
-				    String ownNick = "";
-				    
-					ownNick = m_api.getSelfNick(m_connectionId);
-					
-					int nickColor = 0xffffffff;
-					
-					if (ownNick.equals(nick)) {
-					    m_activity.getTheme().resolveAttribute(R.attr.messageOwnNickColor, tv, true);
-					    nickColor = tv.data;
-					} else {					
-						try {
-							nickColor = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT).equals(CommonActivity.THEME_LIGHT) ? ColorMapLight[msg.sender_color] : 
-								ColorMapDark[msg.sender_color];
-						} catch (ArrayIndexOutOfBoundsException e) {
-							// wtf, backend!
-						    m_activity.getTheme().resolveAttribute(R.attr.messageNickColor, tv, true);
-						    nickColor = tv.data;
-						}
-					}
-
-				    m_activity.getTheme().resolveAttribute(R.attr.messageBracketColor, tv, true);
-				    int bracketColor = tv.data;
-
-				    span = new SpannableString(ts + " <" + nick + "> " + fmt.getString("message"));
-				    //CharSequence message = fmt.getString("message"); 
-				    
-				    //Log.d(TAG, String.format("color=%x [%d]", ColorMap[msg.sender_color], msg.sender_color));
-				    
-					span.setSpan(new ForegroundColorSpan(tsColor), 0, ts.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-					span.setSpan(new ForegroundColorSpan(bracketColor), ts.length()+1, ts.length()+2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-					span.setSpan(new ForegroundColorSpan(nickColor), ts.length()+2, ts.length()+2+nick.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-					span.setSpan(new ForegroundColorSpan(bracketColor), ts.length()+2+nick.length(), ts.length()+2+nick.length()+1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-					span = rewriteEmoticons(span);
-
-                    holder.message.setText(span);
-					break;
-				default:
-				    span = new SpannableString(ts + " " + fmt.getString("message"));
-				    
-					span.setSpan(new ForegroundColorSpan(tsColor), 0, ts.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-					
-					span = rewriteEmoticons(span);
-
-                    holder.message.setText(span);
-				}
-				
-				switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) {
-				case 0:
-                    holder.message.setTextSize(13F);
-					break;
-				case 1:
-                    holder.message.setTextSize(16F);
-					break;
-				case 2:
-                    holder.message.setTextSize(21F);
-					break;		
-				}
-
-				if (m_prefs.getBoolean("quick_image_preview", true)) {
-					Pattern imgMatcher = Pattern.compile("(ftp|https?):\\/\\/[^ ]+\\.(jpe?g|png|gifv?|webm)", Pattern.CASE_INSENSITIVE);
-					String imgURL =    "org.fox.ttirc.quickview://view/";
-					Linkify.addLinks(holder.message, imgMatcher, imgURL);
-					
-					Pattern elseMatcher = Pattern.compile("(ftp|https?):\\/\\/[^ ]+(?!\\.(jpe?g|png|gifv?|webm))", Pattern.CASE_INSENSITIVE);
-					Linkify.addLinks(holder.message, elseMatcher, null);
-				} else {
-					Linkify.addLinks(holder.message, Linkify.ALL);
-				}
-			}
-		
-			return v;
-		}
-
-		@Override
-		public boolean isEnabled(int position) {
-			return false;
-		}
-		
-		public Bundle formatMessage(Message message) {
-			Bundle rv = new Bundle();
-
-			switch (message.message_type) {
-			case Constants.MSGT_PRIVMSG:
-			case Constants.MSGT_PRIVATE_PRIVMSG:
-				rv.putString("sender", message.sender);
-				rv.putString("message", message.message);
-				break;		
-			case Constants.MSGT_ACTION:
-				rv.putString("message", " * " + message.sender + " " + message.message);
-				break;
-			case Constants.MSGT_NOTICE:
-				rv.putString("sender", message.sender);
-				rv.putString("message", message.message);
-				break;
-			case Constants.MSGT_TOPIC:
-				rv.putString("sender", message.sender);
-				rv.putString("message", message.message);
-				break;
-			case Constants.MSGT_EVENT:
-				rv.putString("sender", message.sender);
-				rv.putString("message", formatEvent(message));
-				break;
-			default:
-				rv.putString("message", message.message);
-				break;
-			}		
-			return rv;
-		}
-		
-		public String formatEvent(Message message) {
-			
-			try {
-				String[] params = message.message.split(":", 3);
-				MessageEventType eventType = MessageEventType.valueOf(params[0]);
-				
-				switch (eventType) {
-				case NICK:
-					return getString(R.string.event_nick, message.sender, params[1]);
-				case TOPIC:
-					return getString(R.string.event_topic, message.sender, message.message.replace("TOPIC:", ""));				
-				case MODE:
-					if (params[1].equals("")) {
-						return getString(R.string.event_mode_user, message.channel, params[2]);
-					} else {
-						return getString(R.string.event_mode_chan, message.sender, params[1], params[2]);
-					}				
-				case KICK:
-					return getString(R.string.event_kick, params[1], message.channel, message.sender, params[2]);				
-				case PART:
-					return getString(R.string.event_part, params[1], message.channel, params[2]);				
-				case JOIN:
-					return getString(R.string.event_join, params[1], params[2], message.channel);
-				case QUIT:
-					return getString(R.string.event_quit, message.sender, message.message.replace("QUIT:", ""));				
-				case DISCONNECT:
-					return getString(R.string.event_disconnect);				
-				case REQUEST_CONNECTION:
-					return getString(R.string.event_request_connection);
-				case CONNECTING:
-					return getString(R.string.event_connecting, params[1], params[2]);
-				case PING_REPLY:
-					return getString(R.string.event_ping_reply, message.sender, params[1]);
-				case NOTICE:
-					return "NOTICE/FIXME: " + message.message; // FIXME handle event NOTICE properly
-				case CTCP:
-					return getString(R.string.event_ctcp, params[1], params[2], message.sender);				
-				case CTCP_REPLY:
-					return getString(R.string.event_ctcp_reply, params[1], message.sender, params[2]);
-				case PING:
-					return getString(R.string.event_ping, params[1], message.sender);				
-				case CONNECT:
-					return getString(R.string.event_connect);
-				case TWITTER_MSG:
-					return "TWITTER_MSG/FIXME: " + message.message; // FIXME handle TWITTER_MSG
-				case UNKNOWN_CMD:
-					return getString(R.string.event_unknown_cmd, params[1]);
-				case ERROR:
-					return message.message.replace("ERROR:", "");
-				case SERVER_PONG:
-					return getString(R.string.event_server_pong, params[1]);
-				default:
-					Log.d(TAG, "formatEvent error:" + message.message);
-					return null;
-				}
-			} catch (IllegalArgumentException e) {
-				e.printStackTrace();
-				Log.d(TAG, "formatEvent error:" + message.message);
-				return message.message;
-			}
-		}
-	}
-
-	@Override
-	public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-		if (actionId == EditorInfo.IME_ACTION_SEND || actionId == EditorInfo.IME_NULL || 
-				event.getAction() == KeyEvent.ACTION_DOWN || event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
-
-			String input = v.getText().toString();
-
-			if (input.length() > 0) {
-				m_activity.showProgressBar(true);
-
-				m_api.send(m_connectionId, m_channelName, input, new UpdateServiceApi.OnSendCompleted() {
-					@Override
-					public void onSendCompleted(JsonElement result) {
-						m_activity.showProgressBar(false);
-					}
-				});
-				
-				v.setText("");
-			}
-		}		
-		return true;
-	}
-
-	protected SpannableString rewriteEmoticons(SpannableString span) {
-		if (m_prefs.getBoolean("enable_emoticons", true)) {
-			for (String key : m_emoticonBitmaps.keySet()) {
-				Pattern pattern = Pattern.compile(Pattern.quote(key));
-		        Matcher matcher = pattern.matcher(span);
-		        
-		        while (matcher.find()) {
-					ImageSpan imgSpan = new ImageSpan(m_activity, m_emoticonBitmaps.get(key), ImageSpan.ALIGN_BOTTOM);
-
-		        	span.setSpan(imgSpan, matcher.start(), matcher.end(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
-		        }						
-			}
-		}
-		
-		return span;
-	}
-}
+package org.fox.ttirc;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.ImageSpan;
+import android.text.util.Linkify;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+
+import com.google.gson.JsonElement;
+
+import org.fox.ttirc.backend.UpdateService;
+import org.fox.ttirc.backend.UpdateServiceApi;
+import org.fox.ttirc.backend.UpdateServiceListener;
+import org.fox.ttirc.types.Constants;
+import org.fox.ttirc.types.Message;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class ChannelFragment extends Fragment implements OnEditorActionListener, ChannelView {
+	private final String TAG = this.getClass().getSimpleName();
+	private String m_listenerId = "ChannelFragment";
+
+	private UpdateServiceApi m_api;
+	private int m_connectionId;
+	private int m_lastId = -1;
+	private String m_channelName = "";	
+	private String m_selfNick;
+	private NickListAdapter m_nickAdapter;
+	private MessageListAdapter m_messageAdapter;	
+	private List<String> m_nickList = new ArrayList<String>();
+	private List<Message> m_messages = new ArrayList<Message>();
+	private String m_topic = "";
+	private SharedPreferences m_prefs;
+	private MainActivity m_activity;
+	private ConcurrentHashMap<String, Bitmap> m_emoticonBitmaps = Application.getInstance().m_emoticonBitmaps;
+
+	public static int[] ColorMapLight = { 0xff00aaaa, 0xff000000, 0xff0000CC,
+			0xffCC00CC, 0xff606060, 0xff00cc00, 0xff30a030, 0xff8040cc,
+			0xff000080, 0xff707000, 0xff800080, 0xffcc3030, 0xff707070,
+			0xff008080, 0xffaaaa00 };
+
+	public static int[] ColorMapDark = { 0xff40CCCC, 0xffcccccc, 0xff4040CC,
+			0xffCC40CC, 0xff909090, 0xff40FF40, 0xff40CC40, 0xff8040ff,
+			0xff9090f0, 0xff808040, 0xffcc80cc, 0xffFF4040, 0xff909090,
+			0xff40a0a0, 0xffCCCC40 };
+	
+	public static enum MessageEventType { TOPIC, MODE, KICK, PART, JOIN, QUIT, DISCONNECT, 
+		REQUEST_CONNECTION, CONNECTING, PING_REPLY, NOTICE, CTCP, CTCP_REPLY, PING, CONNECT,
+		UNKNOWN_CMD, NICK, TWITTER_MSG, ERROR, SERVER_PONG }
+
+    public ChannelFragment() {
+		super();
+	}
+
+	public void initialize(int connectionId, String channelName) {
+		m_connectionId = connectionId;
+		m_channelName = channelName;
+		
+		m_listenerId += channelName + ":" + connectionId;
+	}
+
+	public int getConnectionId() {
+		return m_connectionId;
+	}
+	
+	public String getChannel() {
+		return m_channelName;
+	}
+	
+	@Override
+	public void onResume() {
+		super.onResume();
+
+		m_activity.bindService(new Intent(m_activity,
+	            UpdateService.class), m_serviceConnection, 0);
+	}
+
+	@Override
+	public boolean onContextItemSelected(MenuItem item) {
+		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+		
+		switch (item.getItemId()) {
+		case R.id.nick_start_conversation:
+			String nick = getNickAtPosition(info.position);
+				
+			if (nick != null) {				
+				if (nick.charAt(0) == '+' || nick.charAt(0) == '@') nick = nick.substring(1);
+			
+				final String fNick = nick;
+				
+				m_activity.showProgressBar(true);
+				
+				m_api.send(m_connectionId, m_channelName, "/QUERY " + nick, new UpdateServiceApi.OnSendCompleted() {
+					@Override
+					public void onSendCompleted(JsonElement result) {
+						m_activity.showProgressBar(false);
+						m_activity.onChannelSelected(m_connectionId, fNick, true);
+					}
+				});
+			}
+			return true;
+		default:
+			return super.onContextItemSelected(item);
+		}		
+	}
+	
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
+
+		m_activity = (MainActivity) activity;
+		m_prefs = PreferenceManager.getDefaultSharedPreferences(activity.getApplicationContext());
+    }
+	
+	@Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+	    ContextMenuInfo menuInfo) {
+		
+		m_activity.getMenuInflater().inflate(R.menu.context_nick, menu);
+		
+		AdapterContextMenuInfo info = (AdapterContextMenuInfo)menuInfo;
+		String nick = m_nickAdapter.getItem(info.position);
+		
+		if (nick.charAt(0) == '+' || nick.charAt(0) == '@')
+			nick = nick.substring(1);
+		
+		menu.setHeaderTitle(nick);
+		
+		super.onCreateContextMenu(menu, v, menuInfo);		
+	}
+	
+	public String getNickAtPosition(int position) {
+		return m_nickAdapter.getItem(position);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
+
+		final View view = inflater.inflate(R.layout.fragment_channel, container, false);
+
+		if (savedInstanceState != null) {
+			m_connectionId = savedInstanceState.getInt("connectionId", m_connectionId);
+			//m_lastId = savedInstanceState.getInt("lastId", m_lastId);
+			m_channelName = savedInstanceState.getString("channelName");
+			m_topic = savedInstanceState.getString("topic");			
+		}
+
+        view.findViewById(R.id.loading_progress).setVisibility(View.VISIBLE);
+
+        final EditText input = (EditText)view.findViewById(R.id.channel_input_text);
+		input.setOnEditorActionListener(ChannelFragment.this);
+
+		ImageView sendButton = (ImageView)view.findViewById(R.id.send_button);
+		
+		if (sendButton != null) {
+			sendButton.setOnClickListener(new View.OnClickListener() {
+				
+				@Override
+				public void onClick(View v) {
+					String inputStr = input.getText().toString();
+
+					if (input.length() > 0) {
+						m_activity.showProgressBar(true);
+
+						m_api.send(m_connectionId, m_channelName, inputStr, new UpdateServiceApi.OnSendCompleted() {
+							@Override
+							public void onSendCompleted(JsonElement result) {
+								m_activity.showProgressBar(false);
+							}
+						});
+						
+						input.setText("");
+					}
+				}
+			});
+		}
+
+        if (m_channelName.charAt(0) != '#' || (m_activity.isPortrait() && m_activity.isSmallScreen())) {
+            view.findViewById(R.id.channel_nick_list).setVisibility(View.GONE);
+        } else {
+            view.findViewById(R.id.channel_nick_list).setVisibility(m_activity.getShowNicks() ? View.VISIBLE : View.GONE);
+        }
+
+        new Handler().postDelayed(new Runnable() {
+
+			@Override
+			public void run() {
+
+				if (isAdded()) {
+
+					ListView nickList = (ListView)view.findViewById(R.id.channel_nick_list);
+					m_nickAdapter = new NickListAdapter(m_activity, R.layout.nicklist_row, (ArrayList<String>)m_nickList);
+					nickList.setAdapter(m_nickAdapter);
+					registerForContextMenu(nickList);
+
+					nickList.setOnItemClickListener(new OnItemClickListener() {
+	
+						@Override
+						public void onItemClick(AdapterView<?> parent, View view, int position,
+								long id) {
+							
+							String nick = m_nickAdapter.getItem(position);
+	
+							if (nick.charAt(0) == '+' || nick.charAt(0) == '@')
+								nick = nick.substring(1);
+							
+							EditText input = (EditText)getView().findViewById(R.id.channel_input_text);
+							
+							if (input != null) {
+								nick = nick + ": "; // TODO customize completion character
+								
+								String text = input.getText().toString();
+	
+								if (text.indexOf(nick) != 0) {
+									input.setText(nick + text);
+									input.setSelection(input.getText().length());
+								}
+							}				
+						}
+						
+					});
+
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (isAdded()) {
+                                ListView messageList = (ListView)getView().findViewById(R.id.channel_message_list);
+                                m_messageAdapter = new MessageListAdapter(m_activity, R.layout.messagelist_row_system, (ArrayList<Message>)m_messages);
+                                messageList.setAdapter(m_messageAdapter);
+
+                                messageList.setTranscriptMode(ListView.TRANSCRIPT_MODE_ALWAYS_SCROLL);
+                                messageList.setStackFromBottom(true);
+
+                                if (m_channelName.equals("---")) {
+                                    getView().findViewById(R.id.channel_nick_list).setVisibility(View.GONE);
+                                }
+                            }
+                        }
+                    }, 100);
+
+                }
+			}
+			
+		}, 100);
+
+		return view;    	
+	}
+
+    public void appendText(String text) {
+        EditText input = (EditText)getView().findViewById(R.id.channel_input_text);
+
+        if (input.getText().length() > 0) {
+            input.append(" ");
+        }
+
+        input.append(text + " ");
+    }
+	
+	@Override
+	public void onSaveInstanceState (Bundle out) {
+		super.onSaveInstanceState(out);
+
+		out.putInt("connectionId", m_connectionId);
+		//out.putInt("lastId", m_lastId);
+		out.putString("channelName", m_channelName);
+		out.putString("topic", m_topic);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+
+		if (m_api != null) {
+			m_api.removeListener(m_listenerId);
+		}
+
+		m_activity.unbindService(m_serviceConnection);
+	}
+	
+	public UpdateServiceListener m_updateListener = new UpdateServiceListener() {
+		@Override
+		public void handleUpdate()  {
+			//Log.i(TAG, "Received update request from the service");		
+			
+			if (m_api == null || m_activity == null)
+				return;
+
+            AsyncTask handleUpdateTask = new AsyncTask<Object, Object, Object>() {
+
+                List<String> nicks;
+                List<Message> messages;
+                //HashMap<String, String> emoticons;
+                String topicStr;
+                boolean loadingComplete = false;
+
+                @Override
+                protected void onProgressUpdate(Object... params) {
+                    onPostExecute(null);
+                }
+
+                @Override
+                protected String doInBackground(Object... params) {
+
+                    nicks = m_api.getNicks(m_connectionId, m_channelName);
+                    messages = m_api.getMessages(m_connectionId, m_channelName, m_lastId);
+                    HashMap<String, String> emoticons = (HashMap<String, String>) m_api.getEmoticons();
+
+                    if (m_emoticonBitmaps.size() != emoticons.size()) {
+
+                        for (String key : emoticons.keySet()) {
+                            if (!m_emoticonBitmaps.containsKey(key)) {
+                                File imageFile = new File(emoticons.get(key));
+
+                                if (imageFile.exists()) {
+                                    try {
+                                        BitmapFactory.Options options = new BitmapFactory.Options();
+                                        DisplayMetrics metrics = m_activity.getApplicationContext().getResources().getDisplayMetrics();
+
+                                        options.inJustDecodeBounds = true;
+                                        BitmapFactory.decodeFile(imageFile.getAbsolutePath(), options);
+
+                                        options.inJustDecodeBounds = false;
+                                        Bitmap bitmap = BitmapFactory.decodeFile(imageFile.getAbsolutePath(), options);
+
+                                        if (bitmap != null) {
+                                            Bitmap scaledBitmap = Bitmap.createScaledBitmap(bitmap,
+                                                    (int) (options.outWidth * metrics.density),
+                                                    (int) (options.outHeight * metrics.density), true);
+
+                                            m_emoticonBitmaps.put(key, scaledBitmap);
+
+                                            publishProgress(null);
+                                        }
+
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    topicStr = m_api.getTopic(m_connectionId, m_channelName);
+
+                    m_selfNick = m_api.getSelfNick(m_connectionId);
+
+                    if (nicks != null && getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                m_nickList.clear();
+
+                                for (String nick : nicks) {
+                                    m_nickList.add(nick);
+                                    publishProgress(null);
+                                }
+                            }
+                        });
+                    }
+
+                    loadingComplete = true;
+                    publishProgress(null);
+
+                    if (getActivity() != null) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                while (m_messages.size() > 1000)
+                                    m_messages.remove(m_messages.get(0));
+
+                                if (messages != null) {
+                                    for (Message msg : messages) {
+                                        if (msg.id > m_lastId) {
+
+                                            // filter out SERVER_PONG events
+                                            if (!(msg.message_type == Constants.MSGT_EVENT &&
+                                                    msg.message != null && msg.message.indexOf("SERVER_PONG:") == 0)) {
+
+                                                m_messages.add(msg);
+                                            }
+
+                                            m_lastId = msg.id;
+                                            publishProgress(null);
+                                        }
+                                    }
+                                }
+                            }
+                        });
+                    }
+
+                    return null;
+                }
+
+                @Override
+                protected void onPostExecute(Object result) {
+                    if (m_nickAdapter != null) {
+                        m_nickAdapter.notifyDataSetChanged();
+                    }
+
+                    if (m_messageAdapter != null) {
+                        m_messageAdapter.notifyDataSetChanged();
+                    }
+
+                    /* if (m_emoticonsAdapter != null) {
+                        m_emoticonsAdapter.notifyDataSetChanged();
+                    } */
+
+                    if (getView() != null) {
+                        TextView nick = (TextView) getView().findViewById(R.id.channel_nick);
+                        if (nick != null)
+                            nick.setText(m_selfNick);
+
+                        TextView topic = (TextView) getView().findViewById(R.id.channel_topic_text);
+                        if (topic != null && topicStr != null) {
+
+                            SpannableString span = new SpannableString(topicStr);
+
+                            span = rewriteEmoticons(span);
+
+                            topic.setText(span);
+                        }
+
+                        if (loadingComplete) {
+                            getView().findViewById(R.id.loading_progress).setVisibility(View.GONE);
+                        }
+                    }
+
+                }
+            };
+
+            handleUpdateTask.execute(new Object());
+		}
+	};
+
+
+	public ServiceConnection m_serviceConnection = new ServiceConnection() {
+		@Override
+		public void onServiceConnected(ComponentName name, IBinder service) {
+			Log.d(TAG, "Service connection established");
+			m_api = (UpdateServiceApi)service;
+			
+			m_api.addListener(m_listenerId, m_updateListener);
+			m_updateListener.handleUpdate();
+		
+		}
+
+		@Override
+		public void onServiceDisconnected(ComponentName name) {
+			Log.d(TAG, "Service connection closed");
+			m_api = null;
+		}
+	}; 
+
+	private class NickListAdapter extends ArrayAdapter<String> {
+		private ArrayList<String> items;
+
+		public NickListAdapter(Context context, int textViewResourceId, ArrayList<String> items) {
+			super(context, textViewResourceId, items);
+			this.items = items;
+		}
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+
+			View v = convertView;
+
+			String nick = items.get(position);
+
+			if (v == null) {
+				LayoutInflater vi = (LayoutInflater)m_activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+				v = vi.inflate(R.layout.nicklist_row, null);
+			}
+
+			TextView nt = (TextView) v.findViewById(R.id.nicklist_row_nick);
+			ImageView icon = (ImageView) v.findViewById(R.id.nicklist_row_icon);
+
+			if (icon != null && nt != null) {
+				char prefix = nick.charAt(0);
+
+				switch (prefix) {
+				case '@':
+					icon.setImageResource(R.drawable.user_op);
+					nt.setText(nick.substring(1));
+					break;            	 
+				case '+':
+					icon.setImageResource(R.drawable.user_voice);
+					nt.setText(nick.substring(1));
+					break; 
+				default:
+					icon.setImageResource(R.drawable.user_normal);
+					nt.setText(nick);
+					break;
+				}        	 
+
+				//        	 icon.setBackgroundResource(R.drawable.user_normal);
+				//        	 icon.setAdjustViewBounds(true);        	 
+			}           
+
+			return v;
+		}
+	}
+
+    private class MessageListHolder {
+
+        public TextView message;
+    }
+
+	private class MessageListAdapter extends ArrayAdapter<Message> {
+		private ArrayList<Message> items;
+
+		public static final int VIEW_PRIVMSG = 0;
+		public static final int VIEW_ACTION = 1;
+		public static final int VIEW_NOTICE = 2;
+		public static final int VIEW_SYSTEM = 3;
+		
+		public static final int VIEW_COUNT = VIEW_SYSTEM + 1;
+
+		public MessageListAdapter(Context context, int textViewResourceId, ArrayList<Message> items) {
+			super(context, textViewResourceId, items);
+			this.items = items;
+		}
+
+		public int getViewTypeCount() {
+			return VIEW_COUNT;
+		}
+
+		@Override
+		public int getItemViewType(int position) {
+			Message msg = items.get(position);
+
+			switch (msg.message_type) {
+			case Constants.MSGT_PRIVMSG:
+			case Constants.MSGT_PRIVATE_PRIVMSG:
+				return VIEW_PRIVMSG;
+			case Constants.MSGT_NOTICE:
+				return VIEW_NOTICE;
+			case Constants.MSGT_ACTION:
+				return VIEW_ACTION;
+			default:
+				return VIEW_SYSTEM;
+			}
+		}
+
+
+		@Override
+		public View getView(int position, View convertView, ViewGroup parent) {
+
+			View v = convertView;
+
+			Message msg = items.get(position);
+			Bundle fmt = formatMessage(msg);
+            MessageListHolder holder;
+
+            if (v == null) {
+				LayoutInflater vi = (LayoutInflater)m_activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+				int layoutId; 
+
+				switch (getItemViewType(position)) {
+				case VIEW_PRIVMSG:
+					layoutId = R.layout.messagelist_row_privmsg;
+					break;
+				case VIEW_ACTION:
+					layoutId = R.layout.messagelist_row_action;
+					break;
+				case VIEW_NOTICE:
+					layoutId = R.layout.messagelist_row_notice;
+					break;            		
+				default:
+					layoutId = R.layout.messagelist_row_system;
+				}
+
+				v = vi.inflate(layoutId, null);
+
+                holder = new MessageListHolder();
+
+                holder.message = (TextView) v.findViewById(R.id.message);
+
+                v.setTag(holder);
+			} else {
+                holder = (MessageListHolder) v.getTag();
+            }
+
+			//TextView message = (TextView) v.findViewById(R.id.message);
+		
+			if (holder.message != null) {
+				
+				SpannableString span; 
+
+				String ts = msg.ts.substring(11);
+				
+				TypedValue tv = new TypedValue();
+			    m_activity.getTheme().resolveAttribute(R.attr.messageTsColor, tv, true);
+			    int tsColor = tv.data;
+
+				switch (msg.message_type) {
+				case Constants.MSGT_PRIVMSG:
+				case Constants.MSGT_PRIVATE_PRIVMSG:
+				case Constants.MSGT_NOTICE:
+					String nick = fmt.getString("sender");
+				    String ownNick = "";
+				    
+					ownNick = m_api.getSelfNick(m_connectionId);
+					
+					int nickColor = 0xffffffff;
+					
+					if (ownNick.equals(nick)) {
+					    m_activity.getTheme().resolveAttribute(R.attr.messageOwnNickColor, tv, true);
+					    nickColor = tv.data;
+					} else {					
+						try {
+							nickColor = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT).equals(CommonActivity.THEME_LIGHT) ? ColorMapLight[msg.sender_color] : 
+								ColorMapDark[msg.sender_color];
+						} catch (ArrayIndexOutOfBoundsException e) {
+							// wtf, backend!
+						    m_activity.getTheme().resolveAttribute(R.attr.messageNickColor, tv, true);
+						    nickColor = tv.data;
+						}
+					}
+
+				    m_activity.getTheme().resolveAttribute(R.attr.messageBracketColor, tv, true);
+				    int bracketColor = tv.data;
+
+				    span = new SpannableString(ts + " <" + nick + "> " + fmt.getString("message"));
+				    //CharSequence message = fmt.getString("message"); 
+				    
+				    //Log.d(TAG, String.format("color=%x [%d]", ColorMap[msg.sender_color], msg.sender_color));
+				    
+					span.setSpan(new ForegroundColorSpan(tsColor), 0, ts.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+					span.setSpan(new ForegroundColorSpan(bracketColor), ts.length()+1, ts.length()+2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+					span.setSpan(new ForegroundColorSpan(nickColor), ts.length()+2, ts.length()+2+nick.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+					span.setSpan(new ForegroundColorSpan(bracketColor), ts.length()+2+nick.length(), ts.length()+2+nick.length()+1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+					span = rewriteEmoticons(span);
+
+                    holder.message.setText(span);
+					break;
+				default:
+				    span = new SpannableString(ts + " " + fmt.getString("message"));
+				    
+					span.setSpan(new ForegroundColorSpan(tsColor), 0, ts.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+					
+					span = rewriteEmoticons(span);
+
+                    holder.message.setText(span);
+				}
+				
+				switch (Integer.parseInt(m_prefs.getString("font_size", "0"))) {
+				case 0:
+                    holder.message.setTextSize(13F);
+					break;
+				case 1:
+                    holder.message.setTextSize(16F);
+					break;
+				case 2:
+                    holder.message.setTextSize(21F);
+					break;		
+				}
+
+				if (m_prefs.getBoolean("quick_image_preview", true)) {
+					Pattern imgMatcher = Pattern.compile("(ftp|https?):\\/\\/[^ ]+\\.(jpe?g|png|gifv?|webm)", Pattern.CASE_INSENSITIVE);
+					String imgURL =    "org.fox.ttirc.quickview://view/";
+					Linkify.addLinks(holder.message, imgMatcher, imgURL);
+					
+					Pattern elseMatcher = Pattern.compile("(ftp|https?):\\/\\/[^ ]+(?!\\.(jpe?g|png|gifv?|webm))", Pattern.CASE_INSENSITIVE);
+					Linkify.addLinks(holder.message, elseMatcher, null);
+				} else {
+					Linkify.addLinks(holder.message, Linkify.ALL);
+				}
+			}
+		
+			return v;
+		}
+
+		@Override
+		public boolean isEnabled(int position) {
+			return false;
+		}
+		
+		public Bundle formatMessage(Message message) {
+			Bundle rv = new Bundle();
+
+			switch (message.message_type) {
+			case Constants.MSGT_PRIVMSG:
+			case Constants.MSGT_PRIVATE_PRIVMSG:
+				rv.putString("sender", message.sender);
+				rv.putString("message", message.message);
+				break;		
+			case Constants.MSGT_ACTION:
+				rv.putString("message", " * " + message.sender + " " + message.message);
+				break;
+			case Constants.MSGT_NOTICE:
+				rv.putString("sender", message.sender);
+				rv.putString("message", message.message);
+				break;
+			case Constants.MSGT_TOPIC:
+				rv.putString("sender", message.sender);
+				rv.putString("message", message.message);
+				break;
+			case Constants.MSGT_EVENT:
+				rv.putString("sender", message.sender);
+				rv.putString("message", formatEvent(message));
+				break;
+			default:
+				rv.putString("message", message.message);
+				break;
+			}		
+			return rv;
+		}
+		
+		public String formatEvent(Message message) {
+			
+			try {
+				String[] params = message.message.split(":", 3);
+				MessageEventType eventType = MessageEventType.valueOf(params[0]);
+				
+				switch (eventType) {
+				case NICK:
+					return getString(R.string.event_nick, message.sender, params[1]);
+				case TOPIC:
+					return getString(R.string.event_topic, message.sender, message.message.replace("TOPIC:", ""));				
+				case MODE:
+					if (params[1].equals("")) {
+						return getString(R.string.event_mode_user, message.channel, params[2]);
+					} else {
+						return getString(R.string.event_mode_chan, message.sender, params[1], params[2]);
+					}				
+				case KICK:
+					return getString(R.string.event_kick, params[1], message.channel, message.sender, params[2]);				
+				case PART:
+					return getString(R.string.event_part, params[1], message.channel, params[2]);				
+				case JOIN:
+					return getString(R.string.event_join, params[1], params[2], message.channel);
+				case QUIT:
+					return getString(R.string.event_quit, message.sender, message.message.replace("QUIT:", ""));				
+				case DISCONNECT:
+					return getString(R.string.event_disconnect);				
+				case REQUEST_CONNECTION:
+					return getString(R.string.event_request_connection);
+				case CONNECTING:
+					return getString(R.string.event_connecting, params[1], params[2]);
+				case PING_REPLY:
+					return getString(R.string.event_ping_reply, message.sender, params[1]);
+				case NOTICE:
+					return "NOTICE/FIXME: " + message.message; // FIXME handle event NOTICE properly
+				case CTCP:
+					return getString(R.string.event_ctcp, params[1], params[2], message.sender);				
+				case CTCP_REPLY:
+					return getString(R.string.event_ctcp_reply, params[1], message.sender, params[2]);
+				case PING:
+					return getString(R.string.event_ping, params[1], message.sender);				
+				case CONNECT:
+					return getString(R.string.event_connect);
+				case TWITTER_MSG:
+					return "TWITTER_MSG/FIXME: " + message.message; // FIXME handle TWITTER_MSG
+				case UNKNOWN_CMD:
+					return getString(R.string.event_unknown_cmd, params[1]);
+				case ERROR:
+					return message.message.replace("ERROR:", "");
+				case SERVER_PONG:
+					return getString(R.string.event_server_pong, params[1]);
+				default:
+					Log.d(TAG, "formatEvent error:" + message.message);
+					return null;
+				}
+			} catch (IllegalArgumentException e) {
+				e.printStackTrace();
+				Log.d(TAG, "formatEvent error:" + message.message);
+				return message.message;
+			}
+		}
+	}
+
+	@Override
+	public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+		if (actionId == EditorInfo.IME_ACTION_SEND || actionId == EditorInfo.IME_NULL || 
+				event.getAction() == KeyEvent.ACTION_DOWN || event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+
+			String input = v.getText().toString();
+
+			if (input.length() > 0) {
+				m_activity.showProgressBar(true);
+
+				m_api.send(m_connectionId, m_channelName, input, new UpdateServiceApi.OnSendCompleted() {
+					@Override
+					public void onSendCompleted(JsonElement result) {
+						m_activity.showProgressBar(false);
+					}
+				});
+				
+				v.setText("");
+			}
+		}		
+		return true;
+	}
+
+	protected SpannableString rewriteEmoticons(SpannableString span) {
+		if (m_prefs.getBoolean("enable_emoticons", true)) {
+			for (String key : m_emoticonBitmaps.keySet()) {
+				Pattern pattern = Pattern.compile(Pattern.quote(key));
+		        Matcher matcher = pattern.matcher(span);
+		        
+		        while (matcher.find()) {
+					ImageSpan imgSpan = new ImageSpan(m_activity, m_emoticonBitmaps.get(key), ImageSpan.ALIGN_BOTTOM);
+
+		        	span.setSpan(imgSpan, matcher.start(), matcher.end(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+		        }						
+			}
+		}
+		
+		return span;
+	}
+}

+ 366 - 366
org.fox.ttirc/src/main/java/org/fox/ttirc/ChannelPager.java

@@ -1,366 +1,366 @@
-package org.fox.ttirc;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.viewpagerindicator.TitlePageIndicator;
-
-import org.fox.ttirc.backend.UpdateService;
-import org.fox.ttirc.backend.UpdateServiceApi;
-import org.fox.ttirc.backend.UpdateServiceListener;
-import org.fox.ttirc.types.Channel;
-import org.fox.ttirc.types.Connection;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-public class ChannelPager extends Fragment implements ChannelView {
-
-	private final String TAG = "ChannelPager";
-	private final String LISTENER_IDENT = "ChannelPager";
-	
-	private PagerAdapter m_adapter;
-	private SharedPreferences m_prefs;
-	
-	private boolean m_initialUpdate = true;
-	private int m_currentPage;
-	private ViewPager m_pager;
-	
-	private int m_connectionId;
-	private String m_channel;
-	
-	private List<ConnectionListEntry> m_connections = new ArrayList<ConnectionListEntry>();
-	private TitlePageIndicator m_indicator;
-	
-	private UpdateServiceApi m_api;
-	
-	private MainActivity m_activity;
-	
-	public UpdateServiceListener m_updateListener = new UpdateServiceListener() {
-		@Override
-		public void handleUpdate() {
-			//Log.i(TAG, "Received update request from the service");
-
-			if (m_api == null || m_activity == null)
-				return;
-
-			final List<Connection> connections = m_api.getConnections();
-
-			if (connections == null || getView() == null)
-				return;
-
-			m_connections.clear();
-
-			for (Connection conn : connections) {
-				try {
-					if (m_api == null)
-						return;
-					
-					Bundle counters = m_api.getCounters(conn.id, "---");
-
-					m_connections.add(new ConnectionListEntry(conn,
-							counters.getInt("unread")));
-
-					SortedMap<String, Channel> channels;
-					
-					try {
-						channels = new TreeMap<String, Channel>(m_api.getChannels(conn.id));
-					} catch (NullPointerException e) {
-						channels = null;
-					}
-
-					if (channels != null) {
-						for (String channel : channels.keySet()) {
-							Channel ichan = channels.get(channel);
-							
-							counters = m_api.getCounters(conn.id,
-									channel);
-
-							boolean isOffline = false;
-							
-							// 0 - C, 1 - P
-							if (ichan.chan_type == 1) {
-								isOffline = !conn.userhosts.containsKey(channel);
-							}
-
-							m_connections.add(new ConnectionListEntry(
-									conn.id, ichan, channel, counters
-											.getInt("unread"), isOffline));
-						}
-					}
-
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-
-			}
-			
-			m_activity.runOnUiThread(new Runnable() {
-				public void run() {
-					m_adapter.notifyDataSetChanged();
-
-					if (m_initialUpdate) {
-						m_pager.setCurrentItem(getItemPosition(m_connectionId, m_channel), false);
-						m_initialUpdate = false;
-					} else {
-						m_pager.setCurrentItem(m_currentPage, false);
-					}
-
-					m_adapter.notifyDataSetChanged();
-					m_indicator.invalidate();
-
-				}
-			});
-
-		}
-	};
-
-	
-	public ServiceConnection m_serviceConnection = new ServiceConnection() {
-		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {
-			Log.d(TAG, "Service connection established");
-			m_api = (UpdateServiceApi)service;