Modified .gitignore and removed unnecessary files

Release 3.2.0

See merge request RiskAhead/RiskAhead-Android!6

.gitignore

@@ -1,7 +1,10 @@
 .gradle
-/local.properties
+.idea
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
+*.hprof
+/local.properties
+/app/release/
+/releeas
+/app/build/
 /build
 /captures

.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/compiler.xml

@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <resourceExtensions />
+    <bytecodeTargetLevel target="1.8" />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
   </component>
 </project>

.idea/gradle.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
+        <option name="delegatedBuild" value="false" />
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        <option name="testRunner" value="PLATFORM" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-4.1" />
+        <option name="gradleJvm" value="openjdk-16" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/jarRepositories.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.fabric.io/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://maven.google.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+  </component>
+</project>

.idea/misc.xml

@@ -2,29 +2,44 @@
 <project version="4">
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/modules.xml

@@ -3,7 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/RiskAhead-Android.iml" filepath="$PROJECT_DIR$/RiskAhead-Android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/RiskAhead-Android.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/RiskAhead-Android.app.iml" />
     </modules>
   </component>
 </project>

LICENSE

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

RiskAhead-Android.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="RiskAhead-Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="RiskAhead-Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -8,10 +8,11 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

app/app.iml

@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkReleaseClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_aapt_derived_proguard_rules" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_main_dex_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged-not-compiled-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res_stripped" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/reports" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-base:17.1.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-lite:17.1.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.mikepenz:iconics-core:3.0.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk-api:16.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.zxing:core:3.3.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics:16.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:customtabs:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.3.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:17.0.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:crashlytics-core:2.6.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-audience:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.mikepenz:materialdrawer:6.0.6@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-location:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-api:16.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-maps:16.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-core:16.0.7@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics-impl:16.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.3.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.mikepenz:materialize:1.1.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.8.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-places-placereport:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.android:facebook-core:4.40.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-plus:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.parse.bolts:bolts-android:1.4.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-base:16.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.13.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gcm:16.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.mikepenz:fastadapter:3.2.4@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.parse.bolts:bolts-applinks:1.4.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:beta:1.2.9@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector-impl:17.0.5@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.mikepenz:google-material-typeface:3.0.1.2.original@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.android:facebook-login:4.40.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: io.fabric.sdk.android:fabric:1.4.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.mikepenz:fastadapter-extensions-expandable:3.2.4@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.mcxiaoke.volley:library:1.0.19@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:answers:1.4.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.twitter.sdk.android:twitter-core:3.3.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:16.0.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-iid:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.android:facebook-common:4.40.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.crashlytics.sdk.android:crashlytics:2.9.4@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.beardedhen:androidbootstrap:2.3.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads:17.1.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.maps.android:android-maps-utils:0.5@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-gass:17.1.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-measurement-connector:17.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android-android-28" level="project" />
-  </component>
-</module>

app/build.gradle

@@ -1,16 +1,17 @@
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.crashlytics'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.2'
 
     defaultConfig {
         applicationId "org.deke.risk.riskahead"
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 29
-        versionCode 53
+        versionCode 58
-        versionName "3.1.8"
+        versionName "3.2.2"
         multiDexEnabled true
     }
     buildTypes {
@@ -42,40 +43,37 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: 'Parse-*.jar')
 
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.facebook.android:facebook-login:[4,5)'
+    implementation 'com.facebook.android:facebook-login:4.42.0'
     implementation('com.twitter.sdk.android:twitter-core:3.3.0@aar') {
         transitive = true
     }
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
+    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
-        transitive = true
+    implementation 'com.google.firebase:firebase-crashlytics-ndk:17.2.2'
-    }
 
-    implementation 'com.mikepenz:iconics-core:3.0.3@aar'
+    implementation 'com.mikepenz:iconics-core:3.0.4@aar'
     implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
-    implementation('com.mikepenz:materialdrawer:6.0.6@aar') {
+    implementation('com.mikepenz:materialdrawer:6.0.8@aar') {
         transitive = true
     }
 
-    implementation 'com.android.support:customtabs:28.0.0'
+    implementation 'androidx.browser:browser:1.2.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.google.android.material:material:1.2.1'
 
-    implementation 'com.google.android.gms:play-services-auth:16.0.1'
+    implementation 'com.google.android.gms:play-services-auth:18.1.0'
-    implementation 'com.google.android.gms:play-services-gcm:16.1.0'
+    implementation 'com.google.android.gms:play-services-gcm:17.0.0'
-    implementation 'com.google.android.gms:play-services-plus:16.0.0'
+    implementation 'com.google.android.gms:play-services-plus:17.0.0'
-    implementation 'com.google.android.gms:play-services-location:16.0.0'
+    implementation 'com.google.android.gms:play-services-location:17.1.0'
-    implementation 'com.google.android.gms:play-services-ads:17.1.3'
+    implementation 'com.google.android.gms:play-services-ads:19.4.0'
-    implementation 'com.google.android.gms:play-services-maps:16.1.0'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
 
     implementation 'com.google.maps.android:android-maps-utils:0.5'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.beardedhen:androidbootstrap:2.3.2'
     implementation 'com.mcxiaoke.volley:library:1.0.19'
-    implementation 'com.google.firebase:firebase-core:16.0.7'
+    implementation 'com.google.firebase:firebase-core:17.5.0'
-}
+}
-
-apply plugin: 'com.google.gms.google-services'

app/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":53,"versionName":"3.1.8","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/java/org/deke/risk/riskahead/LoginActivity.java

@@ -7,12 +7,12 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.util.Patterns;
@@ -38,7 +38,7 @@ import org.json.JSONObject;
 import com.android.volley.Request.Method;
 import com.android.volley.toolbox.StringRequest;
 import com.beardedhen.androidbootstrap.BootstrapButton;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -112,7 +112,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
         if(connectivityManager != null){
             activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get connectivityManager");
+            FirebaseCrashlytics.getInstance().log("Could not get connectivityManager");
         }
 
         if(activeNetworkInfo == null){
@@ -284,8 +284,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                     }
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
         }) {
@@ -332,8 +332,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                     }
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
         }) {
@@ -346,8 +346,8 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                 try {
                     versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
                 } catch (PackageManager.NameNotFoundException e) {
-                    Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                    FirebaseCrashlytics.getInstance().log("JSONException caught");
-                    Crashlytics.logException(e);
+                    FirebaseCrashlytics.getInstance().recordException(e);
                 }
 
                 params.put("version", Integer.toString(versionCode));
@@ -500,16 +500,16 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                     finish();
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error at social media login (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error at social media login (Server returned error): " + errorMsg);
                     Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_login)+getResources().getString(R.string.txt_errormsg_suffix), Toast.LENGTH_LONG).show();
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
 
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Social Media Login Error: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Social Media Login Error: " + error.getMessage());
             Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_login)+getResources().getString(R.string.txt_errormsg_suffix), Toast.LENGTH_LONG).show();
             hideDialog();
         }) {
@@ -595,15 +595,15 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                     }
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error at login (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error at login (Server returned error): " + errorMsg);
                     Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_login), Toast.LENGTH_LONG).show();
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Login Error: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Login Error: " + error.getMessage());
             Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_login), Toast.LENGTH_LONG).show();
             hideDialog();
         }) {
@@ -639,15 +639,15 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
 
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error occured: "+errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error occured: "+errorMsg);
                     Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+                FirebaseCrashlytics.getInstance().log("Exception caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Registration Error: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Registration Error: " + error.getMessage());
             Toast.makeText(getApplicationContext(),
                     getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
             hideDialog();
@@ -681,15 +681,15 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
 
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error occured: "+errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error occured: "+errorMsg);
                     Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Registration Error: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Registration Error: " + error.getMessage());
             Toast.makeText(getApplicationContext(),
                     getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
             hideDialog();
@@ -820,17 +820,17 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                     showMessage(getString(R.string.alert_passwordreset_confirmation));
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Reset PW returned error value: "+errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Reset PW returned error value: "+errorMsg);
                     Toast.makeText(getApplicationContext(),
                             getResources().getString(R.string.txt_errormsg_getpwreset), Toast.LENGTH_LONG).show();
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
 
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "E-Mail pw resend Error: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("E-Mail pw resend Error: " + error.getMessage());
             Toast.makeText(getApplicationContext(),
                     getResources().getString(R.string.txt_errormsg_getpwreset), Toast.LENGTH_LONG).show();
             hideDialog();
