Merge pull request #77 from tobymurray/update-tooling

Update Gradle, Kotlin, and Gradle plug-in for Android

.gitignore

@@ -0,0 +1,10 @@
+/.idea
+*.iml
+*.apk
+app/release/
+.gradle
+/local.properties
+.DS_Store
+/build
+/captures
+.externalNativeBuild

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://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 <https://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
+<https://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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -0,0 +1,29 @@
+<a href="https://matrix.to/#/#smsmatrix:matrix.org">
+    <img src="https://img.shields.io/badge/Chat-On%20Matrix-green"
+        alt="Chat on Matrix"/>
+</a>
+
+# SmsMatrix
+A simple SMS (text message) &lt;--> Matrix bridge.
+
+This app bridges all sms messages to matrix. For every (new) text conversation contact the bot will open a private 1:1 room and sends the incoming messages to that room. Any messages sent in that room by the matrix user will then be sent to the contact via SMS.  
+As currently there is no end-to-end encryption implemented in this app, for privacy reasons it is preferable to use it with your own Matrix server. Your data-in-transit however will always be safe as they are encrypted using https over matrix -- provided the Matrix server is configured properly.
+
+<a href="https://f-droid.org/app/eu.droogers.smsmatrix">
+    <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+        alt="Get it on F-Droid" height="80"/>
+</a>
+
+# Set up
+- Create an account on a homeserver
+- Install this app (apk can be found by [releases](https://github.com/tijder/SmsMatrix/releases) or from [f-droid](https://f-droid.org/app/eu.droogers.smsmatrix))
+- Give the app the app permission
+- Type in the needed info in the app
+  - Bot Username: is the username of the just created user
+  - Bot Password: is the password of the just created user
+  - Homeserver url: is the url of the homeserver where the user is created
+  - Your username: is where you want to forward all your text messages to
+  - Devicename: is the devicename wich the api will use
+- Press save
+- Now all your text messages will be bridged
+- [optional] Disable battery optimisations for the app. so the app wont be killed by Android.

app/build.gradle

@@ -1,15 +1,18 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'realm-android'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 29
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "eu.droogers.smsmatrix"
         minSdkVersion 23
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 29
+        versionCode 16
+        versionName "0.0.16"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -23,21 +26,33 @@ android {
             dir 'libs'
         }
     }
+
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.preference:preference:1.1.0'
+
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'
 
-    compile(name: 'matrix-sdk', ext: 'aar')
-    compile(name: 'olm-sdk', ext: 'aar')
+    /************* Matrix SDK management **************/
+    implementation 'com.github.Bubu:matrix-android-sdk:v0.9.30-no-webrtc'
 
-    compile 'com.squareup.retrofit:retrofit:1.6.1'
-    compile 'com.google.code.gson:gson:2.3'
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.2.0'
-    compile 'com.squareup.okhttp:okhttp:2.2.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.squareup.retrofit2:retrofit:2.6.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.3'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.3'
+    implementation 'com.facebook.stetho:stetho:1.5.0'
+    implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'
 }

app/src/androidTest/java/eu/droogers/smsmatrix/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package eu.droogers.smsmatrix;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/AndroidManifest.xml

@@ -3,9 +3,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="eu.droogers.smsmatrix">
 
+    <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         tools:replace="allowBackup,label"
@@ -23,10 +26,16 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name="eu.droogers.smsmatrix.SmsListener">
+        <receiver android:name="eu.droogers.smsmatrix.ReceiverListener">
             <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PHONE_STATE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
         </receiver>
 
         <service android:name="eu.droogers.smsmatrix.MatrixService" />

app/src/main/java/eu/droogers/smsmatrix/EventListener.java

@@ -6,8 +6,10 @@ import org.matrix.androidsdk.data.MyUser;
 import org.matrix.androidsdk.data.RoomState;
 import org.matrix.androidsdk.listeners.IMXEventListener;
 import org.matrix.androidsdk.rest.model.Event;
+import org.matrix.androidsdk.core.model.MatrixError;
 import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.rest.model.bingrules.BingRule;
+import org.matrix.androidsdk.rest.model.sync.AccountDataElement;
 
 import java.util.List;
 
@@ -51,11 +53,11 @@ public class EventListener implements IMXEventListener {
 
     @Override
     public void onLiveEvent(Event event, RoomState roomState) {
-        if (loaded == true) {
+        if (loaded) {
 //            mx.getUnreadEvents();
             mx.sendEvent(event);
         }
-        Log.e(TAG, "onLiveEvent: " + event + " " + event.getSender() + " : " + event.getContent());
+        Log.e(TAG, "onLiveEvent: " + event);
     }
 
     @Override
@@ -69,12 +71,7 @@ public class EventListener implements IMXEventListener {
     }
 
     @Override
-    public void onEventEncrypted(Event event) {
-
-    }
-
-    @Override
-    public void onEventDecrypted(Event event) {
+    public void onEventSentStateUpdated(Event event) {
 
     }
 
@@ -84,7 +81,7 @@ public class EventListener implements IMXEventListener {
     }
 
     @Override
-    public void onFailedSendingEvent(Event event) {
+    public void onEventDecrypted(String s, String s1) {
 
     }
 
@@ -100,6 +97,11 @@ public class EventListener implements IMXEventListener {
         mx.getUnreadEvents();
     }
 
+    @Override
+    public void onSyncError(MatrixError matrixError) {
+
+    }
+
     @Override
     public void onCryptoSyncComplete() {
 
@@ -120,21 +122,26 @@ public class EventListener implements IMXEventListener {
 
     }
 
-    @Override
-    public void onRoomInitialSyncComplete(String s) {
-
-    }
-
     @Override
     public void onRoomInternalUpdate(String s) {
 
     }
 
+    @Override
+    public void onNotificationCountUpdate(String s) {
+
+    }
+
     @Override
     public void onLeaveRoom(String s) {
 
     }
 
+    @Override
+    public void onRoomKick(String s) {
+
+    }
+
     @Override
     public void onReceiptEvent(String s, List<String> list) {
 
@@ -154,4 +161,44 @@ public class EventListener implements IMXEventListener {
     public void onToDeviceEvent(Event event) {
 
     }
+
+    @Override
+    public void onNewGroupInvitation(String s) {
+
+    }
+
+    @Override
+    public void onJoinGroup(String s) {
+
+    }
+
+    @Override
+    public void onLeaveGroup(String s) {
+
+    }
+
+    @Override
+    public void onGroupProfileUpdate(String s) {
+
+    }
+
+    @Override
+    public void onGroupRoomsListUpdate(String s) {
+
+    }
+
+    @Override
+    public void onGroupUsersListUpdate(String s) {
+
+    }
+
+    @Override
+    public void onGroupInvitedUsersListUpdate(String s) {
+
+    }
+
+    @Override
+    public void onAccountDataUpdated(AccountDataElement accountDataElement) {
+
+    }
 }

app/src/main/java/eu/droogers/smsmatrix/MMSMonitor.java

@@ -0,0 +1,302 @@
+package eu.droogers.smsmatrix;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Message;
+import android.provider.Telephony;
+import android.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class MMSMonitor {
+    private MatrixService mainActivity;
+    private ContentResolver contentResolver = null;
+    private Context mainContext;
+    private Handler mmshandler = null;
+    private ContentObserver mmsObserver = null;
+    public boolean monitorStatus = false;
+    private int mmsCount = 0;
+    private static final String TAG = "MMSMonitor";
+
+    public MMSMonitor(final MatrixService mainActivity, final Context mainContext) {
+        this.mainActivity = mainActivity;
+        contentResolver = mainActivity.getContentResolver();
+        this.mainContext = mainContext;
+        mmshandler = new MMSHandler();
+        mmsObserver = new MMSObserver(mmshandler);
+        Log.i(TAG, "***** Start MMS Monitor *****");
+    }
+
+
+    public void startMMSMonitoring() {
+        try {
+            monitorStatus = false;
+            if (!monitorStatus) {
+                contentResolver.registerContentObserver(
+                    Uri.parse("content://mms"),
+                    true,
+                    mmsObserver
+                );
+
+                // Save the count of MMS messages on start-up.
+                Uri uriMMSURI = Uri.parse("content://mms-sms");
+                Cursor mmsCur = mainActivity.getContentResolver().query(
+                    uriMMSURI,
+                    null,
+                    Telephony.Mms.MESSAGE_BOX + " = " + Telephony.Mms.MESSAGE_BOX_INBOX,
+                    null,
+                    Telephony.Mms._ID
+                );
+                if (mmsCur != null && mmsCur.getCount() > 0) {
+                    mmsCount = mmsCur.getCount();
+                    Log.d(TAG, "Init MMSCount = " + mmsCount);
+                }
+            }
+        } catch (Exception e) {
+            Log.e(TAG, e.getMessage());
+        }
+    }
+
+
+    public void stopMMSMonitoring() {
+        try {
+            monitorStatus = false;
+            if (!monitorStatus){
+                contentResolver.unregisterContentObserver(mmsObserver);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, e.getMessage());
+        }
+    }
+
+
+    class MMSHandler extends Handler {
+        public void handleMessage(final Message msg) {
+            //Log.i(TAG, "Handler");
+        }
+    }
+
+
+    class MMSObserver extends ContentObserver {
+        private Handler mms_handle = null;
+        public MMSObserver(final Handler mmshandle) {
+            super(mmshandle);
+            mms_handle = mmshandle;
+        }
+
+        public void onChange(final boolean bSelfChange) {
+            super.onChange(bSelfChange);
+            Log.i(TAG, "Onchange");
+
+            try {
+                monitorStatus = true;
+
+                // Send message to Activity.
+                Message msg = new Message();
+                mms_handle.sendMessage(msg);
+
+                // Get the MMS count.
+                Uri uriMMSURI = Uri.parse("content://mms/");
+                Cursor mmsCur = mainActivity.getContentResolver().query(
+                    uriMMSURI,
+                    null,
+                    Telephony.Mms.MESSAGE_BOX + " = " + Telephony.Mms.MESSAGE_BOX_INBOX,
+                    null,
+                    Telephony.Mms._ID
+                );
+
+                int currMMSCount = 0;
+                if (mmsCur != null && mmsCur.getCount() > 0) {
+                    currMMSCount = mmsCur.getCount();
+                }
+
+                // Proceed if there is a new message.
+                if (currMMSCount > mmsCount) {
+                    mmsCount = currMMSCount;
+                    mmsCur.moveToLast();
+
+                    // Get the message id and subject.
+                    String subject = mmsCur.getString(mmsCur.getColumnIndex(Telephony.Mms.SUBJECT));
+                    int id = Integer.parseInt(mmsCur.getString(mmsCur.getColumnIndex(Telephony.Mms._ID)));
+                    Log.d(TAG, "_id = " + id);
+                    Log.d(TAG, "Subject = " + subject);
+
+                    byte[] mediaData = null;
+                    String message = "";
+                    String address = "";
+                    String fileName = "";
+                    String fileType = "";
+                    String messageType = "";
+
+                    // Get parts.
+                    Uri uriMMSPart = Uri.parse("content://mms/part");
+                    Cursor curPart = mainActivity.getContentResolver().query(
+                        uriMMSPart,
+                        null,
+                        Telephony.Mms.Part.MSG_ID + " = " + id,
+                        null,
+                        Telephony.Mms.Part._ID
+                    );
+                    Log.d(TAG, "Parts records length = " + curPart.getCount());
+                    curPart.moveToLast();
+                    do {
+                        String contentType = curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part.CONTENT_TYPE));
+                        String partId = curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part._ID));
+                        fileName = curPart.getString(curPart.getColumnIndex(Telephony.Mms.Part.NAME));
+                        Log.d(TAG, "partId = " + partId);
+                        Log.d(TAG, "Part mime type = " + contentType);
+
+                        if (contentType.equalsIgnoreCase("text/plain"))
+                        {
+                            // Get the message.
+
+                            Log.i(TAG,"==== Get the message start ====");
+                            messageType = Matrix.MESSAGE_TYPE_TEXT;
+                            byte[] messageData = readMMSPart(partId);
+                            if (messageData != null && messageData.length > 0) {
+                                message = new String(messageData);
+                            }
+
+                            if (message.isEmpty()) {
+                                Cursor curPart1 = mainActivity.getContentResolver().query(
+                                    uriMMSPart,
+                                    null,
+                                    Telephony.Mms.Part.MSG_ID + " = " + id + " and "+ Telephony.Mms.Part._ID + " = " + partId,
+                                    null,
+                                    Telephony.Mms.Part._ID
+                                );
+                                for (int i = 0; i < curPart1.getColumnCount(); i++)
+                                {
+                                    Log.d(TAG,"Column Name : " + curPart1.getColumnName(i));
+                                }
+                                curPart1.moveToLast();
+                                message = curPart1.getString(13);
+                            }
+                            Log.d(TAG,"Txt Message = " + message);
+                        } else if (isImageType(contentType) || isVideoType(contentType)) {
+                            // Get the media.
+
+                            if (isImageType(contentType)) {
+                                messageType = Matrix.MESSAGE_TYPE_IMAGE;
+                            } else if (isVideoType(contentType)) {
+                                messageType = Matrix.MESSAGE_TYPE_VIDEO;
+                            }
+                            Log.i(TAG, "==== Get the media start ====");
+                            fileType = contentType;
+                            mediaData = readMMSPart(partId);
+                            Log.i(TAG, "Media data length == " + mediaData.length);
+                        }
+                    } while (curPart.moveToPrevious());
+
+
+
+                    // Get the sender's address.
+                    Uri uriMMSAddr = Uri.parse("content://mms/" + id + "/addr");
+                    Cursor addrCur = mainActivity.getContentResolver().query(
+                        uriMMSAddr,
+                        null,
+                        Telephony.Mms.Addr.TYPE + " = 137",     // PduHeaders.FROM
+                        null,
+                        Telephony.Mms.Addr._ID
+                    );
+                    if (addrCur != null) {
+                        addrCur.moveToLast();
+                        do{
+                            Log.d(TAG, "addrCur records length = " + addrCur.getCount());
+                            if (addrCur.getCount() > 0) {
+                                address = addrCur.getString(addrCur.getColumnIndex(Telephony.Mms.Addr.ADDRESS));
+                            }
+                            Log.d(TAG, "address = " + address);
+
+                            if (!message.isEmpty()) {
+                                Utilities.sendMatrix(mainActivity, message, address, messageType);
+                            }
+                            if (mediaData != null) {
+                                Utilities.sendMatrix(
+                                    mainActivity,
+                                    mediaData,
+                                    address,
+                                    messageType,
+                                    fileName,
+                                    fileType
+                                );
+                            }
+                        } while (addrCur.moveToPrevious());
+                    }
+                }
+
+            } catch (Exception e) {
+                Log.e(TAG, e.getMessage());
+            }
+        }
+    }
+
+
+    private byte[] readMMSPart(String partId) {
+        byte[] partData = null;
+        Uri partURI = Uri.parse("content://mms/part/" + partId);
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        InputStream is = null;
+
+        try {
+
+            Log.i(TAG,"Entered into readMMSPart try.");
+            ContentResolver mContentResolver = mainActivity.getContentResolver();
+            is = mContentResolver.openInputStream(partURI);
+
+            byte[] buffer = new byte[256];
+            int len = is.read(buffer);
+            while (len >= 0) {
+                baos.write(buffer, 0, len);
+                len = is.read(buffer);
+            }
+            partData = baos.toByteArray();
+            //Log.i(TAG, "Text Msg  :: " + new String(partData));
+
+        } catch (IOException e) {
+            Log.e(TAG, "Exception == Failed to load part data");
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Exception :: Failed to close stream");
+                }
+            }
+        }
+        return partData;
+    }
+
+
+    private boolean isImageType(String mime) {
+        boolean result = false;
+        if (mime.equalsIgnoreCase("image/jpg")
+            || mime.equalsIgnoreCase("image/jpeg")
+            || mime.equalsIgnoreCase("image/png")
+            || mime.equalsIgnoreCase("image/gif")
+            || mime.equalsIgnoreCase("image/bmp")) {
+            result = true;
+        }
+        return result;
+    }
+
+
+    private boolean isVideoType(String mime) {
+        boolean result = false;
+        if (mime.equalsIgnoreCase("video/3gpp")
+            || mime.equalsIgnoreCase("video/3gpp2")
+            || mime.equalsIgnoreCase("video/avi")
+            || mime.equalsIgnoreCase("video/mp4")
+            || mime.equalsIgnoreCase("video/mpeg")
+            || mime.equalsIgnoreCase("video/webm")) {
+            result = true;
+        }
+        return result;
+    }
+}

app/src/main/java/eu/droogers/smsmatrix/MainActivity.java

@@ -4,12 +4,22 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import static android.Manifest.permission.READ_CONTACTS;
+import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+import static android.Manifest.permission.READ_PHONE_STATE;
+import static android.Manifest.permission.READ_SMS;
+import static android.Manifest.permission.RECEIVE_SMS;
+import static android.Manifest.permission.SEND_SMS;
 import static android.content.ContentValues.TAG;
 
 public class MainActivity extends Activity {
@@ -20,6 +30,12 @@ public class MainActivity extends Activity {
     private EditText username;
     private EditText device;
     private EditText hsUrl;
+    private EditText syncDelay;
+    private EditText syncTimeout;
+    private static final String[] PERMISSIONS_REQUIRED = new String[]{
+        READ_SMS, SEND_SMS, RECEIVE_SMS, READ_PHONE_STATE, READ_CONTACTS, READ_EXTERNAL_STORAGE
+    };
+    private static final int PERMISSION_REQUEST_CODE = 200;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -32,33 +48,64 @@ public class MainActivity extends Activity {
         username = (EditText) findViewById(R.id.editText_username);
         device = (EditText) findViewById(R.id.editText_device);
         hsUrl = (EditText) findViewById(R.id.editText_hsUrl);
+        syncDelay = (EditText) findViewById(R.id.editText_syncDelay);
+        syncTimeout = (EditText) findViewById(R.id.editText_syncTimeout);
 
         botUsername.setText(sp.getString("botUsername", ""));
         botPassword.setText(sp.getString("botPassword", ""));
         username.setText(sp.getString("username", ""));
         device.setText(sp.getString("device", ""));
         hsUrl.setText(sp.getString("hsUrl", ""));
+        syncDelay.setText(sp.getString("syncDelay", "12"));
+        syncTimeout.setText(sp.getString("syncTimeout", "30"));
 
 
         Button saveButton = (Button) findViewById(R.id.button_save);
         saveButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                SharedPreferences.Editor editor = sp.edit();
-                editor.putString("botUsername", botUsername.getText().toString());
-                editor.putString("botPassword", botPassword.getText().toString());
-                editor.putString("username", username.getText().toString());
-                editor.putString("device", device.getText().toString());
-                editor.putString("hsUrl", hsUrl.getText().toString());
-                editor.apply();
+                if (!checkPermissions()) {
+                    askPermissions();
+                } else {
+                    SharedPreferences.Editor editor = sp.edit();
+                    editor.putString("botUsername", botUsername.getText().toString());
+                    editor.putString("botPassword", botPassword.getText().toString());
+                    editor.putString("username", username.getText().toString());
+                    editor.putString("device", device.getText().toString());
+                    editor.putString("hsUrl", hsUrl.getText().toString());
+                    editor.putString("syncDelay", syncDelay.getText().toString());
+                    editor.putString("syncTimeout", syncTimeout.getText().toString());
+                    editor.apply();
+
+                    Log.e(TAG, "onClick: " + botUsername.getText().toString() );
+                    startService();
+                }
 
-                Log.e(TAG, "onClick: " + botUsername.getText().toString() );
-                startService();
             }
         });
-        startService();
+        if (!checkPermissions()) {
+            askPermissions();
+        } else {
+            startService();
+        }
     }
 
+    private boolean checkPermissions() {
+        for (String permission: PERMISSIONS_REQUIRED) {
+            int result = ContextCompat.checkSelfPermission(getApplicationContext(), permission);
+            if (result  != PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+            Log.i(TAG, "setOnClickListener - result result result" + result);
+        }
+        return true;
+    }
+
+    private void askPermissions() {
+        ActivityCompat.requestPermissions(this, PERMISSIONS_REQUIRED, PERMISSION_REQUEST_CODE);
+    }
+
+
     private void startService() {
         Intent intent = new Intent(this, MatrixService.class);
         startService(intent);

app/src/main/java/eu/droogers/smsmatrix/Matrix.java

@@ -1,11 +1,19 @@
 package eu.droogers.smsmatrix;
 
 import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
 import android.net.Uri;
+import android.provider.ContactsContract;
 import android.telephony.SmsManager;
 import android.util.Log;
+import android.widget.Toast;
+
 
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+import org.json.JSONException;
 
 import org.matrix.androidsdk.HomeServerConnectionConfig;
 import org.matrix.androidsdk.MXDataHandler;
@@ -16,15 +24,21 @@ import org.matrix.androidsdk.data.store.IMXStoreListener;
 import org.matrix.androidsdk.data.store.MXFileStore;
 import org.matrix.androidsdk.data.store.MXMemoryStore;
 import org.matrix.androidsdk.listeners.IMXEventListener;
-import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.listeners.MXMediaUploadListener;
+import org.matrix.androidsdk.core.callback.SimpleApiCallback;
+import org.matrix.androidsdk.core.model.MatrixError;
 import org.matrix.androidsdk.rest.client.LoginRestClient;
+import org.matrix.androidsdk.rest.model.CreatedEvent;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.rest.model.login.Credentials;
 
+import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static android.content.ContentValues.TAG;
 
@@ -33,6 +47,8 @@ import static android.content.ContentValues.TAG;
  */
 
 public class Matrix {
+    private final int syncDelay;
+    private final int syncTimeout;
     HomeServerConnectionConfig hsConfig;
     Context context;
     MXSession session;
@@ -43,27 +59,56 @@ public class Matrix {
     private IMXEventListener evLis;
     IMXStore store;
     String deviceName;
+    private String botUsername;
+    private String botHSUrl;
 
     private String realUserid;
 
-    public Matrix (final Context context, String url, String botUsername, String botPassword, String username, String device) {
+    // Message type constants.
+    public static final String MESSAGE_TYPE_TEXT = "m.text";
+    public static final String MESSAGE_TYPE_IMAGE = "m.image";
+    public static final String MESSAGE_TYPE_VIDEO = "m.video";
+    public static final String MESSAGE_TYPE_NOTICE = "m.notice";
+
+    public Matrix(final Context context, String url, String botUsername, String botPassword, String username, String device, String syncDelay, String syncTimeout) {
         this.context = context;
-        hsConfig = new HomeServerConnectionConfig(Uri.parse(url));
+
+        HomeServerConnectionConfig.Builder builder = new HomeServerConnectionConfig.Builder();
+
+        hsConfig = builder.withHomeServerUri(Uri.parse(url)).build();
 
         realUserid = username;
         deviceName = device;
+        this.botUsername = botUsername;
+        botHSUrl = url;
+        this.syncDelay = Integer.parseInt(syncDelay);
+        this.syncTimeout = Integer.parseInt(syncTimeout);
 
         login(botUsername, botPassword);
     }
 
     private void login(String username, String password) {
-        new LoginRestClient(hsConfig).loginWithUser(username, password, deviceName, new SimpleApiCallback<Credentials>() {
+        new LoginRestClient(hsConfig).loginWithUser(username, password, deviceName, deviceName, new SimpleApiCallback<Credentials>() {
 
             @Override
             public void onSuccess(Credentials credentials) {
-                super.onSuccess(credentials);
                 onLogin(credentials);
             }
+
+            @Override
+            public void onMatrixError(MatrixError e) {
+                Log.e(TAG, "onLogin MatrixError" + e);
+            }
+
+            @Override
+            public void onNetworkError(Exception e) {
+                Log.e(TAG, "onLogin Network error" + e);
+            }
+
+            @Override
+            public void onUnexpectedError(Exception e) {
+                Log.e(TAG, "onLogin Unexpected error" + e);
+            }
         });
     }
 
@@ -77,7 +122,7 @@ public class Matrix {
 
 
         if (false) {
-            store = new MXFileStore(hsConfig, context);
+            store = new MXFileStore(hsConfig, false, context);
         } else {
             store = new MXMemoryStore(hsConfig.getCredentials(), context);
         }
@@ -86,15 +131,16 @@ public class Matrix {
 
 //        NetworkConnectivityReceiver nwMan = new NetworkConnectivityReceiver();
 
-        session = new MXSession(hsConfig, dh, context);
-        session.setSyncDelay(12000);
-        session.setSyncTimeout(30*60*1000);
+        MXSession.Builder builder = new MXSession.Builder(hsConfig, dh, context);
+
+        session = builder.build();
+        session.setSyncDelay(syncDelay * 1000);
+        session.setSyncTimeout(syncTimeout * 60 * 1000);
         Log.e(TAG, "onLogin:" + session.getSyncTimeout());
 
 
 
         if (store.isReady()) {
-            session.getDataHandler().checkPermanentStorageData();
             session.startEventStream(store.getEventStreamToken());
             session.getDataHandler().addListener(evLis);
         } else {
@@ -106,7 +152,6 @@ public class Matrix {
 
                 @Override
                 public void onStoreReady(String s) {
-                    session.getDataHandler().checkPermanentStorageData();
                     session.startEventStream(store.getEventStreamToken());
                     session.getDataHandler().addListener(evLis);
                 }
@@ -129,33 +174,116 @@ public class Matrix {
         }
     }
 
-    public void sendMessage(final String phoneNumber, final String body) {
+    public void sendMessage(final String phoneNumber, final String body, final String type) {
         if (session != null && session.isAlive()) {
             Room room = getRoomByPhonenumber(phoneNumber);
             if (room == null) {
-                Log.e(TAG, "sendMessage: not found" );
-                session.createRoomDirectMessage(realUserid, new SimpleApiCallback<String>() {
-                    @Override
-                    public void onSuccess(String info) {
-                        super.onSuccess(info);
-                        session.getRoomsApiClient().updateTopic(info, phoneNumber, new SimpleApiCallback<Void>());
-                        SendMesageToRoom(store.getRoom(info), body);
-                    }
-                });
+                if (!type.equals("m.notice")) {
+                    Log.e(TAG, "sendMessage: not found" );
+                    session.createDirectMessageRoom(realUserid, new SimpleApiCallback<String>() {
+                        @Override
+                        public void onSuccess(String info) {
+                            session.getRoomsApiClient().updateTopic(info, phoneNumber, new SimpleApiCallback<Void>() {
+                                @Override
+                                public void onSuccess(Void aVoid) {
+
+                                }
+                            });
+
+                            changeDisplayname(info, getContactName(phoneNumber, context));
+                            Room room = store.getRoom(info);
+                            SendMesageToRoom(room, body, type);
+                        }
+                    });
+                }
             } else {
-                SendMesageToRoom(room, body);
+                changeDisplayname(room.getRoomId(), getContactName(phoneNumber, context));
+                SendMesageToRoom(room, body, type);
             }
         } else {
             Log.e(tag, "Error with sending message");
-            notSendMesages.add(new NotSendMesage(phoneNumber, body));
+            notSendMesages.add(new NotSendMesage(phoneNumber, body, type));
         }
     }
 
-    public void SendMesageToRoom(Room room, String body) {
+    public void sendFile(
+        final String phoneNumber,
+        final byte[] body,
+        final String type,
+        final String fileName,
+        final String contentType
+    ) {
+        String uploadID = String.valueOf(transaction);
+        transaction++;
+        session.getMediaCache().uploadContent(
+            new ByteArrayInputStream(body),
+            fileName,
+            contentType,
+            uploadID,
+            new MXMediaUploadListener()
+            {
+                @Override
+                public void onUploadComplete(final String uploadId, final String contentUri) {
+                    Room room = getRoomByPhonenumber(phoneNumber);
+                    JsonObject json = new JsonObject();
+                    json.addProperty("body", fileName);
+                    json.addProperty("msgtype", type);
+                    json.addProperty("url", contentUri);
+                    JsonObject info = new JsonObject();
+                    info.addProperty("mimetype", contentType);
+                    json.add("info", info);
+                    session.getRoomsApiClient().sendEventToRoom(
+                        String.valueOf(transaction),
+                        room.getRoomId(),
+                        "m.room.message",
+                        json,
+                        new SimpleApiCallback<CreatedEvent>() {
+                            @Override
+                            public void onSuccess(CreatedEvent createdEvent) {
+
+                            }
+                        }
+                    );
+                    transaction++;
+                }
+            }
+        );
+    }
+
+    private void changeDisplayname(String roomId, String displayname) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("displayname", displayname);
+        params.put("membership", "join");
+        session.getRoomsApiClient().sendStateEvent(roomId, "m.room.member", session.getMyUserId(), params, new SimpleApiCallback<Void>() {
+            @Override
+            public void onSuccess(Void aVoid) {
+
+            }
+        });
+    }
+
+    public void SendMesageToRoom(Room room, String body, String type) {
         Message msg = new Message();
         msg.body = body;
-        msg.msgtype = "m.mesage";
-        session.getRoomsApiClient().sendMessage(String.valueOf(transaction), room.getRoomId(), msg, new SimpleApiCallback<Event>());
+        msg.msgtype = type;
+        session.getRoomsApiClient().sendMessage(String.valueOf(transaction), room.getRoomId(), msg, new SimpleApiCallback<CreatedEvent>() {
+            @Override
+            public void onSuccess(CreatedEvent createdEvent) {
+                    Log.e(TAG, "sendMessage success");
+            }
+            @Override
+            public void onMatrixError(MatrixError e) {
+                Log.e(TAG, "sendMessage MatrixError" + e);
+            }
+            @Override
+            public void onNetworkError(Exception e) {
+                Log.e(TAG, "sendMessage Network error" + e);
+            }
+            @Override
+            public void onUnexpectedError(Exception e) {
+                Log.e(TAG, "sendMessage Unexpected error" + e);
+            }
+        });
         transaction++;
     }
 
@@ -173,13 +301,46 @@ public class Matrix {
     }
 
     public void sendEvent(Event event) {
-        if (event.sender.equals(realUserid)) {
+        if ((event.sender != null) && (event.sender.equals(realUserid))) {
             Room room = store.getRoom(event.roomId);
-            JsonElement json = event.getContent();
-            String body = json.getAsJsonObject().get("body").getAsString();
             SmsManager smsManager = SmsManager.getDefault();
-            smsManager.sendTextMessage(room.getTopic(), null, body, null, null);
-            room.markAllAsRead(new SimpleApiCallback<Void>());
+            JsonObject json = event.getContent().getAsJsonObject();
+            
+            if (event.type.equals("m.room.message")) {
+                if (json.get("msgtype").getAsString().equals(MESSAGE_TYPE_TEXT)) {
+                    ArrayList<String> body = smsManager.divideMessage(json.get("body").getAsString());
+                    smsManager.sendMultipartTextMessage(room.getTopic(), null, body, null, null);
+                } else {
+                    ArrayList<String> url = smsManager.divideMessage(session.getContentManager().getDownloadableUrl(json.get("url").getAsString()));
+                    smsManager.sendMultipartTextMessage(room.getTopic(), null, url, null, null);
+                }
+            } else if (event.type.equals("m.room.member")) {
+                if (json.get("membership").getAsString().equals("leave")) {
+                    room.leave(new SimpleApiCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void aVoid) {
+
+                        }
+                    });
+                } else if (json.get("membership").getAsString().equals("invite")) {
+                    room.join(new SimpleApiCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void aVoid) {
+
+                        }
+                    });
+                }
+            } else {
+                Log.e(TAG, "sendEvent: Event type not supported ");
+            }
+
+
+            room.markAllAsRead(new SimpleApiCallback<Void>() {
+                @Override
+                public void onSuccess(Void aVoid) {
+
+                }
+            });
         }
     }
 
@@ -191,11 +352,11 @@ public class Matrix {
 
     public void sendMessageList(List<NotSendMesage> messages) {
         for (NotSendMesage ms : messages) {
-            sendMessage(ms.getPhone(), ms.getBody());
+            sendMessage(ms.getPhone(), ms.getBody(), ms.getType());
         }
     }
 
-    public Room getRoomByPhonenumber (String number) {
+    private Room getRoomByPhonenumber (String number) {
         Collection<Room> rooms = store.getRooms();
         Log.e(TAG, "getRoomByPhonenumber: " + number );
         Log.e(TAG, "getRoomByPhonenumber: " + rooms.size() );
@@ -208,6 +369,29 @@ public class Matrix {
         return null;
     }
 
+    private String getContactName(final String phoneNumber, Context context)
+    {
+        Uri uri=Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI,Uri.encode(phoneNumber));
+
+        String[] projection = new String[]{ContactsContract.PhoneLookup.DISPLAY_NAME};
+
+        String contactName="";
+        Cursor cursor=context.getContentResolver().query(uri,projection,null,null,null);
+
+        if (cursor != null) {
+            if(cursor.moveToFirst()) {
+                contactName=cursor.getString(0);
+            }
+            cursor.close();
+        }
+
+        if (contactName.isEmpty()) {
+            contactName = phoneNumber;
+        }
+
+        return contactName;
+    }
+
     public void destroy() {
         session.stopEventStream();
         dh.removeListener(evLis);

app/src/main/java/eu/droogers/smsmatrix/MatrixService.java

@@ -1,14 +1,22 @@
 package eu.droogers.smsmatrix;
 
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.os.Build;
 import android.os.IBinder;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
+
 /**
  * Created by gerben on 7-10-17.
  */
@@ -21,6 +29,10 @@ public class MatrixService extends Service {
     private String username;
     private String device;
     private String hsUrl;
+    private String syncDelay;
+    private String syncTimeout;
+    private MMSMonitor mms;
+    private String mChannelId = "";
 
     @Override
     public void onCreate() {
@@ -29,33 +41,83 @@ public class MatrixService extends Service {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
+            if (mChannelId.isEmpty()) {
+                mChannelId = createNotificationChannel("sync", "Sync Service");
+            }
+            NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, mChannelId);
+            Notification notification = notificationBuilder.setOngoing(true)
+                    .setSmallIcon(R.mipmap.ic_launcher)
+                    .setContentText(getApplicationInfo().loadLabel(getPackageManager()))
+                    .setPriority(NotificationCompat.PRIORITY_MIN)
+                    .setCategory(Notification.CATEGORY_SERVICE)
+                    .build();
+            startForeground(1, notification);
+        }
+
         SharedPreferences sp = getSharedPreferences("settings", Context.MODE_PRIVATE);
         botUsername = sp.getString("botUsername", "");
         botPassword = sp.getString("botPassword", "");
         username = sp.getString("username", "");
         device = sp.getString("device", "");
         hsUrl = sp.getString("hsUrl", "");
+        syncDelay = sp.getString("syncDelay", "12");
+        syncTimeout = sp.getString("syncTimeout", "60");
 
-        if (mx == null && !botUsername.isEmpty() && !botPassword.isEmpty() && !username.isEmpty() && !device.isEmpty() && !hsUrl.isEmpty()) {
-            mx = new Matrix(getApplication(), hsUrl, botUsername, botPassword, username, device);
-            Log.e(TAG, "onStartCommand222: " + hsUrl );
+        if (mx == null && !botUsername.isEmpty() && !botPassword.isEmpty() && !username.isEmpty() && !device.isEmpty() && !hsUrl.isEmpty() && !syncDelay.isEmpty() && !syncTimeout.isEmpty()) {
+            mx = new Matrix(getApplication(), hsUrl, botUsername, botPassword, username, device, syncDelay, syncTimeout);
+            Log.e(TAG, "onStartCommand: " + hsUrl );
             Toast.makeText(this, "service starting:", Toast.LENGTH_SHORT).show();
+        } else if (mx == null) {
+            Toast.makeText(this, "Missing Information", Toast.LENGTH_SHORT).show();
         }
 
         Log.e(TAG, "onStartCommand: Service");
 
         String phone = intent.getStringExtra("SendSms_phone");
-        String body = intent.getStringExtra("SendSms_body");
+        String type = intent.getStringExtra("SendSms_type");
         if (phone != null) {
-            mx.sendMessage(phone, body);
+            System.out.println(phone);
+            if (type.equals(Matrix.MESSAGE_TYPE_TEXT) || type.equals(Matrix.MESSAGE_TYPE_NOTICE))
+            {
+                String body = intent.getStringExtra("SendSms_body");
+                mx.sendMessage(phone, body, type);
+            } else if (type.equals(Matrix.MESSAGE_TYPE_IMAGE) || type.equals(Matrix.MESSAGE_TYPE_VIDEO)) {
+                byte[] body = intent.getByteArrayExtra("SendSms_body");
+                String fileName = intent.getStringExtra("SendSms_fileName");
+                String contentType = intent.getStringExtra("SendSms_contentType");
+                mx.sendFile(phone, body, type, fileName, contentType);
+            }
         }
+
+        if (this.mms == null) {
+            this.mms = new MMSMonitor(this , getApplicationContext());
+            this.mms.startMMSMonitoring();
+        }
+
         return START_NOT_STICKY;
 
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private String createNotificationChannel(String channelId, String channelName){
+        NotificationChannel chan = new NotificationChannel(channelId,
+                channelName, NotificationManager.IMPORTANCE_NONE);
+        chan.setLightColor(Color.BLUE);
+        chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+        NotificationManager service = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        service.createNotificationChannel(chan);
+        return channelId;
+    }
+
     @Override
     public void onDestroy() {
-        mx.destroy();
+        if (mx != null) {
+            mx.destroy();
+        }
+        this.mms.stopMMSMonitoring();
+        this.mms = null;
         super.onDestroy();
     }
 

app/src/main/java/eu/droogers/smsmatrix/NotSendMesage.java

@@ -5,12 +5,14 @@ package eu.droogers.smsmatrix;
  */
 
 class NotSendMesage {
+    private String type;
     private String phone;
     private String body;
 
-    public NotSendMesage(String phone, String body) {
+    public NotSendMesage(String phone, String body, String type) {
         this.phone = phone;
         this.body = body;
+        this.type = type;
     }
 
     public String getPhone() {
@@ -20,4 +22,8 @@ class NotSendMesage {
     public String getBody() {
         return body;
     }
+
+    public String getType() {
+        return type;
+    }
 }

app/src/main/java/eu/droogers/smsmatrix/ReceiverListener.java

@@ -0,0 +1,90 @@
+package eu.droogers.smsmatrix;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.SmsMessage;
+import android.telephony.TelephonyManager;
+
+import androidx.core.content.ContextCompat;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by gerben on 6-10-17.
+ */
+
+public class ReceiverListener extends BroadcastReceiver {
+    private static final String TAG = "ReceiverListener";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if(intent.getAction().equals("android.provider.Telephony.SMS_RECEIVED")){
+            handleIncomingSMS(context, intent);
+        } else if (intent.getAction().equals("android.intent.action.PHONE_STATE")) {
+            handleIncomingCall(context, intent);
+        }
+        else if (intent.getAction().equals("android.intent.action.BOOT_COMPLETED")) {
+            Intent intentServ = new Intent(context, MatrixService.class);
+            ContextCompat.startForegroundService(context, intentServ);
+        }
+    }
+
+    private void handleIncomingSMS(Context context, Intent intent) {
+        Map<String, String> msg = null;
+        SmsMessage[] msgs = null;
+        Bundle bundle = intent.getExtras();
+
+        if (bundle != null && bundle.containsKey("pdus")) {
+            Object[] pdus = (Object[]) bundle.get("pdus");
+
+            if (pdus != null) {
+                int nbrOfpdus = pdus.length;
+                msg = new HashMap<String, String>(nbrOfpdus);
+                msgs = new SmsMessage[nbrOfpdus];
+
+                // Send long SMS of same sender in one message
+                for (int i = 0; i < nbrOfpdus; i++) {
+                    msgs[i] = SmsMessage.createFromPdu((byte[])pdus[i]);
+
+                    String originatinAddress = msgs[i].getOriginatingAddress();
+
+                    // Check if index with number exists
+                    if (!msg.containsKey(originatinAddress)) {
+                        // Index with number doesn't exist
+                        msg.put(msgs[i].getOriginatingAddress(), msgs[i].getMessageBody());
+
+                    } else {
+                        // Number is there.
+                        String previousparts = msg.get(originatinAddress);
+                        String msgString = previousparts + msgs[i].getMessageBody();
+                        msg.put(originatinAddress, msgString);
+                    }
+                }
+            }
+        }
+        for (String originatinAddress : msg.keySet()) {
+            Utilities.sendMatrix(context, msg.get(originatinAddress), originatinAddress, Matrix.MESSAGE_TYPE_TEXT);
+        }
+    }
+
+    private void handleIncomingCall(Context context, Intent intent) {
+        String cal_state = intent.getExtras().getString(TelephonyManager.EXTRA_STATE);
+        String cal_from = intent.getExtras().getString(TelephonyManager.EXTRA_INCOMING_NUMBER);
+        String body = cal_from;
+        switch(cal_state){
+            case "IDLE":
+                body += " end call";
+                break;
+            case "OFFHOOK":
+                body += " answered call";
+                break;
+            case "RINGING":
+                body += " is calling";
+                break;
+        }
+        Utilities.sendMatrix(context, body, cal_from, Matrix.MESSAGE_TYPE_NOTICE);
+    }
+}

app/src/main/java/eu/droogers/smsmatrix/SmsListener.java

@@ -1,49 +0,0 @@
-package eu.droogers.smsmatrix;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.telephony.SmsMessage;
-import android.util.Log;
-
-/**
- * Created by gerben on 6-10-17.
- */
-
-public class SmsListener extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        if(intent.getAction().equals("android.provider.Telephony.SMS_RECEIVED")){
-            Bundle bundle = intent.getExtras();           //---get the SMS message passed in---
-            SmsMessage[] msgs = null;
-            String msg_from;
-            if (bundle != null){
-                //---retrieve the SMS message received---
-                try{
-                    Object[] pdus = (Object[]) bundle.get("pdus");
-                    msgs = new SmsMessage[pdus.length];
-                    for(int i=0; i<msgs.length; i++){
-                        msgs[i] = SmsMessage.createFromPdu((byte[])pdus[i]);
-                        msg_from = msgs[i].getOriginatingAddress();
-                        String msgBody = msgs[i].getMessageBody();
-                        System.out.println(msg_from + ": " + msgBody);
-
-//                        Matrix mx = new Matrix(context, "https://matrix.org");
-                        sendMatrix(context, msgBody, msg_from);
-                    }
-                }catch(Exception e){
-                            Log.d("Exception caught",e.getMessage());
-                }
-            }
-        }
-    }
-
-    private void sendMatrix(Context context, String body, String phone) {
-        Intent intent = new Intent(context, MatrixService.class);
-        intent.putExtra("SendSms_phone", phone);
-        intent.putExtra("SendSms_body", body);
-        context.startService(intent);
-//        MainActivity.mx.sendMessage( + ": " + );
-    }
-}

app/src/main/java/eu/droogers/smsmatrix/Utilities.java

@@ -0,0 +1,24 @@
+package eu.droogers.smsmatrix;
+
+import android.content.Context;
+import android.content.Intent;
+
+public class Utilities {
+    public static void sendMatrix(Context context, String body, String phone, String type) {
+        Intent intent = new Intent(context, MatrixService.class);
+        intent.putExtra("SendSms_phone", phone);
+        intent.putExtra("SendSms_body", body);
+        intent.putExtra("SendSms_type", type);
+        context.startService(intent);
+    }
+
+    public static void sendMatrix(Context context, byte[] body, String phone, String type, String fileName, String contentType) {
+        Intent intent = new Intent(context, MatrixService.class);
+        intent.putExtra("SendSms_phone", phone);
+        intent.putExtra("SendSms_body", body);
+        intent.putExtra("SendSms_type", type);
+        intent.putExtra("SendSms_fileName", fileName);
+        intent.putExtra("SendSms_contentType", contentType);
+        context.startService(intent);
+    }
+}

app/src/main/res/layout/activity_main.xml

@@ -100,6 +100,40 @@
         android:hint="Sms_mobiel"
         android:inputType="textPersonName" />
 
+    <TextView
+        android:id="@+id/textView_syncDelay"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="SyncDelay in seconds"
+        android:textStyle="bold" />
+
+    <EditText
+        android:id="@+id/editText_syncDelay"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:ems="10"
+        android:hint="12"
+        android:inputType="number" />
+
+    <TextView
+        android:id="@+id/textView_syncTimeout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="SyncTimeout in minutes"
+        android:textStyle="bold" />
+
+    <EditText
+        android:id="@+id/editText_syncTimeout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:ems="10"
+        android:hint="30"
+        android:inputType="number" />
+
     <Button
         android:id="@+id/button_save"
         android:layout_width="match_parent"

build.gradle

@@ -1,11 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.4.20'
+
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "io.realm:realm-gradle-plugin:5.8.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +19,20 @@ buildscript {
 
 allprojects {
     repositories {
+        // For Matrix Android SDK.
+        // This has to be declared first, to ensure that Matrix Android SDK library is not downloaded from another repo
+        maven {
+            url 'https://jitpack.io'
+            content {
+                // Use this repo only for matrix SDK library
+                includeGroupByRegex "com\\.github\\.Bubu"
+                // Also add subgroups, due to SDK split into modules
+                includeGroupByRegex "com\\.github\\.Bubu\\.matrix-android-sdk"
+                // And Olm library
+                includeGroupByRegex "org\\.matrix\\.gitlab\\.matrix-org"
+            }
+        }
+        google()
         jcenter()
     }
 }

gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 06 15:05:57 CEST 2017
+#Mon May 03 19:17:08 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip