Merged release-0.6.0 into master

LICENSE.md

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

README.md

@@ -1,3 +1,46 @@
-# Tracman for Android
+# <img align="left" src="https://tracman.org/static/img/icon/by/48.png" alt="[]" title="The Tracman Logo">Tracman for Android
+###### v 0.6.0
 
-Android app to upload a user's GPS location to the [tracman server](https://github.com/tracman-org/android). 
+Android app to upload a user's GPS location to the [tracman server](https://github.com/tracman-org/Server). 
+
+## Installation
+
+Install from the [Google Play Store](https://play.google.com/store/apps/details?id=us.keithirwin.tracman) or with `adb`/Android Studio. 
+
+## Usage
+
+In order to apply changes to settings, you need to hit the back button and return to the main menu (where it just says "General settings").  Don't hit back again, or you will be logged out.  This will be fixed as [#9](https://github.com/Tracman-org/Android/issues/9) someday... 
+
+The app will switch between "realtime updates" (Every second, or whatever interval you set up in the settings) and "occasional updates", depending on if there are visitors to your map.  This prevents the app from draining your battery when nobody's looking at your location anyway. 
+
+More information is available on the [help page](https://tracman.org/help#android). 
+
+## Contributing
+
+Tracman for Android is in perpetually poor condition.  I just don't know enough about android/java to create a top-quality app.  I think this project would benefit greatly from being torn down and rebuilt from scratch.  If you know anything about Android, you probably know more than me.  Feel free to check out the [issues marked help wanted](https://github.com/Tracman-org/Android/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) (or [any issues](https://github.com/Tracman-org/Android/issues), really) or [contact me](https://keithirwin.us/contact) about getting involved. 
+
+## Changelog
+
+#### v0.6.0
+
+* [#1](https://github.com/Tracman-org/Android/issues/1) Deals with lost connections
+* [#6](https://github.com/Tracman-org/Android/issues/6) Loads on boot
+* [#7](https://github.com/Tracman-org/Android/issues/7) Added email/password login
+* [#8](https://github.com/Tracman-org/Android/issues/8) Doesn't log back in after logging out
+
+#### v0.5.0
+
+* Fixed compatibility issues with TLS
+
+## License
+
+###### see [LICENSE.md](https://github.com/Tracman-org/Android/blob/master/LICENSE.md)
+
+Tracman: GPS tracking app for android
+Copyright © 2017 [Keith Irwin](https://keithirwin.us/)
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program.  If not, see <[http://www.gnu.org/licenses/](http://www.gnu.org/licenses/)>.

app/build.gradle

@@ -19,10 +19,10 @@ android {
 	buildToolsVersion '25.0.0'
 	defaultConfig {
 		applicationId "us.keithirwin.tracman"
-		minSdkVersion 14
+		minSdkVersion 15
 		targetSdkVersion 23
-		versionCode 11
-		versionName "0.5.0"
+		versionCode 12
+		versionName "0.6.0"
 	}
 	buildTypes {
 		release {

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="us.keithirwin.tracman"
-		xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="us.keithirwin.tracman">
 
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -8,7 +8,7 @@
 	<uses-permission android:name="android.permission.BATTERY_STATS"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
-	<uses-feature android:name="android.hardware.location.gps" />
+	<uses-feature android:name="android.hardware.location.gps"/>
 
 	<application
 		android:allowBackup="true"
@@ -16,18 +16,19 @@
 		android:label="@string/app_name"
 		android:supportsRtl="true"
 		android:theme="@style/AppTheme">
-
 		<activity android:name=".LoginActivity">
 			<intent-filter android:label="@string/app_name">
 				<action android:name="android.intent.action.MAIN"/>
+
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
-
 		<activity
 			android:name=".SettingsActivity"
 			android:label="@string/settings_name"
 			android:parentActivityName=".LoginActivity">
+
+			<!-- Parent activity meta-data to support 4.0 and lower -->
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value=".LoginActivity"/>
@@ -38,6 +39,7 @@
 			android:exported="false">
 		</service>
 
+		<!--Startup on boot-->
 		<receiver
 			android:name=".BootReceiver"
 			android:enabled="true"
@@ -51,6 +53,15 @@
 			</intent-filter>
 		</receiver>
 
+		<!--Check for Disconnection-->
+		<receiver
+			android:name=".ConnectionReceiver"
+			android:enabled="true"
+			android:exported="true">
+			<intent-filter>
+				<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+			</intent-filter>
+		</receiver>
 	</application>
 
-</manifest>
+</manifest>

app/src/main/java/us/keithirwin/tracman/ConnectionReceiver.java

@@ -0,0 +1,35 @@
+package us.keithirwin.tracman;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+//import android.util.Log;
+
+public class ConnectionReceiver extends BroadcastReceiver {
+	//private static final String TAG = "ConnectionReceiver";
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		//Log.d(TAG,"onReceive() called");
+
+		// Get connection information
+		ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+		NetworkInfo networkInfo = cm.getActiveNetworkInfo();
+
+		// Prepare intent
+		Intent locationServiceIntent = new Intent(context, LocationService.class);
+
+		// Check connection
+		if (networkInfo!=null) {
+			//Log.d(TAG, "Connected");
+			context.startService(locationServiceIntent);
+		}
+		else {
+			//Log.d(TAG,"Disconnected");
+			context.stopService(locationServiceIntent);
+		}
+
+	}
+}

app/src/main/java/us/keithirwin/tracman/LocationService.java

@@ -18,7 +18,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.NotificationCompat;
-import android.util.Log;
+//import android.util.Log;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
@@ -42,6 +42,12 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 		GoogleApiClient.OnConnectionFailedListener, LocationListener {
 	public LocationService() {}
 	//private String TAG = "LocationService";
+	final static private int ICON_ON = 2;
+	final int ICON_HALF = 1;
+	final int ICON_OFF = 0;
+	// Development
+//	final String SERVER_ADDRESS = "https://dev.tracman.org";
+	// Production
 	final String SERVER_ADDRESS = "https://tracman.org";
 
 	private Socket socket;
@@ -64,6 +70,8 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 	private NotificationManager mNotificationManager;
 	private final NotificationCompat.Builder mNotificationBuilder = new NotificationCompat.Builder(this);
 	private void setupNotifications(Boolean persist) {
+		//Log.d(TAG,"setupNotification() called");
+
 		if (mNotificationManager == null) {
 			mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 		}
@@ -73,23 +81,28 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 				0);
 		mNotificationBuilder
 				.setPriority(-1)
-				.setSmallIcon(R.drawable.logo_white)
-//				.setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.logo_by))
+				.setSmallIcon(R.drawable.logo_dark)
 				.setCategory(NotificationCompat.CATEGORY_SERVICE)
 				.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
 				.setContentTitle(getText(R.string.app_name))
-//				.setWhen(System.currentTimeMillis())
 				.setContentIntent(notificationIntent)
 				.setOngoing(persist);
 	}
-	private void showNotification(CharSequence text, Boolean active) {
+	private void showNotification(CharSequence text, int icon) {
+		//Log.d(TAG,"showNotification() called");
 		mNotificationBuilder
 				.setTicker(text)
 				.setContentText(text);
-		if (active) {
-			mNotificationBuilder.setSmallIcon(R.drawable.logo_white);
-		} else {
-			mNotificationBuilder.setSmallIcon(R.drawable.logo_trans);
+		switch (icon) {
+			case ICON_ON:
+				mNotificationBuilder.setSmallIcon(R.drawable.logo_white);
+				break;
+			case ICON_HALF:
+				mNotificationBuilder.setSmallIcon(R.drawable.logo_trans);
+				break;
+			case ICON_OFF:
+				mNotificationBuilder.setSmallIcon(R.drawable.logo_dark);
+				break;
 		}
 		if (mNotificationManager != null) {
 			mNotificationManager.notify(1, mNotificationBuilder.build());
@@ -104,20 +117,6 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 		}
 	};
 
-//	private TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
-//		public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-//			return new java.security.cert.X509Certificate[] {};
-//		}
-//
-//		public void checkClientTrusted(X509Certificate[] chain,
-//									   String authType) throws CertificateException {
-//		}
-//
-//		public void checkServerTrusted(X509Certificate[] chain,
-//									   String authType) throws CertificateException {
-//		}
-//	} };
-
 	@Override
 	public void onCreate() {
 		super.onCreate();
@@ -127,7 +126,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 		sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
 
 		setupNotifications(true);
-		showNotification(getText(R.string.connecting), false);
+		showNotification(getText(R.string.notify_connecting), ICON_OFF);
 		//Log.d(TAG, "Notification set up");
 
 		buildGoogleApiClient();
@@ -150,24 +149,24 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 			opts.secure = true;
 			socket = IO.socket(SERVER_ADDRESS, opts);
 
-			showNotification(getText(R.string.connected), false);
+			showNotification(getText(R.string.notify_connected), ICON_HALF);
 
 			// Log errors
-//			socket.io().on(Manager.EVENT_TRANSPORT, new Emitter.Listener() {
-//				@Override
-//				public void call(Object... args) {
-//					Transport transport = (Transport) args[0];
-//					transport.on(Transport.EVENT_ERROR, new Emitter.Listener() {
-//						@Override
-//						public void call(Object... args) {
-//							Exception e = (Exception) args[0];
-//							Log.e(TAG, "Transport error " + e);
-//							e.printStackTrace();
-//							e.getCause().printStackTrace();
-//						}
-//					});
-//				}
-//			});
+			socket.io().on(Manager.EVENT_TRANSPORT, new Emitter.Listener() {
+				@Override
+				public void call(Object... args) {
+					Transport transport = (Transport) args[0];
+					transport.on(Transport.EVENT_ERROR, new Emitter.Listener() {
+						@Override
+						public void call(Object... args) {
+							Exception e = (Exception) args[0];
+							//Log.e(TAG, "Transport error: " + e);
+							e.printStackTrace();
+							e.getCause().printStackTrace();
+						}
+					});
+				}
+			});
 
 			socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
 				@Override
@@ -182,7 +181,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 			socket.connect();
 
 		} catch (URISyntaxException e) {
-			showNotification(getText(R.string.server_connection_error), false);
+			showNotification(getText(R.string.server_connection_error), ICON_OFF);
 			//Log.e(TAG, "Failed to connect to sockets server " + SERVER_ADDRESS, e);
 		}
 
@@ -215,8 +214,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 		// Get permission
 		if (!checkLocationPermission(this)) {
 			//Log.d(TAG, "Location permission denied");
-			//TODO: Turn off location updates
-
+			//TODO: Ask the user to try again
 		} else {
 			//Log.d(TAG, "Location permission granted");
 
@@ -248,7 +246,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 
 		mLocationRequest = LocationRequest.create();
 		connectLocationUpdates(getIntervalSetting(), getPrioritySetting());
-		showNotification(getString(R.string.realtime_updates), true);
+		showNotification(getString(R.string.occasional_updates), ICON_HALF);
 	}
 
 	@Override
@@ -259,7 +257,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 	@Override
 	public void onConnectionFailed(ConnectionResult connectionResult) {
 		//Log.e(TAG, "onConnectionFailed: " + connectionResult);
-		showNotification(getText(R.string.google_connection_error), false);
+		showNotification(getText(R.string.google_connection_error), ICON_OFF);
 		buildGoogleApiClient();
 	}
 
@@ -269,11 +267,11 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 			if (args[0].toString().equals("true")) {
 				//Log.d(TAG, "Activating realtime updates");
 				connectLocationUpdates(getIntervalSetting(), getPrioritySetting());
-				showNotification(getString(R.string.realtime_updates), true);
+				showNotification(getString(R.string.realtime_updates), ICON_ON);
 			} else {
 				//Log.d(TAG, "Deactivating realtime updates");
 				connectLocationUpdates(300, LocationRequest.PRIORITY_NO_POWER);
-				showNotification(getString(R.string.occasional_updates), false);
+				showNotification(getString(R.string.occasional_updates), ICON_HALF);
 			}
 		}
 	};
@@ -281,26 +279,33 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 	@Override
 	public void onLocationChanged(Location location) {
 
-		JSONObject mLocationView = new JSONObject();
-		try {
-			mLocationView.put("usr", mUserID);
-			mLocationView.put("tok", mUserSK);
-			mLocationView.put("lat", String.valueOf(location.getLatitude()));
-			mLocationView.put("lon", String.valueOf(location.getLongitude()));
-			mLocationView.put("dir", String.valueOf(location.getBearing()));
-			mLocationView.put("spd", String.valueOf(location.getSpeed()));
-		} catch (JSONException e) {
-			//Log.e(TAG, "Failed to put JSON data");
+		// Make sure we're logged in...
+		if (mUserID!=null && mUserSK!=null) {
+			JSONObject mLocationView = new JSONObject();
+			try {
+				mLocationView.put("usr", mUserID);
+				mLocationView.put("tok", mUserSK);
+				mLocationView.put("lat", String.valueOf(location.getLatitude()));
+				mLocationView.put("lon", String.valueOf(location.getLongitude()));
+				mLocationView.put("dir", String.valueOf(location.getBearing()));
+				mLocationView.put("spd", String.valueOf(location.getSpeed()));
+			} catch (JSONException e) {
+				//Log.e(TAG, "Failed to put JSON data");
+			}
+			socket.emit("set", mLocationView);
+			//Log.v(TAG, "Location set: " + mLocationView.toString());
+		}
+		else {
+			//Log.v(TAG, "Can't set location because user isn't logged in.");
+      stopSelf();
 		}
-		socket.emit("set", mLocationView);
-		//Log.v(TAG, "Location updated: " + mLocationView.toString());
 
 	}
 
 	@Override
 	public void onConnectionSuspended(int i) {
 		//Log.d(TAG, "onConnectionSuspended called");
-		showNotification(getText(R.string.google_connection_error), false);
+		showNotification(getText(R.string.google_connection_error), ICON_OFF);
 	}
 
 	@Override
@@ -319,7 +324,7 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 		//Log.d(TAG, "LowPowerReceiver deactivated");
 
 		setupNotifications(false);
-		showNotification(getText(R.string.disconnected), false);
+		showNotification(getText(R.string.disconnected), ICON_OFF);
 		//Log.d(TAG, "Notification changed");
 	}
 }

app/src/main/java/us/keithirwin/tracman/LoginActivity.java

@@ -7,8 +7,9 @@ import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
-import android.util.Log;
+//import android.util.Log;
 import android.view.View;
+import android.widget.EditText;
 import android.widget.TextView;
 
 import com.google.android.gms.auth.api.Auth;
@@ -25,34 +26,32 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
-import java.security.KeyStore;
-import java.util.Arrays;
-import java.util.Collections;
+//import java.security.KeyStore;
+//import java.util.Arrays;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
+//import javax.net.ssl.TrustManager;
+//import javax.net.ssl.TrustManagerFactory;
+//import javax.net.ssl.X509TrustManager;
 
 import okhttp3.Call;
-import okhttp3.CipherSuite;
-import okhttp3.ConnectionSpec;
+import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Callback;
+import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.TlsVersion;
 
 public class LoginActivity extends AppCompatActivity implements
 		GoogleApiClient.OnConnectionFailedListener,
 		View.OnClickListener {
-//	private static final String TAG = "LoginActivity";
+	//private static final String TAG = "LoginActivity";
 	private static final int RC_SIGN_IN = 9001;
+	static final int SIGN_OUT = 1;
+	private static boolean DONT_LOG_IN = false;
 
 	// Development
-	//private final String SERVER_ADDRESS = "https://dev.tracman.org/";
-	//private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hps4p2pcu3ctshjvqm3pqdbg0t0q281o.apps.googleusercontent.com";
+//	private final String SERVER_ADDRESS = "https://dev.tracman.org/";
+//	private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hps4p2pcu3ctshjvqm3pqdbg0t0q281o.apps.googleusercontent.com";
 	// Production
 	private final String SERVER_ADDRESS = "https://tracman.org/";
 	private static final String GOOGLE_WEB_CLIENT_ID = "483494341936-hrn0ms1tebgdtfs5f4i6ebmkt3qmo16o.apps.googleusercontent.com";
@@ -63,13 +62,15 @@ public class LoginActivity extends AppCompatActivity implements
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-//		Log.v(TAG, "Created...");
+		//Log.v(TAG, "created");
 
 		// Set up layout
 		setContentView(R.layout.activity_login);
 		setTitle(R.string.login_name);
-		TextView tv = (TextView) findViewById(R.id.login_description);
-		tv.setMovementMethod(LinkMovementMethod.getInstance());
+		TextView loginDescription = (TextView) findViewById(R.id.login_description);
+		TextView forgotPassword = (TextView) findViewById(R.id.login_forgot_password);
+		loginDescription.setMovementMethod(LinkMovementMethod.getInstance());
+		forgotPassword.setMovementMethod(LinkMovementMethod.getInstance());
 
 		// Configure sign-in to request the user's ID and basic profile, included in DEFAULT_SIGN_IN.
 		GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
@@ -85,32 +86,31 @@ public class LoginActivity extends AppCompatActivity implements
 				.build();
 
 		// Set up buttons
-		SignInButton signInButton = (SignInButton) findViewById(R.id.google_sign_in_button);
+		SignInButton signInButton = (SignInButton) findViewById(R.id.login_button_google);
 		signInButton.setStyle(SignInButton.SIZE_WIDE, SignInButton.COLOR_AUTO);
 
 		// Button listeners
-		findViewById(R.id.google_sign_in_button).setOnClickListener(this);
+		findViewById(R.id.login_button).setOnClickListener(this);
+		findViewById(R.id.login_button_google).setOnClickListener(this);
+//		findViewById(R.id.login_button_facebook).setOnClickListener(this);
+//		findViewById(R.id.login_button_twitter).setOnClickListener(this);
 	}
 
 	@Override
 	public void onStart() {
 		super.onStart();
-//		Log.v(TAG, "Started. Checking for intent method");
+		//Log.v(TAG, "onStart() called");
 
-		if (getIntent().hasExtra("method")) {
-//			Log.v(TAG, "Intent has method extra");
-			if (getIntent().getStringExtra("method").equals("signOut")) {
-//				Log.d(TAG, "Got intent to sign out");
-			}
-		} else { // Try to sign in
-//			Log.v(TAG, "Trying to sign in...");
+		// Try to sign in
+		if (!DONT_LOG_IN) {
+			//Log.v(TAG, "Trying to sign in...");
 			OptionalPendingResult<GoogleSignInResult> opr = Auth.GoogleSignInApi.silentSignIn(mGoogleApiClient);
 			if (opr.isDone()) {
 				// If the user's cached credentials are valid, the OptionalPendingResult will be "done"
 				// and the GoogleSignInResult will be available instantly.
-//				Log.d(TAG, "Got cached sign-in");
+				//Log.d(TAG, "Got cached sign-in");
 				GoogleSignInResult result = opr.get();
-				handleSignInResult(result);
+				handleGoogleSignInResult(result);
 			} else {
 				// If the user has not previously signed in on this device or the sign-in has expired,
 				// this asynchronous branch will attempt to sign in the user silently.  Cross-device
@@ -119,8 +119,8 @@ public class LoginActivity extends AppCompatActivity implements
 				opr.setResultCallback(new ResultCallback<GoogleSignInResult>() {
 					@Override
 					public void onResult(GoogleSignInResult googleSignInResult) {
-						hideProgressDialog();
-						handleSignInResult(googleSignInResult);
+					hideProgressDialog();
+					handleGoogleSignInResult(googleSignInResult);
 					}
 				});
 			}
@@ -128,42 +128,72 @@ public class LoginActivity extends AppCompatActivity implements
 
 	}
 
+	/**
+	 * if onResume() is called, the user has returned from SettingsActivity.
+	 * Their user account must be disassociated and the LocationService must be stopped.
+	 */
+	@Override
+	public void onResume() {
+		super.onResume();
+
+		// Get sharedPrefs
+		SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+		SharedPreferences.Editor editor = sharedPref.edit();
+
+		// Stop LocationService
+		//Log.v(TAG, "Stopping location service...");
+		stopService(new Intent(LoginActivity.this, LocationService.class));
+		editor.putBoolean("gps_switch",false);
+
+		// Remove saved loggedInUser
+		//Log.v(TAG, "Removing saved user...");
+		editor.remove("loggedInUser");
+		editor.remove("loggedInUserId");
+		editor.remove("loggedInUserName");
+		editor.remove("loggedInUserSk");
+		editor.apply();
+
+	}
+
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
+		//Log.v(TAG, "onActivityResult() called");
 
 		// Result returned from launching the Intent from GoogleSignInApi.getSignInIntent(...);
 		if (requestCode == RC_SIGN_IN) {
+			//Log.v(TAG, "requestCode was RC_SIGN_IN");
 			GoogleSignInResult result = Auth.GoogleSignInApi.getSignInResultFromIntent(data);
-			handleSignInResult(result);
+			handleGoogleSignInResult(result);
 		}
+		// User just logged out.  Don't log in again, stupid
+		else if (requestCode == SIGN_OUT) {
+			//Log.v(TAG, "requestCode was SIGN_OUT");
+			DONT_LOG_IN = true;
+		}
+
 	}
 
-	private void AuthenticateGoogle(final String token) throws Exception {
-
+	private void authenticateWithTracmanServer(final Request request) throws Exception {
 		// Needed to support TLS 1.1 and 1.2
-		TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
-				TrustManagerFactory.getDefaultAlgorithm());
-		trustManagerFactory.init((KeyStore) null);
-		TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
-		if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
-			throw new IllegalStateException("Unexpected default trust managers:"
-					+ Arrays.toString(trustManagers));
-		}
-		X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
+//		TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(
+//				TrustManagerFactory.getDefaultAlgorithm());
+//		trustManagerFactory.init((KeyStore) null);
+//		TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+//		if (trustManagers.length != 1 || !(trustManagers[0] instanceof X509TrustManager)) {
+//			throw new IllegalStateException("Unexpected default trust managers:"
+//					+ Arrays.toString(trustManagers));
+//		}
+//		X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
 
 		OkHttpClient client = new OkHttpClient.Builder()
-				.sslSocketFactory(new TLSSocketFactory(), trustManager)
-				.build();
-
-		Request request = new Request.Builder()
-				.url(SERVER_ADDRESS+"auth/google/idtoken?id_token="+token)
+//				.sslSocketFactory(new TLSSocketFactory(), trustManager)
 				.build();
 
 		client.newCall(request).enqueue(new Callback() {
 			@Override
 			public void onFailure(Call call, IOException e) {
-//				Log.e(TAG, "Failed to connect to server: " + SERVER_ADDRESS + "auth/google/idtoken?id_token=" + token);
+				//Log.e(TAG, "Failed to connect to Tracman server!");
 				showError(R.string.server_connection_error);
 				e.printStackTrace();
 			}
@@ -175,7 +205,7 @@ public class LoginActivity extends AppCompatActivity implements
 					res.body().close();
 					throw new IOException("Unexpected code: " + res);
 				} else {
-//					Log.d(TAG, "Response code: " + res.code());
+					//Log.d(TAG, "Response code: " + res.code());
 					String userString = res.body().string();
 					System.out.println("Full response: " + userString);
 
@@ -185,10 +215,10 @@ public class LoginActivity extends AppCompatActivity implements
 						userID = user.getString("_id");
 						userName = user.getString("name");
 						userSK = user.getString("sk32");
-//						Log.v(TAG, "User retrieved with ID: " + userID);
+						//Log.v(TAG, "User retrieved with ID: " + userID);
 					} catch (JSONException e) {
-//						Log.e(TAG, "Unable to parse user JSON: ", e);
-//						Log.e(TAG, "JSON String used: " + userString);
+						//Log.e(TAG, "Unable to parse user JSON: ", e);
+						//Log.e(TAG, "JSON String used: " + userString);
 						userID = null;
 						userName = null;
 						userSK = null;
@@ -203,42 +233,95 @@ public class LoginActivity extends AppCompatActivity implements
 					editor.putString("loggedInUserSk", userSK);
 					editor.commit();
 
-					startActivity(new Intent(getBaseContext(), SettingsActivity.class));
+					startActivityForResult(new Intent(LoginActivity.this, SettingsActivity.class), SIGN_OUT);
+				}
+
+
 			}
-		}
 
 		});
-
 	}
 
-	private void handleSignInResult(GoogleSignInResult result) {
-//		Log.d(TAG, "handleSignInResult:" + result.isSuccess());
+	private void handleGoogleSignInResult(GoogleSignInResult result) {
+		//Log.d(TAG, "handleSignInResult:" + result.isSuccess());
 		if (result.isSuccess()) { // Signed in successfully
 			GoogleSignInAccount acct = result.getSignInAccount();
-			String googleToken = acct.getIdToken();
-//			Log.v(TAG, "Google token: " + googleToken);
 			try {
-				AuthenticateGoogle(acct.getIdToken());
-			}  catch (Exception e) {
-//				Log.e(TAG, "Error sending ID token to backend.", e);
+
+				// Build request
+				Request request = new Request.Builder()
+					.url(SERVER_ADDRESS+"login/app/google?id_token="+acct.getIdToken())
+					.build();
+
+				// Send to server
+				authenticateWithTracmanServer(request);
+
+			} catch (Exception e) {
+				//Log.e(TAG, "Error sending ID token to backend.", e);
 			}
 		} else {
-//			Log.e(TAG, "Failed to log in: "+result.getStatus().getStatusCode());
+			//Log.e(TAG, "Failed to log in: "+result.getStatus().getStatusCode());
 			if (result.getStatus().getStatusCode()!=4) {
 				showError(R.string.google_connection_error);
 			}
 		}
 	}
 
-	private void signIn() {
+	public void signInWithPassword() {
+		//Log.d(TAG, "signInWithPassword() called");
+
+		// Get params from form
+		EditText emailText = (EditText)findViewById(R.id.login_email);
+		String email = emailText.getText().toString();
+		EditText passwordText = (EditText)findViewById(R.id.login_password);
+		String password = passwordText.getText().toString();
+
+		// Build formdata
+		RequestBody formData = new FormBody.Builder()
+			.add("email", email)
+			.add("password", password)
+			.build();
+
+		// Build request
+		Request request = new Request.Builder()
+			.url(SERVER_ADDRESS+"login/app")
+			.post(formData)
+			.build();
+
+		// Send formdata to endpoint
+		try {
+			//Log.v(TAG, "Sending local login POST to server...");
+			authenticateWithTracmanServer(request);
+		} catch (Exception e) {
+			//Log.e(TAG, "Error sending local login to backend:",e);
+		}
+
+	}
+
+	public void signInWithGoogle() {
+		//Log.v(TAG, "signInWithGoogle() called");
 		Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(mGoogleApiClient);
 		startActivityForResult(signInIntent, RC_SIGN_IN);
 	}
 
+//	private void signInWithFacebook() {
+//		Log.v(TAG, "signInWithFacebook() called");
+//
+//		//TODO: Facebook login to /login/app/facebook
+//
+//	}
+
+//	private void signInWithTwitter() {
+//		Log.v(TAG, "signInWithTwitter() called");
+//
+//		//TODO: Twitter login to /login/app/twitter
+//
+//	}
+
 	@Override
 	public void onConnectionFailed(ConnectionResult connectionResult) {
 		showError(R.string.disconnected);
-//		Log.d(TAG, "onConnectionFailed:" + connectionResult);
+		//Log.d(TAG, "onConnectionFailed:" + connectionResult);
 	}
 
 	private void showProgressDialog() {
@@ -268,10 +351,24 @@ public class LoginActivity extends AppCompatActivity implements
 
 	@Override
 	public void onClick(View v) {
+		//Log.v(TAG, "onClick() called");
 		switch (v.getId()) {
-			case R.id.google_sign_in_button:
-				signIn();
+			case R.id.login_button:
+				//Log.v(TAG, "Password login button pressed");
+				signInWithPassword();
 				break;
+			case R.id.login_button_google:
+				//Log.v(TAG, "Google login button pressed");
+				signInWithGoogle();
+				break;
+//			case R.id.login_button_facebook:
+//				Log.v(TAG, "Facebook login button pressed");
+//				signInWithFacebook();
+//				break;
+//			case R.id.login_button_twitter:
+//				Log.v(TAG, "Twitter login button pressed");
+//				signInWithTwitter();
+//				break;
 		}
 	}
 

app/src/main/java/us/keithirwin/tracman/SettingsActivity.java

@@ -16,11 +16,13 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.ActionBar;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
-import android.util.Log;
+//import android.util.Log;
 import android.view.MenuItem;
 
 import java.util.List;
 
+import static us.keithirwin.tracman.LoginActivity.SIGN_OUT;
+
 
 /**
  * A {@link PreferenceActivity} that presents a set of application settings. On
@@ -88,7 +90,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 							MY_FINE_LOCATION_PERMISSION);
 				}
 
-//				Log.d(TAG, "Starting LocationService");
+				//Log.d(TAG, "Starting LocationService");
 				startService(new Intent(SettingsActivity.this, LocationService.class));
 
 			}
@@ -130,7 +132,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setupActionBar();
-//		Log.d(TAG, "activity onCreate called");
+		//Log.d(TAG, "activity onCreate called");
 
 		// Restart LocationService when any related preference is changed
 //		findPreference("gps_switch").setOnPreferenceChangeListener(sRestartLocationServiceOnChangeListener);
@@ -147,10 +149,16 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 	protected void onStop() {
 		//Log.d(TAG, "onStop called");
 		super.onStop();
+		// Get updated preferences
+		SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+
+		// Save updated preferences
+		SharedPreferences.Editor editor = sharedPref.edit();
+//		editor.putBoolean("pref_start_boot", );
+		editor.apply();
 
 		// Restart service so settings can take effect
 		stopService(new Intent(this, LocationService.class));
-		SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
 		if (sharedPref.getBoolean("gps_switch", false)) {
 
 			// Ask for location permissions (can't be done in service, only activity)
@@ -162,7 +170,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 			}
 
 			// Start location tracking service
-//			Log.d(TAG, "Starting LocationService");
+			//Log.d(TAG, "Starting LocationService");
 			startService(new Intent(this, LocationService.class));
 
 		}
@@ -199,6 +207,11 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 
 	@Override
 	public void onBackPressed() {
+		//Log.v(TAG,"onBackPressed() called");
+
+		// Return to LoginActivity and don't sign back in again
+		setResult(SIGN_OUT, new Intent());
+
 		super.onBackPressed();
 	}
 
@@ -219,8 +232,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 	protected boolean isValidFragment(String fragmentName) {
 		return PreferenceFragment.class.getName().equals(fragmentName)
 				|| GeneralPreferenceFragment.class.getName().equals(fragmentName);
-//				|| MapPreferenceFragment.class.getName().equals(fragmentName)
-//				|| NotificationPreferenceFragment.class.getName().equals(fragmentName);
 	}
 
 	/**
@@ -242,7 +253,10 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 			// Bind the summary of preferences to their value
 			bindPreferenceSummaryToValue(findPreference("broadcast_frequency"));
 			bindPreferenceSummaryToValue(findPreference("broadcast_priority"));
+
 		}
+
+
 	}
 
 	/**

app/src/main/java/us/keithirwin/tracman/TLSSocketFactory.java

@@ -1,75 +1,75 @@
-package us.keithirwin.tracman;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-/**
- * @author fkrauthan
- * From: https://blog.dev-area.net/2015/08/13/android-4-1-enable-tls-1-1-and-tls-1-2/
- */
-public class TLSSocketFactory extends SSLSocketFactory {
-
-    private SSLSocketFactory internalSSLSocketFactory;
-
-    public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException {
-        SSLContext context = SSLContext.getInstance("TLS");
-        context.init(null, null, null);
-        internalSSLSocketFactory = context.getSocketFactory();
-    }
-
-    @Override
-    public String[] getDefaultCipherSuites() {
-        return internalSSLSocketFactory.getDefaultCipherSuites();
-    }
-
-    @Override
-    public String[] getSupportedCipherSuites() {
-        return internalSSLSocketFactory.getSupportedCipherSuites();
-    }
-
-    @Override
-    public Socket createSocket() throws IOException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket());
-    }
-
-    @Override
-    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException, UnknownHostException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port, localHost, localPort));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress host, int port) throws IOException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(address, port, localAddress, localPort));
-    }
-
-    private Socket enableTLSOnSocket(Socket socket) {
-        if(socket != null && (socket instanceof SSLSocket)) {
-            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
-        }
-        return socket;
-    }
-
-}
+//package us.keithirwin.tracman;
+//
+//import java.io.IOException;
+//import java.net.InetAddress;
+//import java.net.Socket;
+//import java.net.UnknownHostException;
+//import java.security.KeyManagementException;
+//import java.security.NoSuchAlgorithmException;
+//
+//import javax.net.ssl.SSLContext;
+//import javax.net.ssl.SSLSocket;
+//import javax.net.ssl.SSLSocketFactory;
+//
+///**
+// * @author fkrauthan
+// * From: https://blog.dev-area.net/2015/08/13/android-4-1-enable-tls-1-1-and-tls-1-2/
+// */
+//public class TLSSocketFactory extends SSLSocketFactory {
+//
+//    private SSLSocketFactory internalSSLSocketFactory;
+//
+//    public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException {
+//        SSLContext context = SSLContext.getInstance("TLS");
+//        context.init(null, null, null);
+//        internalSSLSocketFactory = context.getSocketFactory();
+//    }
+//
+//    @Override
+//    public String[] getDefaultCipherSuites() {
+//        return internalSSLSocketFactory.getDefaultCipherSuites();
+//    }
+//
+//    @Override
+//    public String[] getSupportedCipherSuites() {
+//        return internalSSLSocketFactory.getSupportedCipherSuites();
+//    }
+//
+//    @Override
+//    public Socket createSocket() throws IOException {
+//        return enableTLSOnSocket(internalSSLSocketFactory.createSocket());
+//    }
+//
+//    @Override
+//    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+//        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose));
+//    }
+//
+//    @Override
+//    public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
+//        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
+//    }
+//
+//    @Override
+//    public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException, UnknownHostException {
+//        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port, localHost, localPort));
+//    }
+//
+//    @Override
+//    public Socket createSocket(InetAddress host, int port) throws IOException {
+//        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
+//    }
+//
+//    @Override
+//    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
+//        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(address, port, localAddress, localPort));
+//    }
+//
+//    private Socket enableTLSOnSocket(Socket socket) {
+//        if(socket != null && (socket instanceof SSLSocket)) {
+//            ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.1", "TLSv1.2"});
+//        }
+//        return socket;
+//    }
+//
+//}

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

@@ -7,6 +7,7 @@
 	android:weightSum="6"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:background="#080808"
 	android:paddingBottom="@dimen/activity_vertical_margin"
 	android:paddingLeft="@dimen/activity_horizontal_margin"
 	android:paddingRight="@dimen/activity_horizontal_margin"
@@ -14,74 +15,151 @@
 	tools:context="us.keithirwin.tracman.LoginActivity"
 	android:clickable="true">
 
-	<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  xmlns:tools="http://schemas.android.com/tools"
-				  android:orientation="vertical"
-				  android:layout_weight="1"
-				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content">
+	<!-- Header -->
+	<RelativeLayout android:orientation="vertical"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:gravity="center" >
+
+		<!-- Logo -->
 		<ImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:contentDescription="@string/logo_description"
 			android:padding="5dp"
-			android:src="@drawable/logo_by"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentStart="true"/>
+			android:src="@drawable/logo_by" />
+
+		<!-- Title -->
 		<TextView
 			android:id="@+id/login_title"
-			android:layout_width="match_parent"
+			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="60dp"
 			android:layout_marginStart="60dp"
-			android:gravity="center"
 			android:text="@string/app_name"
 			android:textSize="50sp"
-			android:textColor="@color/Yellow"
-			android:layout_alignParentRight="true"
-			android:layout_alignParentEnd="true" />
+			android:textColor="@color/Yellow"/>
+
 	</RelativeLayout>
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  xmlns:tools="http://schemas.android.com/tools"
-				  android:orientation="vertical"
-				  android:layout_weight="3"
+	<!-- Description -->
+	<LinearLayout android:orientation="vertical"
+				  android:layout_weight="1"
 				  android:layout_width="match_parent"
-				  android:layout_height="wrap_content">
+				  android:layout_height="wrap_content" >
 		<TextView
 			android:id="@+id/login_description"
 			android:text="@string/login_description"
-			android:textSize="24sp"
+			android:textSize="20sp"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
-
 	</LinearLayout>
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  xmlns:tools="http://schemas.android.com/tools"
-				  android:layout_width="match_parent"
+	<!-- Social login buttons -->
+	<LinearLayout android:layout_width="match_parent"
+				  android:layout_height="wrap_content"
 				  android:layout_weight="1"
-				  android:layout_height="wrap_content">
+				  android:layout_marginBottom="30px" >
+
+		<!-- Google -->
 		<com.google.android.gms.common.SignInButton
-			android:id="@+id/google_sign_in_button"
+			android:id="@+id/login_button_google"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:layout_gravity="center"/>
+			android:layout_gravity="center" />
+
+		<!--&lt;!&ndash; Google &ndash;&gt;-->
+		<!--<ImageButton
+			android:id="@+id/login_button_google"
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:background="#ce4d39"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_google" />-->
+
+		<!--&lt;!&ndash; Facebook &ndash;&gt;-->
+		<!--<ImageButton
+			android:id="@+id/login_button_facebook"
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:background="#305891"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_facebook" />-->
+
+		<!--&lt;!&ndash; Twitter &ndash;&gt;-->
+		<!--<ImageButton
+			android:id="@+id/login_button_twitter"
+			android:layout_width="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="match_parent"
+			android:background="#2ca8d2"
+			android:layout_marginLeft="30px"
+			android:layout_marginRight="30px"
+			android:src="@drawable/social_twitter" />-->
 
 	</LinearLayout>
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				  xmlns:tools="http://schemas.android.com/tools"
+	<!-- Login form -->
+	<LinearLayout android:layout_width="match_parent"
 				  android:layout_height="wrap_content"
+				  android:layout_weight="1"
+				  android:orientation="vertical" >
+
+		<!-- Email -->
+		<EditText
+			android:id="@+id/login_email"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:hint="@string/email"
+			android:inputType="textEmailAddress"
+			android:textSize="24sp"/>
+
+		<!-- Password -->
+		<EditText
+			android:id="@+id/login_password"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="textPassword"
+			android:hint="@string/password"
+			android:textSize="24sp"/>
+
+		<!-- Submit -->
+		<Button
+			android:id="@+id/login_button"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:padding="15dp"
+			android:text="@string/login_button_text"
+			android:textSize="34sp" />
+
+	</LinearLayout>
+
+	<!-- Extra text -->
+	<LinearLayout android:layout_height="31dp"
 				  android:layout_width="match_parent"
-				  android:layout_weight="1">
+				  android:orientation="vertical"
+				  android:layout_marginTop="20px" >
+
+		<!-- Forgot password link -->
+		<TextView android:id="@+id/login_forgot_password"
+				  android:text="@string/login_forgot_password"
+				  android:layout_width="match_parent"
+				  android:layout_height="wrap_content"
+				  android:textSize="20sp" />
+
+		<!-- Errors -->
 		<TextView
-		android:id="@+id/login_error"
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:gravity="center"
-		android:textColor="@color/Red"
-		android:textSize="22sp" />
+			android:id="@+id/login_error"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:gravity="center"
+			android:textColor="@color/Red"
+			android:textSize="22sp" />
 
 	</LinearLayout>
 

app/src/main/res/values-de/strings.xml

@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<string name="about_back_button">Zurück</string>
-	<string name="about_license"><a href="https://tracman.org/license/">Lizenz im Browser zeigen (englisch)</a></string>
-	<string name="about_name">Über</string>
+    <string name="about_name">Über</string>
 	<string name="broadcast_disabled">Sendungen deaktiviert</string>
 	<string name="bugs_name">Problembericht</string>
-	<string name="connected">Verbindung festgestellt</string>
-	<string name="connecting">verbindet…</string>
 	<string name="disconnected">Verbindung unterbrochen</string>
 	<string name="google_connection_error">FEHLER: Könnte nicht zum Google API Server verbinden. </string>
 	<string name="help_name">Hilfe</string>
 	<string name="loading">Ladet…</string>
-	<string name="login_description">Auf dem Knopf klicken, einzuloggen.  Ein Tracman Konto ist erforderlich.  Falls Sie keiner haben, dürfen Sie <a href="https://tracman.org/login">mit ihrer Googlekonto mitbewerben</a>.</string>
+	<string name="login_description">Einloggen oder <a href="https://tracman.org/login#join">ein neues Konto erstellen</a>. </string>
 	<string name="login_name">Einloggen</string>
 	<string name="login_no_user_error">FEHLER: Nutzer nicht gefunden. </string>
 	<string name="logout_name">Ausloggen</string>
@@ -50,5 +47,11 @@
 	</string-array>
 	<string name="pref_title_gps_broadcast">Sendungen einschalten</string>
 	<string name="pref_title_broadcast_priority">Aktualisierung Vorrang</string>
-	<string name="not_connected">Kein Internet Zugang</string>
+	<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Passwort vergessen?</a></string>
+	<string name="login_button_text">Einloggen</string>
+	<string name="email">Email</string>
+	<string name="password">Passwort</string>
+	<string name="notify_connecting">verbindet…</string>
+	<string name="notify_disabled">Aktualisiert nicht</string>
+	<string name="notify_connected">Verbindung festgestellt</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -2,11 +2,8 @@
 <resources>
 	<string name="about_back_button">Atras</string>
 	<string name="about_name">Info</string>
-	<string name="connecting">conectando…</string>
-	<string name="about_license"><a href="https://tracman.org/license/">Mostrar licensia en el navegador (inglés)</a></string>
 	<string name="loading">Cargando…</string>
 	<string name="disconnected">Conexión perdida</string>
-	<string name="connected">Conexión establecida</string>
 	<string name="bugs_name">Informe de error</string>
 	<string name="pref_header_general">Configuración principales</string>
 	<string name="settings_name">Configuración</string>
@@ -17,7 +14,7 @@
 	<string name="broadcast_disabled">Transmisiónes apagado</string>
 	<string name="google_connection_error">ERROR: No se puede conectar al Google API servidor. </string>
 	<string name="help_name">Ayuda</string>
-	<string name="login_description">"Haga clic en el botón abajo para iniciar una sesión. Se necisita una cuenta de Tracman. Si no tiene uno, puede <a href="https://tracman.org/login">participar con sua cuenta Google</a>. "</string>
+	<string name="login_description">Iniciar una sesión o <a href="https://tracman.org/login">participar</a>. </string>
 	<string name="login_name">Iniciar sesión</string>
 	<string name="login_no_user_error">ERROR: Usario no encontrado</string>
 	<string name="logout_name">Cerrar sesión</string>
@@ -48,6 +45,13 @@
 		<item>Ciudad</item>
 		<item>Sin energía</item>
 	</string-array>
-	<string name="pref_title_gps_broadcast">Encender transmisiónes</string>	<string name="pref_broadcast_category_title">Actualizaciones de ubicación</string>
-	<string name="not_connected">"Sin conexión a Internet "</string>
+	<string name="pref_title_gps_broadcast">Encender transmisiónes</string>
+	<string name="pref_broadcast_category_title">Actualizaciones de ubicación</string>
+	<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Olividé su contrasena?</a></string>
+	<string name="login_button_text">Inciar session</string>
+	<string name="email">email</string>
+	<string name="password">contrasena</string>
+	<string name="notify_connecting">conectando…</string>
+	<string name="notify_disabled">No se actualiza</string>
+	<string name="notify_connected">Conexión establecida</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -12,17 +12,14 @@
 	<!-- Strings related to login -->
 	<string name="login_name">Login</string>
 	<string name="logout_name">Logout</string>
-	<string name="login_description">"Click the button below to log in.  You will need a Tracman account.  If you don't have one, you can <a href="https://tracman.org/login">join with your google account</a>.  "</string>
+	<string name="login_description">Log in or <a href="https://tracman.org/login#join">create an account</a>. </string>
 	<string name="server_connection_error">ERROR: Unable to connect to Tracman server.  </string>
 
 	<!-- Strings related to notifications -->
-	<string name="connecting">Connecting… </string>
-	<string name="connected">Connection established</string>
 	<string name="disconnected">Disconnected</string>
 	<string name="realtime_updates">Sending realtime updates</string>
 	<string name="occasional_updates">Sending occasional updates</string>
 	<string name="broadcast_disabled">Broadcast disabled</string>
-	<string name="not_connected">No internet connection</string>
 
 	<!-- Strings related to Settings -->
 	<string name="settings_name">Settings</string>
@@ -91,7 +88,6 @@
 
 	<!--Strings related to about-->
 	<string name="about_name">About</string>
-	<string name="about_license"><a href="https://tracman.org/license/">View license online</a></string>
 	<string name="about_back_button">Back</string>
 
 	<!--Strings related to suggestions-->
@@ -99,5 +95,12 @@
 
 	<!--Strings related to bugs-->
 	<string name="bugs_name">Bug report</string>
+	<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Forgot your password?</a></string>
+	<string name="login_button_text">Login</string>
+	<string name="email">email</string>
+	<string name="password">password</string>
+	<string name="notify_disabled">Not sending updates</string>
+	<string name="notify_connecting">"Connecting… "</string>
+	<string name="notify_connected">Connection established</string>
 
 </resources>

app/src/main/res/xml/pref_general.xml

@@ -7,7 +7,7 @@
 		<!-- Start on boot -->
 		<SwitchPreference
 			android:defaultValue="true"
-			android:key="start_on_boot"
+			android:key="pref_start_boot"
 			android:title="@string/pref_start_boot"
 			/>
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.3.0'
+		classpath 'com.android.tools.build:gradle:2.3.1'
 		classpath 'com.google.gms:google-services:3.0.0'
 
 		// NOTE: Do not place your application dependencies here; they belong

res/logo/black.svg

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   fill="#000000"
-   height="48"
-   viewBox="0 0 24 24"
-   width="48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="logo.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="748"
-     id="namedview8"
-     showgrid="false"
-     inkscape:snap-midpoints="true"
-     inkscape:zoom="19.666667"
-     inkscape:cx="24.660427"
-     inkscape:cy="23.340792"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M0 0h24v24H0z"
-     id="path4"
-     fill="none" />
-  <path
-     d="M 20.94,11 C 20.48,6.83 17.17,3.52 13,3.06 L 13,1 11,1 11,3.06 C 6.83,3.52 3.52,6.83 3.06,11 L 1,11 l 0,2 2.06,0 c 0.46,4.17 3.77,7.48 7.94,7.94 l 0,2.06 2,0 0,-2.06 C 17.17,20.48 20.48,17.17 20.94,13 L 23,13 23,11 Z M 12,19 C 8.13,19 5,15.87 5,12 5,8.13 8.13,5 12,5 c 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccccccccccsssss" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#000000"
-     d="m 15.988811,13.795153 a 4.2187634,4 0 1 1 0.01119,-3.569022 l -3.780543,1.773886 z"
-     id="path4-9" />
-</svg>

res/logo/bw.svg

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="48.046875"
-   viewBox="0 0 24.023438 24.023438"
-   width="48.046875"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="logo-bw.svg"
-   style="fill:#000000"
-   inkscape:export-filename="/home/keith/Code/node/tracman/static/img/icon/bw/logo-bw-48.png"
-   inkscape:export-xdpi="89.912193"
-   inkscape:export-ydpi="89.912193">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="748"
-     id="namedview8"
-     showgrid="false"
-     inkscape:snap-midpoints="true"
-     inkscape:zoom="19.666667"
-     inkscape:cx="16.700814"
-     inkscape:cy="35.56762"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <path
-     sodipodi:type="inkscape:offset"
-     inkscape:radius="3.2822878"
-     inkscape:original="M 12.021484 8.0039062 A 4.2187634 4 0 1 0 15.988281 13.794922 L 12.21875 12 L 16 10.226562 A 4.2187634 4 0 0 0 12.021484 8.0039062 z "
-     style="fill:#ffffff"
-     id="path5769"
-     d="M 11.876953,4.7246094 C 9.3134474,4.8381543 6.8156954,6.3243567 5.578125,8.6113281 4.3405546,10.8983 4.5056929,13.891624 5.9726562,16.033203 c 1.4669634,2.141579 4.0878638,3.372696 6.6503908,3.238281 2.562527,-0.134415 5.048175,-1.641297 6.265625,-3.939453 a 3.2826161,3.2826161 0 0 0 -0.144531,-3.3125 3.2826161,3.2826161 0 0 0 0.166015,-3.3105466 c -1.32664,-2.543804 -4.205574,-4.1095888 -7.033203,-3.984375 z"
-     inkscape:export-xdpi="49.549999"
-     inkscape:export-ydpi="49.549999"
-     transform="translate(0.01171875,0.01171875)" />
-  <path
-     sodipodi:type="inkscape:offset"
-     inkscape:radius="1.0124902"
-     inkscape:original="M 11 1 L 11 3.0605469 C 6.83 3.5205469 3.5205469 6.83 3.0605469 11 L 1 11 L 1 13 L 3.0605469 13 C 3.5205469 17.17 6.83 20.479453 11 20.939453 L 11 23 L 13 23 L 13 20.939453 C 17.17 20.479453 20.479453 17.17 20.939453 13 L 23 13 L 23 11 L 20.939453 11 C 20.479453 6.83 17.17 3.5205469 13 3.0605469 L 13 1 L 11 1 z M 12 5 C 15.87 5 19 8.13 19 12 C 19 15.87 15.87 19 12 19 C 8.13 19 5 15.87 5 12 C 5 8.13 8.13 5 12 5 z "
-     id="path5765"
-     d="M 11,-0.01171875 A 1.0125914,1.0125914 0 0 0 9.9882812,1 l 0,1.3144531 C 6.1119154,3.1236169 3.1236169,6.1119154 2.3144531,9.9882812 L 1,9.9882812 A 1.0125914,1.0125914 0 0 0 -0.01171875,11 l 0,2 A 1.0125914,1.0125914 0 0 0 1,14.011719 l 1.3144531,0 c 0.8091638,3.876366 3.7974623,6.864664 7.6738281,7.673828 l 0,1.314453 A 1.0125914,1.0125914 0 0 0 11,24.011719 l 2,0 A 1.0125914,1.0125914 0 0 0 14.011719,23 l 0,-1.314453 c 3.876366,-0.809164 6.864664,-3.797462 7.673828,-7.673828 l 1.314453,0 A 1.0125914,1.0125914 0 0 0 24.011719,13 l 0,-2 A 1.0125914,1.0125914 0 0 0 23,9.9882812 l -1.314453,0 C 20.876383,6.1119154 17.888085,3.1236169 14.011719,2.3144531 L 14.011719,1 A 1.0125914,1.0125914 0 0 0 13,-0.01171875 l -2,0 z m 1,6.02343755 c 3.324075,0 5.988281,2.6642061 5.988281,5.9882812 0,3.324075 -2.664206,5.988281 -5.988281,5.988281 C 8.6759249,17.988281 6.0117188,15.324075 6.0117188,12 6.0117188,8.6759249 8.6759249,6.0117187 12,6.0117188 Z"
-     style="fill:#ffffff"
-     transform="translate(0.01171875,0.01171875)" />
-  <path
-     d="m 0.01171875,0.01171875 24.00000025,0 0,24.00000025 -24.00000025,0 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-  <path
-     d="m 20.951719,11.011719 c -0.46,-4.1700003 -3.77,-7.4800002 -7.94,-7.9400002 l 0,-2.0600001 -2,0 0,2.0600001 c -4.1700003,0.46 -7.4800002,3.7699999 -7.9400002,7.9400002 l -2.0600001,0 0,2 2.0600001,0 c 0.46,4.17 3.7699999,7.48 7.9400002,7.94 l 0,2.06 2,0 0,-2.06 c 4.17,-0.46 7.48,-3.77 7.94,-7.94 l 2.06,0 0,-2 z m -8.94,8 c -3.8700002,0 -7.0000003,-3.13 -7.0000003,-7 0,-3.8700002 3.1300001,-7.0000003 7.0000003,-7.0000003 3.87,0 7,3.13 7,7.0000003 0,3.87 -3.13,7 -7,7 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccccccccccsssss" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#000000"
-     d="m 16.00053,13.806872 a 4.2187634,4 0 1 1 0.01119,-3.569022 l -3.780543,1.773886 z"
-     id="path4-9" />
-</svg>

res/logo/by-shadow.svg

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="48.046875"
-   viewBox="0 0 24.023438 24.023438"
-   width="48.046875"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="by-shadow.svg"
-   style="fill:#000000"
-   inkscape:export-filename="/home/keith/Code/node/tracman/static/img/icon/by/16.png"
-   inkscape:export-xdpi="27.27"
-   inkscape:export-ydpi="27.27">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10">
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter4310">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4312" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite4314" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.4"
-         result="blur"
-         id="feGaussianBlur4316" />
-      <feOffset
-         dx="0.4"
-         dy="0.4"
-         result="offset"
-         id="feOffset4318" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite4320" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB;"
-       inkscape:label="Drop Shadow"
-       id="filter4394">
-      <feFlood
-         flood-opacity="0.498039"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4396" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite4398" />
-      <feGaussianBlur
-         in="composite1"
-         stdDeviation="0.2"
-         result="blur"
-         id="feGaussianBlur4400" />
-      <feOffset
-         dx="0.4"
-         dy="0.4"
-         result="offset"
-         id="feOffset4402" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite4404" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="748"
-     id="namedview8"
-     showgrid="false"
-     inkscape:snap-midpoints="true"
-     inkscape:zoom="9.8333335"
-     inkscape:cx="24.399869"
-     inkscape:cy="23.448333"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3337" />
-  </sodipodi:namedview>
-  <path
-     sodipodi:type="inkscape:offset"
-     inkscape:radius="3.2822878"
-     inkscape:original="M 12.021484 8.0039062 A 4.2187634 4 0 1 0 15.988281 13.794922 L 12.21875 12 L 16 10.226562 A 4.2187634 4 0 0 0 12.021484 8.0039062 z "
-     style="fill:#fbc93d;fill-opacity:1"
-     id="path5769"
-     d="M 11.876953,4.7246094 C 9.3134474,4.8381543 6.8156954,6.3243567 5.578125,8.6113281 4.3405546,10.8983 4.5056929,13.891624 5.9726562,16.033203 c 1.4669634,2.141579 4.0878638,3.372696 6.6503908,3.238281 2.562527,-0.134415 5.048175,-1.641297 6.265625,-3.939453 a 3.2826161,3.2826161 0 0 0 -0.144531,-3.3125 3.2826161,3.2826161 0 0 0 0.166015,-3.3105466 c -1.32664,-2.543804 -4.205574,-4.1095888 -7.033203,-3.984375 z"
-     inkscape:export-xdpi="49.549999"
-     inkscape:export-ydpi="49.549999"
-     transform="translate(0.01171875,0.01171875)" />
-  <path
-     sodipodi:type="inkscape:offset"
-     inkscape:radius="1.0124902"
-     inkscape:original="M 11 1 L 11 3.0605469 C 6.83 3.5205469 3.5205469 6.83 3.0605469 11 L 1 11 L 1 13 L 3.0605469 13 C 3.5205469 17.17 6.83 20.479453 11 20.939453 L 11 23 L 13 23 L 13 20.939453 C 17.17 20.479453 20.479453 17.17 20.939453 13 L 23 13 L 23 11 L 20.939453 11 C 20.479453 6.83 17.17 3.5205469 13 3.0605469 L 13 1 L 11 1 z M 12 5 C 15.87 5 19 8.13 19 12 C 19 15.87 15.87 19 12 19 C 8.13 19 5 15.87 5 12 C 5 8.13 8.13 5 12 5 z "
-     id="path5765"
-     d="M 11,-0.01171875 A 1.0125914,1.0125914 0 0 0 9.9882812,1 l 0,1.3144531 C 6.1119154,3.1236169 3.1236169,6.1119154 2.3144531,9.9882812 L 1,9.9882812 A 1.0125914,1.0125914 0 0 0 -0.01171875,11 l 0,2 A 1.0125914,1.0125914 0 0 0 1,14.011719 l 1.3144531,0 c 0.8091638,3.876366 3.7974623,6.864664 7.6738281,7.673828 l 0,1.314453 A 1.0125914,1.0125914 0 0 0 11,24.011719 l 2,0 A 1.0125914,1.0125914 0 0 0 14.011719,23 l 0,-1.314453 c 3.876366,-0.809164 6.864664,-3.797462 7.673828,-7.673828 l 1.314453,0 A 1.0125914,1.0125914 0 0 0 24.011719,13 l 0,-2 A 1.0125914,1.0125914 0 0 0 23,9.9882812 l -1.314453,0 C 20.876383,6.1119154 17.888085,3.1236169 14.011719,2.3144531 L 14.011719,1 A 1.0125914,1.0125914 0 0 0 13,-0.01171875 l -2,0 z m 1,6.02343755 c 3.324075,0 5.988281,2.6642061 5.988281,5.9882812 0,3.324075 -2.664206,5.988281 -5.988281,5.988281 C 8.6759249,17.988281 6.0117188,15.324075 6.0117188,12 6.0117188,8.6759249 8.6759249,6.0117187 12,6.0117188 Z"
-     style="fill:#fbc93d;fill-opacity:1"
-     transform="translate(0.01171875,0.01171875)" />
-  <path
-     d="m 0.01171875,0.01171875 24.00000025,0 0,24.00000025 -24.00000025,0 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-  <path
-     d="m 20.951719,11.011719 c -0.46,-4.1700003 -3.77,-7.4800002 -7.94,-7.9400002 l 0,-2.0600001 -2,0 0,2.0600001 c -4.1700003,0.46 -7.4800002,3.7699999 -7.9400002,7.9400002 l -2.0600001,0 0,2 2.0600001,0 c 0.46,4.17 3.7699999,7.48 7.9400002,7.94 l 0,2.06 2,0 0,-2.06 c 4.17,-0.46 7.48,-3.77 7.94,-7.94 l 2.06,0 0,-2 z m -8.94,8 c -3.8700002,0 -7.0000003,-3.13 -7.0000003,-7 0,-3.8700002 3.1300001,-7.0000003 7.0000003,-7.0000003 3.87,0 7,3.13 7,7.0000003 0,3.87 -3.13,7 -7,7 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccccccccccsssss"
-     style="filter:url(#filter4310)"
-     inkscape:export-filename="/home/keith/Code/Android/Tracman/app/src/main/res/drawable-hdpi/logo_by.png"
-     inkscape:export-xdpi="122.73"
-     inkscape:export-ydpi="122.73" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#000000;filter:url(#filter4394)"
-     d="m 16.00053,13.806872 a 4.2187634,4 0 1 1 0.01119,-3.569022 l -3.780543,1.773886 z"
-     id="path4-9" />
-</svg>

res/logo/by.svg

@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="48.046875"
-   viewBox="0 0 24.023438 24.023438"
-   width="48.046875"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="logo-by.svg"
-   style="fill:#000000"
-   inkscape:export-filename="/home/keith/Code/node/tracman/static/img/icon/bw/logo-bw-48.png"
-   inkscape:export-xdpi="89.912193"
-   inkscape:export-ydpi="89.912193">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="748"
-     id="namedview8"
-     showgrid="false"
-     inkscape:snap-midpoints="true"
-     inkscape:zoom="19.666667"
-     inkscape:cx="16.700814"
-     inkscape:cy="25.296434"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3337" />
-  </sodipodi:namedview>
-  <path
-     sodipodi:type="inkscape:offset"
-     inkscape:radius="3.2822878"
-     inkscape:original="M 12.021484 8.0039062 A 4.2187634 4 0 1 0 15.988281 13.794922 L 12.21875 12 L 16 10.226562 A 4.2187634 4 0 0 0 12.021484 8.0039062 z "
-     style="fill:#fbc93d;fill-opacity:1"
-     id="path5769"
-     d="M 11.876953,4.7246094 C 9.3134474,4.8381543 6.8156954,6.3243567 5.578125,8.6113281 4.3405546,10.8983 4.5056929,13.891624 5.9726562,16.033203 c 1.4669634,2.141579 4.0878638,3.372696 6.6503908,3.238281 2.562527,-0.134415 5.048175,-1.641297 6.265625,-3.939453 a 3.2826161,3.2826161 0 0 0 -0.144531,-3.3125 3.2826161,3.2826161 0 0 0 0.166015,-3.3105466 c -1.32664,-2.543804 -4.205574,-4.1095888 -7.033203,-3.984375 z"
-     inkscape:export-xdpi="49.549999"
-     inkscape:export-ydpi="49.549999"
-     transform="translate(0.01171875,0.01171875)" />
-  <path
-     sodipodi:type="inkscape:offset"
-     inkscape:radius="1.0124902"
-     inkscape:original="M 11 1 L 11 3.0605469 C 6.83 3.5205469 3.5205469 6.83 3.0605469 11 L 1 11 L 1 13 L 3.0605469 13 C 3.5205469 17.17 6.83 20.479453 11 20.939453 L 11 23 L 13 23 L 13 20.939453 C 17.17 20.479453 20.479453 17.17 20.939453 13 L 23 13 L 23 11 L 20.939453 11 C 20.479453 6.83 17.17 3.5205469 13 3.0605469 L 13 1 L 11 1 z M 12 5 C 15.87 5 19 8.13 19 12 C 19 15.87 15.87 19 12 19 C 8.13 19 5 15.87 5 12 C 5 8.13 8.13 5 12 5 z "
-     id="path5765"
-     d="M 11,-0.01171875 A 1.0125914,1.0125914 0 0 0 9.9882812,1 l 0,1.3144531 C 6.1119154,3.1236169 3.1236169,6.1119154 2.3144531,9.9882812 L 1,9.9882812 A 1.0125914,1.0125914 0 0 0 -0.01171875,11 l 0,2 A 1.0125914,1.0125914 0 0 0 1,14.011719 l 1.3144531,0 c 0.8091638,3.876366 3.7974623,6.864664 7.6738281,7.673828 l 0,1.314453 A 1.0125914,1.0125914 0 0 0 11,24.011719 l 2,0 A 1.0125914,1.0125914 0 0 0 14.011719,23 l 0,-1.314453 c 3.876366,-0.809164 6.864664,-3.797462 7.673828,-7.673828 l 1.314453,0 A 1.0125914,1.0125914 0 0 0 24.011719,13 l 0,-2 A 1.0125914,1.0125914 0 0 0 23,9.9882812 l -1.314453,0 C 20.876383,6.1119154 17.888085,3.1236169 14.011719,2.3144531 L 14.011719,1 A 1.0125914,1.0125914 0 0 0 13,-0.01171875 l -2,0 z m 1,6.02343755 c 3.324075,0 5.988281,2.6642061 5.988281,5.9882812 0,3.324075 -2.664206,5.988281 -5.988281,5.988281 C 8.6759249,17.988281 6.0117188,15.324075 6.0117188,12 6.0117188,8.6759249 8.6759249,6.0117187 12,6.0117188 Z"
-     style="fill:#fbc93d;fill-opacity:1"
-     transform="translate(0.01171875,0.01171875)" />
-  <path
-     d="m 0.01171875,0.01171875 24.00000025,0 0,24.00000025 -24.00000025,0 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:none" />
-  <path
-     d="m 20.951719,11.011719 c -0.46,-4.1700003 -3.77,-7.4800002 -7.94,-7.9400002 l 0,-2.0600001 -2,0 0,2.0600001 c -4.1700003,0.46 -7.4800002,3.7699999 -7.9400002,7.9400002 l -2.0600001,0 0,2 2.0600001,0 c 0.46,4.17 3.7699999,7.48 7.9400002,7.94 l 0,2.06 2,0 0,-2.06 c 4.17,-0.46 7.48,-3.77 7.94,-7.94 l 2.06,0 0,-2 z m -8.94,8 c -3.8700002,0 -7.0000003,-3.13 -7.0000003,-7 0,-3.8700002 3.1300001,-7.0000003 7.0000003,-7.0000003 3.87,0 7,3.13 7,7.0000003 0,3.87 -3.13,7 -7,7 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccccccccccsssss" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#000000"
-     d="m 16.00053,13.806872 a 4.2187634,4 0 1 1 0.01119,-3.569022 l -3.780543,1.773886 z"
-     id="path4-9" />
-</svg>

res/logo/white-trans.svg

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   fill="#000000"
-   height="48"
-   viewBox="0 0 24 24"
-   width="48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="white-trans.svg"
-   inkscape:export-filename="/home/keith/Code/Android/Tracman/app/src/main/res/drawable-hdpi/logo_trans.png"
-   inkscape:export-xdpi="67.5"
-   inkscape:export-ydpi="67.5">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10">
-    <filter
-       inkscape:label="Opacity"
-       style="color-interpolation-filters:sRGB;"
-       id="filter3355">
-      <feColorMatrix
-         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 5 -1 "
-         result="colormatrix"
-         id="feColorMatrix3357" />
-      <feComposite
-         in2="colormatrix"
-         operator="arithmetic"
-         k2="0.5"
-         result="composite"
-         id="feComposite3359" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="748"
-     id="namedview8"
-     showgrid="false"
-     inkscape:snap-midpoints="true"
-     inkscape:zoom="9.8333335"
-     inkscape:cx="20.507251"
-     inkscape:cy="22.386632"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3337" />
-  </sodipodi:namedview>
-  <path
-     d="M0 0h24v24H0z"
-     id="path4"
-     fill="none" />
-  <path
-     d="M 20.94,11 C 20.48,6.83 17.17,3.52 13,3.06 L 13,1 11,1 11,3.06 C 6.83,3.52 3.52,6.83 3.06,11 L 1,11 l 0,2 2.06,0 c 0.46,4.17 3.77,7.48 7.94,7.94 l 0,2.06 2,0 0,-2.06 C 17.17,20.48 20.48,17.17 20.94,13 L 23,13 23,11 Z M 12,19 C 8.13,19 5,15.87 5,12 5,8.13 8.13,5 12,5 c 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccccccccccsssss" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#000000"
-     d="m 15.988811,13.795153 a 4.2187634,4 0 1 1 0.01119,-3.569022 l -3.780543,1.773886 z"
-     id="path4-9" />
-  <path
-     style="fill:#ffffff;filter:url(#filter3355)"
-     d="m 23.490935,31.937791 c -0.09788,-0.01269 -0.453877,-0.07829 -0.791103,-0.145762 -2.300431,-0.460296 -4.337748,-1.81181 -5.524057,-3.664544 -0.44367,-0.692909 -0.880275,-1.846406 -1.037542,-2.741158 -0.12118,-0.689442 -0.122269,-2.10555 -0.0021,-2.757751 0.464315,-2.520417 1.950171,-4.475681 4.278551,-5.630218 0.780811,-0.387168 1.322452,-0.581371 2.114168,-0.758025 3.189914,-0.711761 6.433881,0.314229 8.389304,2.653339 0.380791,0.455508 0.951598,1.303892 0.998847,1.484575 0.01524,0.05827 -0.897762,0.507385 -3.707152,1.823595 -2.050054,0.960458 -3.743662,1.761257 -3.763573,1.779555 -0.01991,0.0183 1.284325,0.661512 2.898305,1.429366 1.613979,0.767854 3.308182,1.574736 3.764895,1.793071 l 0.830387,0.396973 -0.162638,0.291065 c -0.728679,1.304084 -2.000056,2.503451 -3.378348,3.187002 -1.281341,0.635469 -2.159121,0.841509 -3.687585,0.86558 -0.573305,0.009 -1.122457,0.006 -1.220339,-0.0067 z"
-     id="path3339"
-     inkscape:connector-curvature="0"
-     transform="scale(0.5,0.5)" />
-  <path
-     style="fill:#ffffff"
-     d="m 22.016359,43.905089 0,-2.049034 -0.472477,-0.05967 C 18.450732,41.405707 15.37349,40.075058 12.711275,37.977019 12.034625,37.443765 10.432061,35.821611 9.8923288,35.123615 7.8541766,32.48782 6.5570641,29.395497 6.1758234,26.263445 l -0.035588,-0.292373 -2.0534632,0 -2.0534632,0 0,-1.98305 0,-1.983051 2.0487483,0 2.0487482,0 0.1127191,-0.724577 c 0.599214,-3.85184 2.3287028,-7.250446 5.0915727,-10.005414 2.82101,-2.812941 6.436711,-4.5823511 10.439737,-5.1088785 l 0.241525,-0.031768 0,-2.0562064 0,-2.0562065 1.983051,0 1.983051,0 0,2.0562065 0,2.0562064 0.241525,0.031768 c 6.055798,0.7965333 11.243423,4.4983015 13.894993,9.9151405 0.844865,1.72596 1.341475,3.303861 1.636317,5.199152 l 0.112719,0.724577 2.048748,0 2.048748,0 0,1.983051 0,1.98305 -2.049826,0 -2.049828,0 -0.110799,0.75218 c -0.192208,1.304829 -0.63931,2.912391 -1.162568,4.180024 -0.543916,1.317676 -1.521782,2.976479 -2.487188,4.21914 -0.538794,0.693528 -1.785803,1.987976 -2.461824,2.555474 -2.204829,1.850884 -4.683929,3.120243 -7.372882,3.775094 -0.612253,0.149105 -1.917248,0.382495 -2.138709,0.382495 l -0.149426,0 0,2.059322 0,2.059322 -1.983051,0 -1.983051,0 0,-2.049034 z m 4.037633,-6.035108 c 4.972356,-0.752988 9.139502,-4.053473 10.978841,-8.695519 0.676309,-1.706842 0.970201,-3.280364 0.968687,-5.18644 -0.0012,-1.506015 -0.146533,-2.554072 -0.547231,-3.946206 -0.48784,-1.694889 -1.410776,-3.454087 -2.558029,-4.875828 -0.491872,-0.609556 -1.653766,-1.754156 -2.252782,-2.21925 -2.69679,-2.09387 -6.060389,-3.1401596 -9.444915,-2.93796 -3.017545,0.180276 -5.78054,1.254768 -8.082868,3.14332 -0.65663,0.53862 -1.696105,1.594085 -2.15865,2.191856 -1.608249,2.078424 -2.583835,4.467791 -2.896184,7.09322 -0.083554,0.702309 -0.083555,2.480821 -10e-7,3.152542 0.401961,3.231545 1.794606,6.103508 4.044146,8.339988 1.088817,1.082496 2.28325,1.940209 3.635698,2.610767 1.401625,0.69494 2.755494,1.118848 4.241388,1.328015 1.012296,0.142499 1.052732,0.144737 2.271555,0.125676 0.778237,-0.01217 1.29696,-0.04795 1.800345,-0.124181 z"
-     id="path3341"
-     inkscape:connector-curvature="0"
-     transform="scale(0.5,0.5)" />
-</svg>

res/logo/white.svg

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   fill="#000000"
-   height="48"
-   viewBox="0 0 24 24"
-   width="48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="logo-white.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="748"
-     id="namedview8"
-     showgrid="false"
-     inkscape:snap-midpoints="true"
-     inkscape:zoom="19.666667"
-     inkscape:cx="16.677376"
-     inkscape:cy="23.239097"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M0 0h24v24H0z"
-     id="path4"
-     fill="none" />
-  <path
-     d="M 20.94,11 C 20.48,6.83 17.17,3.52 13,3.06 L 13,1 11,1 11,3.06 C 6.83,3.52 3.52,6.83 3.06,11 L 1,11 l 0,2 2.06,0 c 0.46,4.17 3.77,7.48 7.94,7.94 l 0,2.06 2,0 0,-2.06 C 17.17,20.48 20.48,17.17 20.94,13 L 23,13 23,11 Z M 12,19 C 8.13,19 5,15.87 5,12 5,8.13 8.13,5 12,5 c 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccccccccccsssss" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#000000"
-     d="m 15.988811,13.795153 a 4.2187634,4 0 1 1 0.01119,-3.569022 l -3.780543,1.773886 z"
-     id="path4-9" />
-  <path
-     style="fill:#ffffff"
-     d="m 23.490935,31.937791 c -0.09788,-0.01269 -0.453877,-0.07829 -0.791103,-0.145762 -2.300431,-0.460296 -4.337748,-1.81181 -5.524057,-3.664544 -0.44367,-0.692909 -0.880275,-1.846406 -1.037542,-2.741158 -0.12118,-0.689442 -0.122269,-2.10555 -0.0021,-2.757751 0.464315,-2.520417 1.950171,-4.475681 4.278551,-5.630218 0.780811,-0.387168 1.322452,-0.581371 2.114168,-0.758025 3.189914,-0.711761 6.433881,0.314229 8.389304,2.653339 0.380791,0.455508 0.951598,1.303892 0.998847,1.484575 0.01524,0.05827 -0.897762,0.507385 -3.707152,1.823595 -2.050054,0.960458 -3.743662,1.761257 -3.763573,1.779555 -0.01991,0.0183 1.284325,0.661512 2.898305,1.429366 1.613979,0.767854 3.308182,1.574736 3.764895,1.793071 l 0.830387,0.396973 -0.162638,0.291065 c -0.728679,1.304084 -2.000056,2.503451 -3.378348,3.187002 -1.281341,0.635469 -2.159121,0.841509 -3.687585,0.86558 -0.573305,0.009 -1.122457,0.006 -1.220339,-0.0067 z"
-     id="path3339"
-     inkscape:connector-curvature="0"
-     transform="scale(0.5,0.5)" />
-  <path
-     style="fill:#ffffff"
-     d="m 22.016359,43.905089 0,-2.049034 -0.472477,-0.05967 C 18.450732,41.405707 15.37349,40.075058 12.711275,37.977019 12.034625,37.443765 10.432061,35.821611 9.8923288,35.123615 7.8541766,32.48782 6.5570641,29.395497 6.1758234,26.263445 l -0.035588,-0.292373 -2.0534632,0 -2.0534632,0 0,-1.98305 0,-1.983051 2.0487483,0 2.0487482,0 0.1127191,-0.724577 c 0.599214,-3.85184 2.3287028,-7.250446 5.0915727,-10.005414 2.82101,-2.812941 6.436711,-4.5823511 10.439737,-5.1088785 l 0.241525,-0.031768 0,-2.0562064 0,-2.0562065 1.983051,0 1.983051,0 0,2.0562065 0,2.0562064 0.241525,0.031768 c 6.055798,0.7965333 11.243423,4.4983015 13.894993,9.9151405 0.844865,1.72596 1.341475,3.303861 1.636317,5.199152 l 0.112719,0.724577 2.048748,0 2.048748,0 0,1.983051 0,1.98305 -2.049826,0 -2.049828,0 -0.110799,0.75218 c -0.192208,1.304829 -0.63931,2.912391 -1.162568,4.180024 -0.543916,1.317676 -1.521782,2.976479 -2.487188,4.21914 -0.538794,0.693528 -1.785803,1.987976 -2.461824,2.555474 -2.204829,1.850884 -4.683929,3.120243 -7.372882,3.775094 -0.612253,0.149105 -1.917248,0.382495 -2.138709,0.382495 l -0.149426,0 0,2.059322 0,2.059322 -1.983051,0 -1.983051,0 0,-2.049034 z m 4.037633,-6.035108 c 4.972356,-0.752988 9.139502,-4.053473 10.978841,-8.695519 0.676309,-1.706842 0.970201,-3.280364 0.968687,-5.18644 -0.0012,-1.506015 -0.146533,-2.554072 -0.547231,-3.946206 -0.48784,-1.694889 -1.410776,-3.454087 -2.558029,-4.875828 -0.491872,-0.609556 -1.653766,-1.754156 -2.252782,-2.21925 -2.69679,-2.09387 -6.060389,-3.1401596 -9.444915,-2.93796 -3.017545,0.180276 -5.78054,1.254768 -8.082868,3.14332 -0.65663,0.53862 -1.696105,1.594085 -2.15865,2.191856 -1.608249,2.078424 -2.583835,4.467791 -2.896184,7.09322 -0.083554,0.702309 -0.083555,2.480821 -10e-7,3.152542 0.401961,3.231545 1.794606,6.103508 4.044146,8.339988 1.088817,1.082496 2.28325,1.940209 3.635698,2.610767 1.401625,0.69494 2.755494,1.118848 4.241388,1.328015 1.012296,0.142499 1.052732,0.144737 2.271555,0.125676 0.778237,-0.01217 1.29696,-0.04795 1.800345,-0.124181 z"
-     id="path3341"
-     inkscape:connector-curvature="0"
-     transform="scale(0.5,0.5)" />
-</svg>

res/logo/yellow.svg

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   fill="#000000"
-   height="48"
-   viewBox="0 0 24 24"
-   width="48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="logo-yellow.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="748"
-     id="namedview8"
-     showgrid="false"
-     inkscape:snap-midpoints="true"
-     inkscape:zoom="19.666667"
-     inkscape:cx="17.084156"
-     inkscape:cy="23.340792"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M0 0h24v24H0z"
-     id="path4"
-     fill="none" />
-  <path
-     d="M 20.94,11 C 20.48,6.83 17.17,3.52 13,3.06 L 13,1 11,1 11,3.06 C 6.83,3.52 3.52,6.83 3.06,11 L 1,11 l 0,2 2.06,0 c 0.46,4.17 3.77,7.48 7.94,7.94 l 0,2.06 2,0 0,-2.06 C 17.17,20.48 20.48,17.17 20.94,13 L 23,13 23,11 Z M 12,19 C 8.13,19 5,15.87 5,12 5,8.13 8.13,5 12,5 c 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7 z"
-     id="path6"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccccccccccccccccsssss"
-     style="fill:#fbc93d;fill-opacity:1" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#fbc93d;fill-opacity:1"
-     d="m 15.988811,13.795153 a 4.2187634,4 0 1 1 0.01119,-3.569022 l -3.780543,1.773886 z"
-     id="path4-9" />
-</svg>