@@ -856,17 +856,17 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                 boolean error = jObj.getBoolean("error");
                 if (error) {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG,"Resend E-Mail returned error value: "+errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Resend E-Mail returned error value: "+errorMsg);
                     Toast.makeText(getApplicationContext(),
                             getResources().getString(R.string.txt_errormsg_getactivationlink) + ":"+errorMsg, Toast.LENGTH_LONG).show();
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
 
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "E-Mail pw resend error: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("E-Mail pw resend error: " + error.getMessage());
             Toast.makeText(getApplicationContext(),
                     getResources().getString(R.string.txt_errormsg_getactivationlink), Toast.LENGTH_LONG).show();
             hideDialog();
@@ -906,15 +906,15 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
                             .show();
                 } else if (error){
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error occured: "+errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error occured: "+errorMsg);
                     Toast.makeText(getApplicationContext(), getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Registration Error: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Registration Error: " + error.getMessage());
             Toast.makeText(getApplicationContext(),
                     getResources().getString(R.string.txt_errormsg_register), Toast.LENGTH_LONG).show();
             hideDialog();
@@ -982,7 +982,7 @@ public class LoginActivity extends AppCompatActivity implements FacebookButtonFr
         Log.d(TAG, "testest");
         if (requestCode == GooglePlusButtonFragment.RC_SIGN_IN) {
             GooglePlusButtonFragment fragment = (GooglePlusButtonFragment) getSupportFragmentManager().findFragmentById(R.id.frag_login_btnGP);
-            fragment.onActivityResult(requestCode, resultCode, data);
+            if(fragment != null) fragment.onActivityResult(requestCode, resultCode, data);
         }
 
         TwitterButtonFragment twitter_fragment = (TwitterButtonFragment) getSupportFragmentManager().findFragmentById(R.id.frag_login_btnTW);

app/src/main/java/org/deke/risk/riskahead/MapsActivity.java

@@ -13,14 +13,14 @@ import android.location.Location;
 import android.location.LocationManager;
 import android.location.LocationListener;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.LoaderManager;
+import androidx.loader.app.LoaderManager;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v4.content.CursorLoader;
+import androidx.loader.content.CursorLoader;
-import android.support.v4.content.Loader;
+import androidx.loader.content.Loader;
-import android.support.v7.widget.SearchView;
+import androidx.appcompat.widget.SearchView;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
@@ -30,7 +30,7 @@ import android.widget.LinearLayout;
 import android.widget.RatingBar;
 import android.widget.TextView;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
@@ -150,7 +150,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         Log.d(TAG, "Getting permission results...");
         switch (requestCode) {
             case MY_PERMISSIONS_REQUEST_LOCATION: {
@@ -361,8 +361,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
             try {
                 mClusterManager.addItem(new IncidentReport(incidents.getJSONObject(i)));
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
         }
 
@@ -384,8 +383,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
             try {
                 heatMapPositions.add(new WeightedLatLng(new LatLng(incidents.getJSONObject(i).getDouble("latitude"), incidents.getJSONObject(i).getDouble("longitude")), 1.0));
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
         }
 
@@ -419,16 +417,15 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
                     String errorMsg = jObj.getString("error_msg");
 
                     int loglevel =  errorMsg.contains("Could not retrieve incidents from bound") ? Log.INFO : Log.ERROR;
-                    Crashlytics.log(loglevel, TAG, "Error getting map heat map positions (server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error getting map heat map positions (server returned error): " + errorMsg);
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
 
         }, error -> {
             hideProgress();
-            Crashlytics.log(Log.ERROR, TAG, "Error getting map positions: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error getting map positions: " + error.getMessage());
             handleVolleyErrorResponse();
         }) {
             @Override
@@ -460,16 +457,15 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
                     addIncidentMarkersOnMap(incidents);
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.INFO, TAG, "Error getting map positions (server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error getting map positions (server returned error): " + errorMsg);
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
 
         }, error -> {
             hideProgress();
-            Crashlytics.log(Log.ERROR, TAG, "Error getting map positions: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error getting map positions: " + error.getMessage());
             showMessage(getString(R.string.errormsg_couldnotretrieve));
         }) {
             @Override
@@ -546,13 +542,12 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
                     showMessage(getResources().getString(R.string.txt_errormsg_getinfowindow));
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
 
         }, error -> {
             hideProgress();
-            Crashlytics.log(Log.ERROR, TAG, "Error getting incident details: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error getting incident details: " + error.getMessage());
             handleVolleyErrorResponse();
         }) {
             @Override
@@ -664,13 +659,13 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
     private void doSearch(String query) {
         Bundle data = new Bundle();
         data.putString("query", query);
-        getSupportLoaderManager().restartLoader(0, data, this);
+        LoaderManager.getInstance(this).restartLoader(0, data, this);
     }
 
     private void getPlace(String query) {
         Bundle data = new Bundle();
         data.putString("query", query);
-        getSupportLoaderManager().restartLoader(1, data, this);
+        LoaderManager.getInstance(this).restartLoader(1, data, this);
     }
 
     private void showLocation(Cursor c) {
@@ -793,8 +788,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
                     mMap.moveCamera(CameraUpdateFactory.newLatLng(myLocation));
                 }
             } catch (Exception e) {
-                Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+                FirebaseCrashlytics.getInstance().log("Exception caught: " + e);
-                Crashlytics.logException(e);
             }
         }
     }
@@ -805,8 +799,7 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
         }catch(SecurityException se){
             ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}, MY_PERMISSIONS_REQUEST_LOCATION);
         }catch(AssertionError ae){
-            Crashlytics.log(Log.ERROR, TAG, "Could not find mapFragment view");
+            FirebaseCrashlytics.getInstance().log("Could not find mapFragment view: " + ae);
-            Crashlytics.logException(ae);
         }
     }
 
@@ -826,12 +819,12 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
             SearchView searchView = (SearchView) menu.findItem(R.id.location_search).getActionView();
             searchView.setSearchableInfo(searchInfo);
 
-            EditText txtSearch = searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text);
+            EditText txtSearch = searchView.findViewById(androidx.appcompat.R.id.search_src_text);
             txtSearch.setHint(getResources().getString(R.string.search_hint));
             txtSearch.setHintTextColor(Color.DKGRAY);
             txtSearch.setTextColor(Color.BLACK);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get searchManager");
+            FirebaseCrashlytics.getInstance().log("Could not get searchManager");
         }
 
         return true;

app/src/main/java/org/deke/risk/riskahead/ProfileActivity.java

@@ -2,9 +2,9 @@ package org.deke.risk.riskahead;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
+import com.google.android.material.tabs.TabLayout;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.Log;
 
 import org.deke.risk.riskahead.helper.AppConfig;

app/src/main/java/org/deke/risk/riskahead/ReportWFActivity.java

@@ -7,27 +7,27 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.location.Address;
 import android.location.Geocoder;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand;
 import com.google.android.gms.maps.model.LatLng;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.google.gson.Gson;
 
 import org.deke.risk.riskahead.fragment.BaseReportWFFragment;
@@ -201,8 +201,7 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
                     }
                 }
             } catch (IOException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
                 incident.setIncidentPositionDescription("Latitude: " + latlngpos.latitude + "\nLongitude: " + latlngpos.longitude);
             }
     }
@@ -310,17 +309,16 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
                     showShareDialog(incident);
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error adding incident (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error adding incident (Server returned error): " + errorMsg);
                     showMessage(getResources().getString(R.string.txt_errormsg_createincident));
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
 
             hideDialog();
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error adding incident: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error adding incident: " + error.getMessage());
             handleVolleyErrorResponse();
             hideDialog();
         }) {
@@ -369,7 +367,7 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         switch (requestCode) {
             case MY_PERMISSIONS_REQUEST_STORAGE: {
                 if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
@@ -448,7 +446,9 @@ public class ReportWFActivity extends BaseActivity implements ReportWF_1_Fragmen
         super.onResume();
 
         Gson gson = new Gson();
-        if(!mPrefs.getString("incident", "").equals("")) incident = gson.fromJson(mPrefs.getString("incident", ""), IncidentReport.class);
+        String tmpString = mPrefs.getString("incident", "");
+
+        if(tmpString != null && !tmpString.equals("")) incident = gson.fromJson(tmpString, IncidentReport.class);
 
         Intent intent = getIntent();
         String pos = intent.getStringExtra(EXTRA_MESSAGE);

app/src/main/java/org/deke/risk/riskahead/SubscriptionsActivity.java

@@ -11,7 +11,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.Log;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -19,7 +19,7 @@ import android.widget.LinearLayout;
 import com.android.vending.billing.IInAppBillingService;
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.adapter.SubscriptionsPagerAdapter;
 import org.deke.risk.riskahead.fragment.SubscriptionItemFragment;
@@ -191,8 +191,8 @@ public class SubscriptionsActivity extends BaseActivity{
 
             }
         } catch (RemoteException e) {
-            Crashlytics.log(Log.ERROR, TAG, "RemoteException caught");
+            FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
-            Crashlytics.logException(e);
+            crashlytics.log("RemoteException caught: " + e);
         }
     }
 
@@ -252,7 +252,7 @@ public class SubscriptionsActivity extends BaseActivity{
                         Log.d(TAG,"Product: "+sku+" Price: "+price+" Title: "+title+" Description: "+description);
                     }
                 }else{
-                    Crashlytics.log(Log.ERROR, TAG, "Could not get responseList");
+                    FirebaseCrashlytics.getInstance().log("Could not get responseList");
                 }
 
                 ((SubscriptionItemFragment) subscriptionsAdapter.getItem(0)).initSubscription(purchaseMap.get("no_ads_03"));
@@ -260,8 +260,7 @@ public class SubscriptionsActivity extends BaseActivity{
             }
 
         } catch (Exception e) {
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+            FirebaseCrashlytics.getInstance().log("Exception caught: " + e);
-            Crashlytics.logException(e);
         }
     }
 
@@ -276,32 +275,30 @@ public class SubscriptionsActivity extends BaseActivity{
                 startIntentSenderForResult(pendingIntent.getIntentSender(),1001, new Intent(), 0, 0, 0);
             }
         } catch (Exception e) {
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+            FirebaseCrashlytics.getInstance().log("Exception caught: " + e);
-            Crashlytics.logException(e);
         }
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == 1001) {
             int responseCode = data.getIntExtra("RESPONSE_CODE", 0);
             String purchaseData = data.getStringExtra("INAPP_PURCHASE_DATA");
             String dataSignature = data.getStringExtra("INAPP_DATA_SIGNATURE");
 
-            Log.d(TAG,"Response Code: "+responseCode + " DataSignature: "+dataSignature);
+            Log.d(TAG, "Response Code: " + responseCode + " DataSignature: " + dataSignature);
 
             if (resultCode == RESULT_OK) {
                 try {
                     JSONObject jo = new JSONObject(purchaseData);
                     String sku = jo.getString("productId");
 
-                    showMessage(String.format("%s %s. %s",getResources().getString(R.string.txt_subs_youbought),purchaseMap.get(sku).getString("title"),getResources().getString(R.string.txt_subs_thankyou)));
+                    showMessage(String.format("%s %s. %s", getResources().getString(R.string.txt_subs_youbought), purchaseMap.get(sku).getString("title"), getResources().getString(R.string.txt_subs_thankyou)));
-                    addSubscription(purchaseMap.get(sku).getString("productId"),purchaseMap.get(sku).getString("type"),purchaseMap.get(sku).getString("price_amount_micros"),purchaseMap.get(sku).getString("price_currency_code"));
+                    addSubscription(purchaseMap.get(sku).getString("productId"), purchaseMap.get(sku).getString("type"), purchaseMap.get(sku).getString("price_amount_micros"), purchaseMap.get(sku).getString("price_currency_code"));
-                }
+                } catch (JSONException e) {
-                catch (JSONException e) {
                     showMessage(getResources().getString(R.string.txt_errormsg_subs));
-                    Crashlytics.log(Log.ERROR, TAG, "JSONException caught while purchasing!");
+                    FirebaseCrashlytics.getInstance().log("JSONException caught while purchasing!: " + e);
-                    Crashlytics.logException(e);
                 }
             }
         }
@@ -323,20 +320,19 @@ public class SubscriptionsActivity extends BaseActivity{
 
                 if (error) {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error adding subscription (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error adding subscription (Server returned error): " + errorMsg);
                     showMessage(getResources().getString(R.string.txt_errormsg_subs));
                 } else {
                     gotoSubscriptionsActivity();
                 }
 
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
 
             hideDialog();
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error adding subscription: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error adding subscription: " + error.getMessage());
             showMessage(getResources().getString(R.string.txt_errormsg_subs));
             hideDialog();
         }) {
@@ -387,11 +383,10 @@ public class SubscriptionsActivity extends BaseActivity{
                 syncWithDatabase(ownedSkus);
 
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error getting subscription: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error getting subscription: " + error.getMessage());
             handleVolleyErrorResponse();
         }) {
 
@@ -424,16 +419,15 @@ public class SubscriptionsActivity extends BaseActivity{
 
                 if (error) {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error deactivating subscription (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error deactivating subscription (Server returned error): " + errorMsg);
                 }else{
                     Log.d(TAG,"Sub with uid: "+subscriptionId+" deactivated in DB");
                 }
 
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
-        }, error -> Crashlytics.log(Log.ERROR, TAG, "Error deactivating subscription: " + error.getMessage())) {
+        }, error -> FirebaseCrashlytics.getInstance().log("Error deactivating subscription: " + error.getMessage())) {
 
             @Override
             protected Map<String, String> getParams() {

app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java

@@ -7,8 +7,8 @@ import android.graphics.drawable.Drawable;
 import android.location.Address;
 import android.location.Geocoder;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
@@ -17,7 +17,7 @@ import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.beardedhen.androidbootstrap.AwesomeTextView;
 import com.beardedhen.androidbootstrap.BootstrapLabel;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.mikepenz.google_material_typeface_library.GoogleMaterial;
 import com.mikepenz.iconics.IconicsDrawable;
 
@@ -146,15 +146,14 @@ public class ViewReportActivity extends BaseActivity {
                     gotoProfileActivity();
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error deleting incident (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error deleting incident (Server returned error): " + errorMsg);
                     showMessage(getResources().getString(R.string.txt_errormsg_deleteincident));
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error deleting incident: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error deleting incident: " + error.getMessage());
             handleVolleyErrorResponse();
             hideDialog();
         }) {
@@ -196,15 +195,14 @@ public class ViewReportActivity extends BaseActivity {
 
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error get incident (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log( "Error get incident (Server returned error): " + errorMsg);
                     showMessage(getResources().getString(R.string.txt_errormsg_getincidentdetail));
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error get incident: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error get incident: " + error.getMessage());
             handleVolleyErrorResponse();
             hideDialog();
         }) {
@@ -320,8 +318,7 @@ public class ViewReportActivity extends BaseActivity {
                 txtPosition.setText(sb.toString());
             }
         } catch (IOException e) {
-            Crashlytics.log(Log.ERROR, TAG, "IOException caught");
+            FirebaseCrashlytics.getInstance().log("IOException caught: " + e);
-            Crashlytics.logException(e);
         }
 
         final String latitude = Double.toString(incident.getPosition().latitude);
@@ -333,7 +330,7 @@ public class ViewReportActivity extends BaseActivity {
         findViewById(R.id.btn_viewreport_position).setOnClickListener(v -> gotoMapActivity(latitude + ":" + longitude));
 
         String uid = user.get(SessionManager.KEY_UID);
-        if (incident.getFidFromUser() != Integer.valueOf(uid)) {
+        if (incident.getFidFromUser() != Integer.parseInt(uid)) {
             findViewById(R.id.layoutFooter).setVisibility(View.GONE);
         } else {
             findViewById(R.id.layoutFooter).setVisibility(View.VISIBLE);
@@ -376,15 +373,14 @@ public class ViewReportActivity extends BaseActivity {
                     checkVotetypeAndSetVoteButtons(jPoints);
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error voting incident (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error voting incident (Server returned error): " + errorMsg);
                     showMessage(getResources().getString(R.string.txt_errormsg_couldnotvote));
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-                Crashlytics.logException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error voting incident: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error voting incident: " + error.getMessage());
             handleVolleyErrorResponse();
         }) {
 
@@ -422,14 +418,14 @@ public class ViewReportActivity extends BaseActivity {
                     checkVotetypeAndSetVoteButtons(jPoints);
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error deleting voting incident (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error deleting voting incident (Server returned error): " + errorMsg);
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error deleting voting incident: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error deleting voting incident: " + error.getMessage());
             handleVolleyErrorResponse();
         }) {
 

app/src/main/java/org/deke/risk/riskahead/adapter/ProfilePagerAdapter.java

@@ -1,9 +1,11 @@
 package org.deke.risk.riskahead.adapter;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import org.deke.risk.riskahead.fragment.ProfileStatisticsFragment;
 import org.deke.risk.riskahead.fragment.ReportListFragment;
@@ -21,14 +23,15 @@ public class ProfilePagerAdapter extends FragmentStatePagerAdapter {
     private String userID;
 
     public ProfilePagerAdapter(FragmentManager fm, int NumOfTabs, String userID) {
-        super(fm);
+        super(fm, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         this.mNumOfTabs = NumOfTabs;
         this.userID = userID;
     }
 
+    @NonNull
     @Override
     public Fragment getItem(int position) {
-        Fragment returnFragment = null;
+        Fragment returnFragment = new Fragment();
 
         if(mNumOfTabs == 2){
             switch (position) {
@@ -38,8 +41,6 @@ public class ProfilePagerAdapter extends FragmentStatePagerAdapter {
                 case 1:
                     returnFragment = newReportListInstance(userID);
                     break;
-                default:
-                    return null;
             }
         }else if(mNumOfTabs == 3){
             switch (position) {
@@ -52,8 +53,6 @@ public class ProfilePagerAdapter extends FragmentStatePagerAdapter {
                 case 2:
                     returnFragment = newReportListInstance(userID);
                     break;
-                default:
-                    return null;
             }
         }
 

app/src/main/java/org/deke/risk/riskahead/adapter/ReportListAdapter.java

@@ -14,7 +14,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.core.content.ContextCompat;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.helper.IncidentReport;
@@ -33,13 +35,11 @@ import java.util.List;
 public class ReportListAdapter extends BaseAdapter {
     private final static String TAG = ReportListAdapter.class.getSimpleName();
 
-    private Context context;
     private List<JSONObject> data;
 
     private static LayoutInflater inflater = null;
 
     public ReportListAdapter(Context context, List<JSONObject> data) {
-        this.context = context;
         this.data = data;
         inflater = (LayoutInflater) context
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -79,8 +79,8 @@ public class ReportListAdapter extends BaseAdapter {
                status = false;
             }
         } catch (JSONException e) {
-            Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+            FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
-            Crashlytics.logException(e);
+            crashlytics.log("JSONException caught: " + e);
         }
 
         if(!status){
@@ -109,11 +109,8 @@ public class ReportListAdapter extends BaseAdapter {
             iv.setVisibility(View.VISIBLE);
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                iv.setBackground(parent.getContext().getDrawable(item.getIconDrawable()));
+                iv.setBackground(ContextCompat.getDrawable(parent.getContext(), item.getIconDrawable()));
-            } else {
-                iv.setBackground(parent.getResources().getDrawable(item.getIconDrawable()));
             }
-
         }
         return vi;
     }

app/src/main/java/org/deke/risk/riskahead/adapter/SpinnerHintAdapter.java

@@ -50,7 +50,7 @@ public class SpinnerHintAdapter implements SpinnerAdapter, ListAdapter {
             return getNothingSelectedView(parent);
         }else{
             int numOfItems = adapter.getCount();
-            position = (position > numOfItems-1) ? numOfItems-1 : position;
+            position = Math.min(position, numOfItems - 1);
 
             return adapter.getView(position - EXTRA, null, parent);
         }

app/src/main/java/org/deke/risk/riskahead/adapter/SubscriptionsPagerAdapter.java

@@ -1,8 +1,9 @@
 package org.deke.risk.riskahead.adapter;
 
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import org.deke.risk.riskahead.fragment.SubscriptionItemFragment;
 
@@ -20,13 +21,14 @@ public class SubscriptionsPagerAdapter extends FragmentStatePagerAdapter {
     private SubscriptionItemFragment frag2;
 
     public SubscriptionsPagerAdapter(FragmentManager fm, int NumOfTabs) {
-        super(fm);
+        super(fm, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         this.mNumOfTabs = NumOfTabs;
     }
 
+    @NonNull
     @Override
     public Fragment getItem(int position) {
-        Fragment returnFragment;
+        Fragment returnFragment = new Fragment();
 
             switch (position) {
                 case 0:
@@ -37,8 +39,6 @@ public class SubscriptionsPagerAdapter extends FragmentStatePagerAdapter {
                     if(frag2 == null) frag2 = new SubscriptionItemFragment();
                     returnFragment = frag2;
                     break;
-                default:
-                    return null;
             }
 
         return returnFragment;

app/src/main/java/org/deke/risk/riskahead/adapter/Top10ListAdapter.java

@@ -9,7 +9,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.json.JSONException;
@@ -81,8 +81,8 @@ public class Top10ListAdapter extends BaseAdapter {
                     context.getResources().getString(R.string.txt_top10_membersince),
                     data.get(position).getString("created_at").split(" ")[0]));
         } catch (JSONException e) {
-            Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+            FirebaseCrashlytics.getInstance().log("JSONException caught: " + e);
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
         return vi;
     }

app/src/main/java/org/deke/risk/riskahead/fragment/BaseReportWFFragment.java

@@ -1,8 +1,8 @@
 package org.deke.risk.riskahead.fragment;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,7 +24,7 @@ public abstract class BaseReportWFFragment extends Fragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         return new TextView(getActivity());
     }
 

app/src/main/java/org/deke/risk/riskahead/fragment/FacebookButtonFragment.java

@@ -4,15 +4,15 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.beardedhen.androidbootstrap.BootstrapButton;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.facebook.AccessToken;
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
@@ -90,7 +90,7 @@ public class FacebookButtonFragment extends Fragment {
             if(activity != null){
                 LoginManager.getInstance().logInWithReadPermissions(activity, Arrays.asList("public_profile", "email"));
             }else{
-                Crashlytics.log(Log.ERROR, TAG, "Could not get activity when initializing the facebook button");
+                FirebaseCrashlytics.getInstance().log("Could not get activity when initializing the facebook button");
             }
         });
 
@@ -108,7 +108,7 @@ public class FacebookButtonFragment extends Fragment {
                         if(activity != null){
                             activity.showMessage("Facebook LogIn canceled. Please use E-Mail instead.");
                         }else{
-                            Crashlytics.log(Log.ERROR, TAG, "Could not get activity for showing onCancel message");
+                            FirebaseCrashlytics.getInstance().log("Could not get activity for showing onCancel message");
                         }
                     }
 
@@ -119,7 +119,7 @@ public class FacebookButtonFragment extends Fragment {
                         if(activity != null){
                             activity.showMessage("Could not log in with Facebook. Please use E-Mail instead or try again later.");
                         }else{
-                            Crashlytics.log(Log.ERROR, TAG, "Could not get activity for showing onError message");
+                            FirebaseCrashlytics.getInstance().log("Could not get activity for showing onError message");
                         }
                     }
                 });
@@ -132,11 +132,11 @@ public class FacebookButtonFragment extends Fragment {
                 if(activity != null){
                     activity.handleSocialMediaLogin(objects.getString("id"), "facebook", objects.getString("first_name"), objects.getString("email"));
                 }else{
-                    Crashlytics.log(Log.ERROR, TAG, "Could not get activity for handleSocialMediaLogin");
+                    FirebaseCrashlytics.getInstance().log("Could not get activity for handleSocialMediaLogin");
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+                FirebaseCrashlytics.getInstance().log("Exception caught: " + e);
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         });
         Bundle parameters = new Bundle();

app/src/main/java/org/deke/risk/riskahead/fragment/GooglePlusButtonFragment.java

@@ -4,15 +4,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.beardedhen.androidbootstrap.BootstrapButton;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
@@ -47,7 +47,7 @@ public class GooglePlusButtonFragment extends Fragment{
         if(mActivity != null){
             mContext = mActivity.getApplicationContext();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not retrieve activity for Google+ onCreate Method");
+            FirebaseCrashlytics.getInstance().log("Could not retrieve activity for Google+ onCreate Method");
         }
     }
 
@@ -84,7 +84,7 @@ public class GooglePlusButtonFragment extends Fragment{
             if(account != null){
                 mActivity.handleSocialMediaLogin(account.getId(),"google",account.getDisplayName(),account.getEmail());
             }else{
-                Crashlytics.log(Log.ERROR, TAG,"Could not handle G+ SignIn Result");
+                FirebaseCrashlytics.getInstance().log("Could not handle G+ SignIn Result");
             }
         }
     }
@@ -93,7 +93,7 @@ public class GooglePlusButtonFragment extends Fragment{
         try {
             return completedTask.getResult(ApiException.class);
         } catch (ApiException e) {
-            Crashlytics.log(Log.ERROR, TAG, "signInResult:failed code=" + e.getStatusCode());
+            FirebaseCrashlytics.getInstance().log("signInResult:failed code=" + e.getStatusCode());
             return null;
         }
     }

app/src/main/java/org/deke/risk/riskahead/fragment/ProfileStatisticsFragment.java

@@ -1,7 +1,7 @@
 package org.deke.risk.riskahead.fragment;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -13,7 +13,7 @@ import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.ProfileActivity;
 import org.deke.risk.riskahead.R;
@@ -75,7 +75,7 @@ public class ProfileStatisticsFragment extends Fragment {
             uid = getArguments().getString("uid",parent.user.get(SessionManager.KEY_UID));
             getProfileStatsForList();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not retrieve arguments");
+            FirebaseCrashlytics.getInstance().log("Could not retrieve arguments");
         }
 
         return view;
@@ -90,7 +90,7 @@ public class ProfileStatisticsFragment extends Fragment {
             String tag_string_req = "req_profilestats";
             AppController.getInstance().addToRequestQueue(strReq, tag_string_req);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not retrieve activity for ProfileStats");
+            FirebaseCrashlytics.getInstance().log("Could not retrieve activity for ProfileStats");
         }
     }
 
@@ -145,7 +145,7 @@ public class ProfileStatisticsFragment extends Fragment {
                                 activity.session.setSubsPremium(false);
                             }
                         }else{
-                            Crashlytics.log(Log.ERROR, TAG, "Could not retrieve activity for ProfileStatistics. Could not set statusLevel");
+                            FirebaseCrashlytics.getInstance().log("Could not retrieve activity for ProfileStatistics. Could not set statusLevel");
                         }
                     }
 
@@ -157,24 +157,24 @@ public class ProfileStatisticsFragment extends Fragment {
                     }
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error getting user stats (server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error getting user stats (server returned error): " + errorMsg);
 
                     parent.showMessage(getResources().getString(R.string.txt_errormsg_retrievestats));
                 }
 
                 ((ProfileActivity)getActivity()).hideDialog();
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error getting user stats: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error getting user stats: " + error.getMessage());
             ProfileActivity activity = (ProfileActivity) getActivity();
             if(activity != null){
                 activity.hideDialog();
                 activity.handleVolleyErrorResponse();
             }else {
-                Crashlytics.log(Log.ERROR, TAG, "Could not retrieve activity for onErrorResponse");
+                FirebaseCrashlytics.getInstance().log("Could not retrieve activity for onErrorResponse");
             }
         }) {
 

app/src/main/java/org/deke/risk/riskahead/fragment/ReportListFragment.java

@@ -1,7 +1,7 @@
 package org.deke.risk.riskahead.fragment;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -12,7 +12,7 @@ import android.widget.ListView;
 
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.ProfileActivity;
 import org.deke.risk.riskahead.R;
@@ -56,7 +56,7 @@ public class ReportListFragment extends Fragment{
         if(arguments != null && parent != null){
             uid = getArguments().getString("uid",parent.user.get(SessionManager.KEY_UID));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could either not get arguments or parent activity");
+            FirebaseCrashlytics.getInstance().log("Could either not get arguments or parent activity");
         }
 
         myListView = view.findViewById(R.id.lv_reportlist_list);
@@ -69,8 +69,8 @@ public class ReportListFragment extends Fragment{
                     parent.gotoViewReportActivity(resultList.get(position).getInt("id"));
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "Catched JSONException");
+                FirebaseCrashlytics.getInstance().log("Catched JSONException");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         });
 
@@ -86,7 +86,7 @@ public class ReportListFragment extends Fragment{
             StringRequest strReq = getStringRequestGetIncidentsWithPositionFromUserID();
             AppController.getInstance().addToRequestQueue(strReq, tag_string_req);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent activity");
         }
     }
 
@@ -116,21 +116,21 @@ public class ReportListFragment extends Fragment{
 
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error getting incident list (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error getting incident list (Server returned error): " + errorMsg);
                 }
 
                 ProfileActivity activity = (ProfileActivity) getActivity();
                 if(activity != null){
                     activity.hideDialog();
                 }else{
-                    Crashlytics.log(Log.ERROR, TAG, "Could not get parent activity");
+                    FirebaseCrashlytics.getInstance().log("Could not get parent activity");
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "Catched JSONException");
+                FirebaseCrashlytics.getInstance().log("Catched JSONException");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error getting incident list: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error getting incident list: " + error.getMessage());
             parent.handleVolleyErrorResponse();
             parent.hideDialog();
         }) {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_1_Fragment.java

@@ -13,7 +13,9 @@ import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.annotation.NonNull;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -58,7 +60,7 @@ public class ReportWF_1_Fragment extends BaseReportWFFragment{
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewFragment = inflater.inflate(R.layout.fragment_reportwf_1, container, false);
 
         initInputElements();
@@ -88,7 +90,7 @@ public class ReportWF_1_Fragment extends BaseReportWFFragment{
         if(activity != null){
             activity.setMapButtonVisibility(false);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent activity");
         }
 
 
@@ -162,7 +164,7 @@ public class ReportWF_1_Fragment extends BaseReportWFFragment{
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity, stringId, android.R.layout.simple_spinner_dropdown_item);
             crimeCategory.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent activity");
         }
 
     }
@@ -200,7 +202,7 @@ public class ReportWF_1_Fragment extends BaseReportWFFragment{
         if(activity != null){
             incident = activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent activity");
         }
 
         if(incident != null){
@@ -242,12 +244,12 @@ public class ReportWF_1_Fragment extends BaseReportWFFragment{
         if(activity != null){
             activity.setIncident(incident);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent activity");
         }
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_2_Fragment.java

@@ -2,12 +2,12 @@ package org.deke.risk.riskahead.fragment;
 
 import android.app.DatePickerDialog;
 import android.app.Dialog;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.app.TimePickerDialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.text.format.DateFormat;
@@ -23,7 +23,7 @@ import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TimePicker;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -83,7 +83,7 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewFragment = inflater.inflate(R.layout.fragment_reportwf_2, container, false);
 
         initInputElements();
@@ -187,7 +187,7 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(getActivity(), stringId , android.R.layout.simple_spinner_dropdown_item);
             timeCategory.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, getActivity()));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent activity");
         }
 
     }
@@ -297,7 +297,7 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
 
             timePickerFragment.show(fm, "Pick Time");
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get FragmentManager");
+            FirebaseCrashlytics.getInstance().log("Could not get FragmentManager");
         }
     }
 
@@ -324,19 +324,19 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
                         tmpIsToDate = false;
                         return tmpDialog;
                     }else{
-                        Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+                        FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
                     }
 
                 } catch (ParseException e) {
-                    Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+                    FirebaseCrashlytics.getInstance().log("Exception caught");
-                    Crashlytics.logException(e);
+                    FirebaseCrashlytics.getInstance().recordException(e);
                 }
             }
 
             if(activity != null) {
                 return new DatePickerDialog(activity, this, year, month, day);
             }else{
-                Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity and therefore trying again to retrieve parent");
+                FirebaseCrashlytics.getInstance().log("Could not get parent Activity and therefore trying again to retrieve parent");
                 return new DatePickerDialog(getActivity(),this, year, month, day);
             }
         }
@@ -357,7 +357,7 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
 
             datePickerFragment.show(fm, "Pick Date");
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get FragmentManager");
+            FirebaseCrashlytics.getInstance().log("Could not get FragmentManager");
         }
     }
 
@@ -404,7 +404,7 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
         if(activity != null){
             incident = activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not retrieve parent activity");
+            FirebaseCrashlytics.getInstance().log("Could not retrieve parent activity");
         }
 
 
@@ -472,13 +472,13 @@ public class ReportWF_2_Fragment extends BaseReportWFFragment {
         if(activity != null){
             activity.setIncident(incident);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_3_Fragment.java

@@ -11,7 +11,9 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.annotation.NonNull;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -57,7 +59,7 @@ public class ReportWF_3_Fragment extends BaseReportWFFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewFragment = inflater.inflate(R.layout.fragment_reportwf_3, container, false);
 
         initInputElements();
@@ -154,7 +156,7 @@ public class ReportWF_3_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity,stringId, android.R.layout.simple_spinner_dropdown_item);
             suspectCategory.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
     }
@@ -188,7 +190,7 @@ public class ReportWF_3_Fragment extends BaseReportWFFragment {
         if(activity != null){
             incident = activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
         if(incident != null){
@@ -216,12 +218,12 @@ public class ReportWF_3_Fragment extends BaseReportWFFragment {
         if(activity != null){
             activity.setIncident(incident);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_4_Fragment.java

@@ -11,7 +11,9 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.annotation.NonNull;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -54,7 +56,7 @@ public class ReportWF_4_Fragment extends BaseReportWFFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewFragment = inflater.inflate(R.layout.fragment_reportwf_4, container, false);
 
         initInputElements();
@@ -118,7 +120,7 @@ public class ReportWF_4_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity, stringId, android.R.layout.simple_spinner_dropdown_item);
             suspectWeapon.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
     }
@@ -143,7 +145,7 @@ public class ReportWF_4_Fragment extends BaseReportWFFragment {
         if(activity != null){
             incident = activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
         if(incident != null){
@@ -169,12 +171,12 @@ public class ReportWF_4_Fragment extends BaseReportWFFragment {
         if(activity != null){
             activity.setIncident(incident);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_5_Fragment.java

@@ -11,7 +11,9 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.annotation.NonNull;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -53,7 +55,7 @@ public class ReportWF_5_Fragment extends BaseReportWFFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewFragment = inflater.inflate(R.layout.fragment_reportwf_5, container, false);
 
         initInputElements();
@@ -113,7 +115,7 @@ public class ReportWF_5_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity, stringId, android.R.layout.simple_spinner_dropdown_item);
             suspectCount.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
@@ -136,7 +138,7 @@ public class ReportWF_5_Fragment extends BaseReportWFFragment {
         if(activity != null){
             incident = activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
         if(incident != null){
@@ -162,13 +164,13 @@ public class ReportWF_5_Fragment extends BaseReportWFFragment {
         if(activity != null){
             activity.setIncident(incident);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_6_Fragment.java

@@ -10,7 +10,9 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.annotation.NonNull;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -48,7 +50,7 @@ public class ReportWF_6_Fragment extends BaseReportWFFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewFragment = inflater.inflate(R.layout.fragment_reportwf_6, container, false);
 
         initInputElements();
@@ -99,7 +101,7 @@ public class ReportWF_6_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity, stringId, android.R.layout.simple_spinner_dropdown_item);
             victimType.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
@@ -121,7 +123,7 @@ public class ReportWF_6_Fragment extends BaseReportWFFragment {
         if(activity != null){
             incident = activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
         if(incident != null){
@@ -145,12 +147,12 @@ public class ReportWF_6_Fragment extends BaseReportWFFragment {
         if(activity != null){
             activity.setIncident(incident);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_7_Fragment.java

@@ -11,7 +11,9 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.annotation.NonNull;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -50,7 +52,7 @@ public class ReportWF_7_Fragment extends BaseReportWFFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewFragment = inflater.inflate(R.layout.fragment_reportwf_7, container, false);
 
         initInputElements();
@@ -110,7 +112,7 @@ public class ReportWF_7_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity, stringId, android.R.layout.simple_spinner_dropdown_item);
             victimOrigin.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
@@ -133,7 +135,7 @@ public class ReportWF_7_Fragment extends BaseReportWFFragment {
         if(activity != null){
             incident = activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
         if(incident != null){
@@ -159,12 +161,12 @@ public class ReportWF_7_Fragment extends BaseReportWFFragment {
         if(activity != null){
             activity.setIncident(incident);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_8_Fragment.java

@@ -11,7 +11,9 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.annotation.NonNull;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -77,7 +79,7 @@ public class ReportWF_8_Fragment extends BaseReportWFFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         viewFragment = inflater.inflate(R.layout.fragment_reportwf_8, container, false);
 
         initSuspectVehicleInputElements();
@@ -151,7 +153,7 @@ public class ReportWF_8_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity, stringId, android.R.layout.simple_spinner_dropdown_item);
             suspectVehicle.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
@@ -206,7 +208,7 @@ public class ReportWF_8_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity, stringId, android.R.layout.simple_spinner_dropdown_item);
             victimAffiliation.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
@@ -255,7 +257,7 @@ public class ReportWF_8_Fragment extends BaseReportWFFragment {
             ArrayAdapter<CharSequence> adapter_main_1 = ArrayAdapter.createFromResource(activity, stringId, android.R.layout.simple_spinner_dropdown_item);
             suspectRecongnition.setAdapter(new SpinnerHintAdapter(adapter_main_1, R.layout.contact_spinner_row_nothing_selected, activity));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
@@ -281,7 +283,7 @@ public class ReportWF_8_Fragment extends BaseReportWFFragment {
         if(activity != null){
             incident = activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
 
         if(incident != null){
@@ -323,12 +325,12 @@ public class ReportWF_8_Fragment extends BaseReportWFFragment {
         if(activity != null){
             activity.setIncident(incident);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/ReportWF_Finish_Fragment.java

@@ -9,7 +9,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.crashlytics.android.Crashlytics;
+import androidx.annotation.NonNull;
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.ReportWFActivity;
@@ -28,7 +30,7 @@ public class ReportWF_Finish_Fragment extends BaseReportWFFragment {
     private SendReportListener mCallback;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View viewFragment = inflater.inflate(R.layout.fragment_reportwf_finish, container, false);
 
         Button btnSendReport = viewFragment.findViewById(R.id.btn_reportwf_finish_send);
@@ -43,7 +45,7 @@ public class ReportWF_Finish_Fragment extends BaseReportWFFragment {
         if(activity != null){
             return activity.getIncident();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
             return null;
         }
     }
@@ -53,7 +55,7 @@ public class ReportWF_Finish_Fragment extends BaseReportWFFragment {
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
 
         try {

app/src/main/java/org/deke/risk/riskahead/fragment/SettingsFragment.java

@@ -6,12 +6,12 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.SwitchPreference;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.SettingsActivity;
@@ -225,16 +225,16 @@ public class SettingsFragment extends PreferenceFragment {
                     ((SettingsActivity) getActivity()).showMessage(getString(R.string.alert_passwordreset_confirmation));
                 }else{
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error request email reset (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error request email reset (Server returned error): " + errorMsg);
                     ((SettingsActivity) getActivity()).showMessage(getResources().getString(R.string.txt_errormsg_resetpw));
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
 
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error request email reset: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error request email reset: " + error.getMessage());
             ((SettingsActivity) getActivity()).showMessage(getString(R.string.errormsg_couldnotretrieve));
             ((SettingsActivity) getActivity()).hideDialog();
         }) {
@@ -304,13 +304,13 @@ public class SettingsFragment extends PreferenceFragment {
 
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error getting user settings (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error getting user settings (Server returned error): " + errorMsg);
                     ((SettingsActivity) getActivity()).showMessage(getResources().getString(R.string.txt_errormsg_changesettings));
                 }
 
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             } finally {
                 updatePrefs();
             }
@@ -318,7 +318,7 @@ public class SettingsFragment extends PreferenceFragment {
             ((SettingsActivity) getActivity()).hideDialog();
 
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error getting user settings: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error getting user settings: " + error.getMessage());
             ((SettingsActivity) getActivity()).showMessage(getString(R.string.errormsg_couldnotretrieve));
             ((SettingsActivity) getActivity()).hideDialog();
             updatePrefs();

app/src/main/java/org/deke/risk/riskahead/fragment/SubscriptionItemFragment.java

@@ -1,8 +1,8 @@
 package org.deke.risk.riskahead.fragment;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,7 +12,7 @@ import android.widget.TextView;
 
 import com.beardedhen.androidbootstrap.BootstrapButton;
 import com.beardedhen.androidbootstrap.api.defaults.DefaultBootstrapBrand;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.R;
 import org.deke.risk.riskahead.SubscriptionsActivity;
@@ -93,8 +93,8 @@ public class SubscriptionItemFragment extends Fragment {
             imgSubs.setVisibility(View.VISIBLE);
             btnBadge.setVisibility(View.VISIBLE);
         } catch (JSONException e) {
-            Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+            FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
-            Crashlytics.logException(e);
+            crashlytics.log("JSONException caught: " + e);
         }
     }
 }

app/src/main/java/org/deke/risk/riskahead/fragment/Top10Fragment.java

@@ -1,7 +1,7 @@
 package org.deke.risk.riskahead.fragment;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -12,7 +12,7 @@ import android.widget.ListView;
 
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.ProfileActivity;
 import org.deke.risk.riskahead.R;
@@ -56,8 +56,8 @@ public class Top10Fragment extends Fragment {
             try {
                 parent.gotoProfileActivity(resultList.get(position).getString("id"));
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         });
 
@@ -75,7 +75,7 @@ public class Top10Fragment extends Fragment {
             String tag_string_req2 = "req_top10";
             AppController.getInstance().addToRequestQueue(strReq2, tag_string_req2);
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+            FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
         }
     }
 
@@ -103,7 +103,7 @@ public class Top10Fragment extends Fragment {
 
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error getting top 10 stats (Server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error getting top 10 stats (Server returned error): " + errorMsg);
                     parent.showMessage(getResources().getString(R.string.txt_errormsg_gettop10));
                 }
 
@@ -111,23 +111,23 @@ public class Top10Fragment extends Fragment {
                 if(activity != null){
                     activity.hideDialog();
                 }else{
-                    Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+                    FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
                 }
 
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
 
         }, error -> {
-            Crashlytics.log(Log.ERROR, TAG, "Error getting top 10 stats: " + error.getMessage());
+            FirebaseCrashlytics.getInstance().log("Error getting top 10 stats: " + error.getMessage());
 
             ProfileActivity activity = (ProfileActivity) getActivity();
             if(activity != null){
                 activity.hideDialog();
                 activity.handleVolleyErrorResponse();
             }else{
-                Crashlytics.log(Log.ERROR, TAG, "Could not get parent Activity");
+                FirebaseCrashlytics.getInstance().log("Could not get parent Activity");
             }
         }) {
 

app/src/main/java/org/deke/risk/riskahead/fragment/TwitterButtonFragment.java

@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,7 +14,7 @@ import android.view.ViewGroup;
 import android.widget.Toast;
 
 import com.beardedhen.androidbootstrap.BootstrapButton;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.twitter.sdk.android.core.Callback;
 import com.twitter.sdk.android.core.DefaultLogger;
 import com.twitter.sdk.android.core.Result;
@@ -70,8 +70,8 @@ public class TwitterButtonFragment extends Fragment {
             assert mActivity != null;
             mContext = mActivity.getApplicationContext();
         }catch(Exception e){
-            Crashlytics.log(Log.ERROR, TAG, "Could not get activity for TwitterButton");
+            FirebaseCrashlytics.getInstance().log("Could not get activity for TwitterButton");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
 
         TwitterConfig config = new TwitterConfig.Builder(mContext)
@@ -96,7 +96,7 @@ public class TwitterButtonFragment extends Fragment {
 
                     @Override
                     public void failure(TwitterException exception) {
-                        Crashlytics.log(Log.ERROR, TAG, "onFailure wird ausgeführt: "+exception);
+                        FirebaseCrashlytics.getInstance().log("onFailure wird ausgeführt: "+exception);
                         showMessage("Could not log in with Twitter. Please use E-Mail instead or try again later.");
                     }
                 })

app/src/main/java/org/deke/risk/riskahead/helper/AppController.java

@@ -1,9 +1,8 @@
 package org.deke.risk.riskahead.helper;
 
-import android.app.Application;
 import android.content.Context;
-import android.support.multidex.MultiDex;
+import androidx.multidex.MultiDex;
-import android.support.multidex.MultiDexApplication;
+import androidx.multidex.MultiDexApplication;
 import android.text.TextUtils;
 
 import com.android.volley.DefaultRetryPolicy;
@@ -11,9 +10,6 @@ import com.android.volley.Request;
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 import com.beardedhen.androidbootstrap.TypefaceProvider;
-import com.crashlytics.android.Crashlytics;
-
-import io.fabric.sdk.android.Fabric;
 
 /**
  *
@@ -34,7 +30,6 @@ public class AppController extends MultiDexApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        Fabric.with(this, new Crashlytics());
 
         mInstance = this;
         TypefaceProvider.registerDefaultIconSets();

app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java

@@ -18,9 +18,9 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.format.DateUtils;
 import android.text.method.LinkMovementMethod;
 import android.util.DisplayMetrics;
@@ -41,7 +41,7 @@ import com.android.volley.toolbox.StringRequest;
 import com.google.android.gms.ads.AdListener;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.InterstitialAd;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.mikepenz.google_material_typeface_library.GoogleMaterial;
 import com.mikepenz.materialdrawer.AccountHeader;
 import com.mikepenz.materialdrawer.AccountHeaderBuilder;
@@ -164,7 +164,7 @@ public abstract class BaseActivity extends AppCompatActivity {
             if (am != null){
                 am.setInexactRepeating(AlarmManager.RTC, firstStart, interval, wtdSServicePendingIntent);
             }else{
-                Crashlytics.log(Log.ERROR, TAG, "AlarmManager in BaseActivity is null. No AlarmManager found.");
+                FirebaseCrashlytics.getInstance().log("AlarmManager in BaseActivity is null. No AlarmManager found.");
             }
 
             startService(new Intent(this, NotificationService.class));
@@ -205,8 +205,8 @@ public abstract class BaseActivity extends AppCompatActivity {
         try {
             unregisterReceiver(myReceiver);
         } catch (final Exception e) {
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+            FirebaseCrashlytics.getInstance().log("Exception caught: " + e);
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
     }
 
@@ -217,7 +217,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         if(pDialog.getWindow() != null){
             pDialog.getWindow().setBackgroundDrawable(new ColorDrawable(android.graphics.Color.TRANSPARENT));
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "ProgressDialog Window is null. Could not set BackgroundDrawable.");
+            FirebaseCrashlytics.getInstance().log("ProgressDialog Window is null. Could not set BackgroundDrawable.");
         }
 
         pDialog.setContentView(R.layout.dialog_progresscircle);
@@ -289,7 +289,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
                     @Override
                     public void onDrawerClosed(View drawerView) {
-                        android.support.v7.app.ActionBar actionBar = getSupportActionBar();
+                        androidx.appcompat.app.ActionBar actionBar = getSupportActionBar();
                         if (actionBar != null) actionBar.setTitle(getActivityName());
                     }
 
@@ -331,7 +331,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                                     break;
                                 default:
                                     Log.e("Unknown switch page: ", Integer.toString(position));
-                                    Crashlytics.log(Log.ERROR, TAG, "AlarmManager in BaseActivity is null. No AlarmManager found.");
+                                    FirebaseCrashlytics.getInstance().log("AlarmManager in BaseActivity is null. No AlarmManager found.");
                                     break;
                             }
 
@@ -376,7 +376,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         if(connectivityManager != null){
             activeNetworkInfo = connectivityManager.getActiveNetworkInfo();
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not retrieve connectivityManager. Network Status can not be checked.");
+            FirebaseCrashlytics.getInstance().log("Could not retrieve connectivityManager. Network Status can not be checked.");
             return;
         }
 
@@ -623,8 +623,8 @@ public abstract class BaseActivity extends AppCompatActivity {
         try {
             ((TextView) dialoglayout.findViewById(R.id.lbl_about_version)).setText(String.format("Version: %s", getPackageManager().getPackageInfo(getPackageName(), 0).versionName));
         } catch (PackageManager.NameNotFoundException e) {
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+            FirebaseCrashlytics.getInstance().log("Exception caught");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(BaseActivity.this)
@@ -696,14 +696,14 @@ public abstract class BaseActivity extends AppCompatActivity {
                     showMessage(getString(R.string.txt_feedback_response));
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    Crashlytics.log(Log.ERROR, TAG, "Error sending feedback (server returned error): " + errorMsg);
+                    FirebaseCrashlytics.getInstance().log("Error sending feedback (server returned error): " + errorMsg);
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+                FirebaseCrashlytics.getInstance().log("Exception caught: " + e);
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
 
-        }, error -> Crashlytics.log(Log.ERROR, TAG, "Error sending feedback: " + error.getMessage())) {
+        }, error -> FirebaseCrashlytics.getInstance().log("Error sending feedback: " + error.getMessage())) {
 
             @Override
             protected Map<String, String> getParams() {
@@ -742,7 +742,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                 if (NotificationService.class.getName().equals(service.service.getClassName())) return true;
             }
         }else{
-            Crashlytics.log(Log.ERROR, TAG, "Could not retrieve Activity_Service Manager.");
+            FirebaseCrashlytics.getInstance().log("Could not retrieve Activity_Service Manager.");
         }
 
         return false;
@@ -768,8 +768,6 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     public void dropBreadCrumb(String category, String action, String label, long value) {
         String breadCrumb = String.format("%s|%s|%s|%s", category, action, label, value);
-        Crashlytics.log(breadCrumb);
+        FirebaseCrashlytics.getInstance().log(breadCrumb);
     }
-
-
 }

app/src/main/java/org/deke/risk/riskahead/helper/IncidentReport.java

@@ -7,7 +7,7 @@ import android.util.Log;
 import com.google.android.gms.maps.model.BitmapDescriptor;
 import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.google.maps.android.clustering.ClusterItem;
 
 import org.deke.risk.riskahead.R;
@@ -138,8 +138,8 @@ public class IncidentReport implements ClusterItem {
             if(mIncident.has("fid_others")) this.fidOthersCategory = mIncident.getInt("fid_others");
             if(mIncident.has("etc_others")) this.etcOthersCategory = mIncident.getString("etc_others");
         } catch (JSONException e) {
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+            FirebaseCrashlytics.getInstance().log("Exception caught: " + e);
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
     }
 
@@ -163,8 +163,8 @@ public class IncidentReport implements ClusterItem {
                 tmpFromDate = simpleDateFormat.parse(this.fromDate);
             }
         } catch (ParseException e) {
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+            FirebaseCrashlytics.getInstance().log("Exception caught: " + e);
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
 
         switch (this.fidIncidentCategory) {
@@ -365,6 +365,7 @@ public class IncidentReport implements ClusterItem {
 
         switch (this.fidTimeCategory){
             case 1:
+            case 3:
                 if((this.fromDate != null) && !(this.fromDate.equals("0000-00-00")) && (this.fromTime != null) && (this.fromTime.length() > 4)){
                     returnString = this.fromDate+" "+this.fromTime.substring(0,5);
                 }else if((this.fromDate != null) && (this.fromDate.equals("0000-00-00")) && (this.createdAt.length() > 15)){
@@ -378,15 +379,6 @@ public class IncidentReport implements ClusterItem {
                     returnString = returnSubTimeArray[this.fidTimeSubCategory-1];
                 }
                 break;
-            case 3:
-                if((this.fromDate != null) && !(this.fromDate.equals("0000-00-00")) && (this.fromTime != null) && (this.fromTime.length() > 4)){
-                    returnString = this.fromDate+" "+this.fromTime.substring(0,5);
-                }else if((this.fromDate != null) && (this.fromDate.equals("0000-00-00")) && (this.createdAt.length() > 15)){
-                    returnString = this.createdAt.substring(0,16);
-                }else if((this.fidTimeCategory > 0) && (this.fidTimeCategory <= returnTimeArray.length)){
-                returnString = returnTimeArray[this.fidTimeCategory-1];
-                }
-                break;
             case 4:
                 if((this.fromTime != null) && !(this.fromTime.equals("00:00")) && (this.toTime != null) && !(this.toTime.equals("00:00"))){
                     returnString = this.fromDate+" "+this.fromTime.substring(0,5)+" -> "+this.toDate+" "+this.toTime.substring(0,5);

app/src/main/java/org/deke/risk/riskahead/helper/NotificationService.java

@@ -12,15 +12,15 @@ import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.*;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.TaskStackBuilder;
 import android.util.Log;
 
 import com.android.volley.Request;
 import com.android.volley.toolbox.StringRequest;
 import com.google.android.gms.maps.model.LatLng;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import org.deke.risk.riskahead.MapsActivity;
 import org.deke.risk.riskahead.R;
@@ -218,15 +218,14 @@ public class NotificationService extends Service {
                     sentNotification(notification);
                 } else {
                     String errorMsg = jObj.getString("error_msg");
-                    int loglevel = (errorMsg.contains("No incidents found in given area and from time")) ? Log.INFO : Log.ERROR;
+                    FirebaseCrashlytics.getInstance().log("Error getting incident notification (server returned error): " + errorMsg);
-                    Crashlytics.log(loglevel, TAG, "Error getting incident notification (server returned error): " + errorMsg);
                 }
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
 
-        }, error -> Crashlytics.log(Log.ERROR, TAG, "Error getting incident notification: " + error.getMessage())) {
+        }, error -> FirebaseCrashlytics.getInstance().log("Error getting incident notification: " + error.getMessage())) {
 
             @Override
             protected Map<String, String> getParams() {
@@ -266,8 +265,8 @@ public class NotificationService extends Service {
         try {
             resultIntent.putExtra(EXTRA_MESSAGE, notification.getJSONObject(notification.length()-1).getDouble("latitude")+":"+notification.getJSONObject(notification.length()-1).getDouble("longitude"));
         } catch (JSONException e) {
-            Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+            FirebaseCrashlytics.getInstance().log("JSONException caught");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
 
         TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);

app/src/main/java/org/deke/risk/riskahead/helper/OwnIconRendered.java

@@ -5,7 +5,7 @@ import android.util.Log;
 
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.model.MarkerOptions;
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.google.maps.android.clustering.ClusterManager;
 import com.google.maps.android.clustering.view.DefaultClusterRenderer;
 
@@ -44,8 +44,8 @@ public class OwnIconRendered extends DefaultClusterRenderer<IncidentReport> {
                 dateToCheck = simpleDateFormat.parse(item.getFromDate());
             }
         } catch (ParseException e) {
-            Crashlytics.log(Log.ERROR, TAG, "ParseException caught");
+            FirebaseCrashlytics.getInstance().log("ParseException caught");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
 
         if(dateToCheck != null && !dateToCheck.after(new Date(System.currentTimeMillis()-14*24*60*60*1000))){

app/src/main/java/org/deke/risk/riskahead/helper/PlaceJSONParser.java

@@ -2,7 +2,7 @@ package org.deke.risk.riskahead.helper;
 
 import android.util.Log;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,8 +30,8 @@ public class PlaceJSONParser {
             /* Retrieves all the elements in the 'places' array */
             jPlaces = jObject.getJSONArray("predictions");
         } catch (JSONException e) {
-            Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+            FirebaseCrashlytics.getInstance().log("JSONException caught");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
         /* Invoking getPlaces with the array of json object
          * where each json object represent a place
@@ -52,8 +52,8 @@ public class PlaceJSONParser {
                 placesList.add(place);
 
             } catch (JSONException e) {
-                Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                FirebaseCrashlytics.getInstance().log("JSONException caught");
-                Crashlytics.logException(e);
+                FirebaseCrashlytics.getInstance().recordException(e);
             }
         }
 
@@ -80,8 +80,8 @@ public class PlaceJSONParser {
             place.put("reference",reference);
 
         } catch (JSONException e) {
-            Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+            FirebaseCrashlytics.getInstance().log("JSONException caught");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
         return place;
     }

app/src/main/java/org/deke/risk/riskahead/helper/PlaceJSONParserDetail.java

@@ -2,7 +2,7 @@ package org.deke.risk.riskahead.helper;
 
 import android.util.Log;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -36,8 +36,8 @@ public class PlaceJSONParserDetail {
             lng = (Double)jObject.getJSONObject("result").getJSONObject("geometry").getJSONObject("location").get("lng");
             formattedAddress = (String) jObject.getJSONObject("result").get("formatted_address");
         } catch (JSONException e) {
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+            FirebaseCrashlytics.getInstance().log("Exception caught");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
 
         hm.put("lat", Double.toString(lat));

app/src/main/java/org/deke/risk/riskahead/helper/PlaceProvider.java

@@ -21,10 +21,10 @@ import android.content.UriMatcher;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 /**
  *
@@ -67,7 +67,7 @@ public class PlaceProvider extends ContentProvider {
     }
 
     @Override
-    public Cursor query(Uri uri, String[] projection, String selection,
+    public Cursor query(@NonNull Uri uri, String[] projection, String selection,
                         String[] selectionArgs, String sortOrder) {
         Cursor c = null;
 
@@ -121,8 +121,8 @@ public class PlaceProvider extends ContentProvider {
 
                     }
                 } catch (JSONException e) {
-                    Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                    FirebaseCrashlytics.getInstance().log("JSONException caught");
-                    Crashlytics.logException(e);
+                    FirebaseCrashlytics.getInstance().recordException(e);
                 }
                 c = mCursor;
                 break;
@@ -150,8 +150,8 @@ public class PlaceProvider extends ContentProvider {
                         mCursor.addRow(new String[] { Integer.toString(i), hMap.get("description"), hMap.get("reference") });
                     }
                 } catch (JSONException e) {
-                    Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                    FirebaseCrashlytics.getInstance().log("JSONException caught");
-                    Crashlytics.logException(e);
+                    FirebaseCrashlytics.getInstance().recordException(e);
                 }
                 c = mCursor;
                 break;
@@ -165,8 +165,8 @@ public class PlaceProvider extends ContentProvider {
                 try {
                     detailsList = detailsParser.parse(new JSONObject(jsonPlaceDetails));
                 } catch (JSONException e) {
-                    Crashlytics.log(Log.ERROR, TAG, "JSONException caught");
+                    FirebaseCrashlytics.getInstance().log("JSONException caught");
-                    Crashlytics.logException(e);
+                    FirebaseCrashlytics.getInstance().recordException(e);
                 }
 
                 if(detailsList != null){
@@ -175,7 +175,7 @@ public class PlaceProvider extends ContentProvider {
                         mCursor.addRow(new String[]{ hMapDetails.get("formatted_address") , hMapDetails.get("lat") , hMapDetails.get("lng") });
                     }
                 }else{
-                    Crashlytics.log(Log.ERROR, TAG, "DetailsList is null");
+                    FirebaseCrashlytics.getInstance().log("DetailsList is null");
                 }
 
                 c = mCursor;
@@ -240,8 +240,8 @@ public class PlaceProvider extends ContentProvider {
             br.close();
 
         }catch(Exception e){
-            Crashlytics.log(Log.ERROR, TAG, "downloadURL Exception");
+            FirebaseCrashlytics.getInstance().log("downloadURL Exception");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }finally{
             if(iStream != null) iStream.close();
             if(urlConnection != null) urlConnection.disconnect();
@@ -303,8 +303,8 @@ public class PlaceProvider extends ContentProvider {
             // Fetching the data from web service in background
             data = downloadUrl(url);
         }catch(Exception e){
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught in backgroundTask");
+            FirebaseCrashlytics.getInstance().log("Exception caught in backgroundTask");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
         return data;
     }
@@ -315,8 +315,8 @@ public class PlaceProvider extends ContentProvider {
         try {
             data = downloadUrl(url);
         } catch (IOException e) {
-            Crashlytics.log(Log.ERROR, TAG, "Exception caught");
+            FirebaseCrashlytics.getInstance().log("Exception caught");
-            Crashlytics.logException(e);
+            FirebaseCrashlytics.getInstance().recordException(e);
         }
         return data;
     }

app/src/main/java/org/deke/risk/riskahead/helper/RABroadcastReceiver.java

@@ -8,7 +8,7 @@ import android.content.Intent;
 import android.text.format.DateUtils;
 import android.util.Log;
 
-import com.crashlytics.android.Crashlytics;
+import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 /**
  *
@@ -36,7 +36,7 @@ public class RABroadcastReceiver extends BroadcastReceiver {
             if(am != null){
                 am.setInexactRepeating(AlarmManager.RTC, firstStart,interval, wtdSServicePendingIntent);
             }else{
-                Crashlytics.log(Log.ERROR, TAG, "Could not get AlarmManager");
+                FirebaseCrashlytics.getInstance().log("Could not get AlarmManager");
             }
 
             Log.v(TAG, "AlarmManager gesetzt");

app/src/main/java/org/deke/risk/riskahead/helper/TextValidator.java

@@ -1,7 +1,7 @@
 package org.deke.risk.riskahead.helper;
 
 import android.content.Context;
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.widget.TextView;

app/src/main/java/org/deke/risk/riskahead/helper/ValidatedEditTextPreference.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
 import android.app.AlertDialog;
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;

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

@@ -27,7 +27,7 @@
         android:paddingRight="15dp"
         android:paddingBottom="20dp">
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/input_layout_email"
             android:layout_marginTop="20dp"
             android:layout_width="match_parent"
@@ -43,9 +43,9 @@
                 android:maxLines="1"
                 android:textColor="@color/input_login"
                 android:textColorHint="@color/input_login_hint" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/input_layout_password"
             android:layout_below="@+id/input_layout_email"
             android:layout_width="match_parent"
@@ -62,7 +62,7 @@
                 android:maxLines="1"
                 android:textColor="@color/input_login"
                 android:textColorHint="@color/input_login_hint" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
         <com.beardedhen.androidbootstrap.BootstrapButton

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

@@ -21,7 +21,7 @@
             tools:context=".MapsActivity" >
         </fragment>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab_reportwf_map"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -26,7 +26,7 @@
             android:gravity="center"
             android:orientation="vertical">
 
-            <android.support.design.widget.TabLayout
+            <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tab_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -35,7 +35,7 @@
                 android:minHeight="?attr/actionBarSize"
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-            <android.support.v4.view.ViewPager
+            <androidx.viewpager.widget.ViewPager
                 android:id="@+id/pager"
                 android:layout_below="@+id/tab_layout"
                 android:layout_width="match_parent"

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

@@ -27,7 +27,7 @@
         android:paddingRight="15dp"
         android:paddingBottom="20dp">
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/input_layout_username"
             android:layout_marginTop="20dp"
             android:layout_width="match_parent"
@@ -43,10 +43,10 @@
                 android:maxLines="1"
                 android:textColor="@color/input_login"
                 android:textColorHint="@color/input_login_hint" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/input_layout_email"
             android:layout_below="@+id/input_layout_username"
             android:layout_width="match_parent"
@@ -62,9 +62,9 @@
                 android:maxLines="1"
                 android:textColor="@color/input_login"
                 android:textColorHint="@color/input_login_hint" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/input_layout_password"
             android:layout_below="@+id/input_layout_email"
             android:layout_width="match_parent"
@@ -80,7 +80,7 @@
                 android:maxLines="1"
                 android:textColor="@color/input_login"
                 android:textColorHint="@color/input_login_hint" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <com.beardedhen.androidbootstrap.BootstrapButton
             android:id="@+id/btn_register"

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

@@ -73,7 +73,7 @@
             android:layout_margin="5dp"
             android:textColor="@color/bg_common" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab_reportwf_map"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -58,7 +58,7 @@
             android:layout_marginBottom="10dp"
             android:background="#464b4b4b" />
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/subs_viewpager"
             android:layout_width="match_parent"

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

@@ -40,7 +40,7 @@
                 android:padding="10dp"
                 android:layout_marginRight="55dp">
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_reportedfrom"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
@@ -52,9 +52,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_incidentcategory"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -67,9 +67,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_incidentsubcategory"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -82,9 +82,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_incidentposition"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -97,9 +97,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_time"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -112,9 +112,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_suspect"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -127,9 +127,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_suspectweapon"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -142,9 +142,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_suspectcount"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -157,9 +157,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_victim"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -172,9 +172,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_victimorigin"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -187,9 +187,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_suspecttransport"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -202,9 +202,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_victimaff"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -217,9 +217,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_suspectrecon"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -232,9 +232,9 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_viewreport_etcetc"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -247,7 +247,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
 
             </RelativeLayout>
@@ -291,7 +291,7 @@
 
             </RelativeLayout>
 
-            <android.support.design.widget.FloatingActionButton
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/btn_viewreport_position"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -302,7 +302,7 @@
                 android:focusable="true"
                 android:src="@android:drawable/ic_dialog_map" />
 
-            <android.support.design.widget.FloatingActionButton
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/btn_viewreport_user"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
- <android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
+ <androidx.appcompat.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"

app/src/main/res/menu/menu_maps.xml

@@ -7,7 +7,7 @@
         android:title="@string/lbl_map_search"
         android:icon="@android:drawable/ic_menu_search"
         app:showAsAction="always"
-        app:actionViewClass="android.support.v7.widget.SearchView" />
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />
 
 
 </menu>

build.gradle

@@ -3,15 +3,11 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url 'https://maven.fabric.io/public' }
-        maven {
-            url 'https://maven.google.com/' }
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.google.gms:google-services:4.3.4'
-        classpath 'io.fabric.tools:gradle:1.27.1'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
     }
 }

gradle.properties

@@ -10,9 +10,11 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Feb 08 18:35:29 CET 2019
+#Mon Feb 08 16:06:46 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip