Security2

app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 27
     defaultConfig {
-        applicationId "com.foodx.nsh"
+        applicationId "com.mangwalo.nsh"
         minSdkVersion 17
         targetSdkVersion 27
         multiDexEnabled true
@@ -13,14 +13,13 @@ android {
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
     buildToolsVersion '27.0.3'
 }
-
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:multidex:1.0.3'
@@ -29,7 +28,6 @@ dependencies {
     implementation 'com.android.support:recyclerview-v7:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.google.code.gson:gson:2.8.2'
-
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:support-v4:27.1.1'
     testImplementation 'junit:junit:4.12'
@@ -42,5 +40,6 @@ dependencies {
     implementation 'com.android.support:design:27.1.1'
     implementation 'com.firebaseui:firebase-ui-auth:4.1.0'
     implementation 'com.google.firebase:firebase-core:16.0.1'
+    compile 'com.github.wooplr:Spotlight:1.2.3'
 }
 apply plugin: 'com.google.gms.google-services'

app/google-services.json

@@ -1,27 +1,27 @@
 {
   "project_info": {
-    "project_number": "910597300841",
-    "firebase_url": "https://fudo-3a55c.firebaseio.com",
-    "project_id": "fudo-3a55c",
-    "storage_bucket": "fudo-3a55c.appspot.com"
+    "project_number": "594029150216",
+    "firebase_url": "https://mangwalo-1beb5.firebaseio.com",
+    "project_id": "mangwalo-1beb5",
+    "storage_bucket": "mangwalo-1beb5.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:910597300841:android:2460fa31909bbdf0",
+        "mobilesdk_app_id": "1:594029150216:android:bfbf0bf943801d15",
         "android_client_info": {
-          "package_name": "com.foodx.nsh"
+          "package_name": "com.mangwalo.nsh"
         }
       },
       "oauth_client": [
         {
-          "client_id": "910597300841-2jgllviqg8r7t2ip8m6bk06la2inpp4f.apps.googleusercontent.com",
+          "client_id": "594029150216-ae0ko4g4ei26taodpdv03ggak48vts9i.apps.googleusercontent.com",
           "client_type": 3
         }
       ],
       "api_key": [
         {
-          "current_key": "AIzaSyDVX9sm495jmN1rN9uCKrzWEtb6kb9nv-g"
+          "current_key": "AIzaSyDZrvh1LeJW0PpXppKkeAUPRUGbn3AroPM"
         }
       ],
       "services": {

app/proguard-rules.pro

@@ -1,21 +1,178 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
+## Add project specific ProGuard rules here.
+## You can control the set of applied configuration files using the
+## proguardFiles setting in build.gradle.
+##
+## For more details, see
+##   http://developer.android.com/guide/developing/tools/proguard.html
+#
+## If your project uses WebView with JS, uncomment the following
+## and specify the fully qualified class name to the JavaScript interface
+## class:
+##-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+##   public *;
+##}
+#
+## Uncomment this to preserve the line number information for
+## debugging stack traces.
+##-keepattributes SourceFile,LineNumberTable
+#
+## If you keep the line number information, uncomment this to
+## hide the original source file name.
+##-renamesourcefileattribute SourceFile
+#-injars  bin/classes
+#-injars  libs
+#-outjars bin/classes-processed.jar
+#
+#-libraryjars /usr/local/android-sdk/platforms/android-9/android.jar
+##-libraryjars /usr/local/android-sdk/add-ons/google_apis-7_r01/libs/maps.jar
+## ...
+#
+## Save the obfuscation mapping to a file, so you can de-obfuscate any stack
+## traces later on.
+#
+#-printmapping bin/classes-processed.map
+#
+## You can print out the seeds that are matching the keep options below.
+#
+##-printseeds bin/classes-processed.seeds
+#
+## Preverification is irrelevant for the dex compiler and the Dalvik VM.
+#
+#-dontpreverify
+#
+## Reduce the size of the output some more.
+#
+#-repackageclasses ''
+#-allowaccessmodification
+#
+## Switch off some optimizations that trip older versions of the Dalvik VM.
+#
+#-optimizations !code/simplification/arithmetic
+#
+## Keep a fixed source file attribute and all line number tables to get line
+## numbers in the stack traces.
+## You can comment this out if you're not interested in stack traces.
+#
 #-renamesourcefileattribute SourceFile
+#-keepattributes SourceFile,LineNumberTable
+#
+## RemoteViews might need annotations.
+#
+#-keepattributes *Annotation*
+#
+## Preserve all fundamental application classes.
+#
+#-keep public class * extends android.app.Activity
+#-keep public class * extends android.app.Application
+#-keep public class * extends android.app.Service
+#-keep public class * extends android.content.BroadcastReceiver
+#-keep public class * extends android.content.ContentProvider
+#
+## Preserve all View implementations, their special context constructors, and
+## their setters.
+#
+#-keep public class * extends android.view.View {
+#    public <init>(android.content.Context);
+#    public <init>(android.content.Context, android.util.AttributeSet);
+#    public <init>(android.content.Context, android.util.AttributeSet, int);
+#    public void set*(...);
+#}
+#
+## Preserve all classes that have special context constructors, and the
+## constructors themselves.
+#
+#-keepclasseswithmembers class * {
+#    public <init>(android.content.Context, android.util.AttributeSet);
+#}
+#
+## Preserve all classes that have special context constructors, and the
+## constructors themselves.
+#
+#-keepclasseswithmembers class * {
+#    public <init>(android.content.Context, android.util.AttributeSet, int);
+#}
+#
+## Preserve all possible onClick handlers.
+#
+#-keepclassmembers class * extends android.content.Context {
+#   public void *(android.view.View);
+#   public void *(android.view.MenuItem);
+#}
+#
+## Preserve the special fields of all Parcelable implementations.
+#
+#-keepclassmembers class * implements android.os.Parcelable {
+#    static android.os.Parcelable$Creator CREATOR;
+#}
+#
+## Preserve static fields of inner classes of R classes that might be accessed
+## through introspection.
+#
+#-keepclassmembers class **.R$* {
+#  public static <fields>;
+#}
+#
+## Preserve annotated Javascript interface methods.
+#
+#-keepclassmembers class * {
+#    @android.webkit.JavascriptInterface <methods>;
+#}
+#
+## Preserve the required interface from the License Verification Library
+## (but don't nag the developer if the library is not used at all).
+#
+#-keep public interface com.android.vending.licensing.ILicensingService
+#
+#-dontnote com.android.vending.licensing.ILicensingService
+#
+## The Android Compatibility library references some classes that may not be
+## present in all versions of the API, but we know that's ok.
+#
+#-dontwarn android.support.**
+#
+## Preserve all native method names and the names of their classes.
+#
+#-keepclasseswithmembernames,includedescriptorclasses class * {
+#    native <methods>;
+#}
+#
+## Preserve the special static methods that are required in all enumeration
+## classes.
+#
+#-keepclassmembers,allowoptimization enum * {
+#    public static **[] values();
+#    public static ** valueOf(java.lang.String);
+#}
+#
+## Explicitly preserve all serialization members. The Serializable interface
+## is only a marker interface, so it wouldn't save them.
+## You can comment this out if your application doesn't use serialization.
+## If your code contains serializable classes that have to be backward
+## compatible, please refer to the manual.
+#
+#-keepclassmembers class * implements java.io.Serializable {
+#    static final long serialVersionUID;
+#    static final java.io.ObjectStreamField[] serialPersistentFields;
+#    private void writeObject(java.io.ObjectOutputStream);
+#    private void readObject(java.io.ObjectInputStream);
+#    java.lang.Object writeReplace();
+#    java.lang.Object readResolve();
+#}
+#
+## Your application may contain more items that need to be preserved;
+## typically classes that are dynamically created using Class.forName:
+#
+## -keep public class mypackage.MyClass
+## -keep public interface mypackage.MyInterface
+## -keep public class * implements mypackage.MyInterface
+#
+## If you wish, you can let the optimization step remove Android logging calls.
+#
+##-assumenosideeffects class android.util.Log {
+##    public static boolean isLoggable(java.lang.String, int);
+##    public static int v(...);
+##    public static int i(...);
+##    public static int w(...);
+##    public static int d(...);
+##    public static int e(...);
+##}

app/src/androidTest/java/com/foodx/nsh/ExampleInstrumentedTest.java → app/src/androidTest/java/com/mangwalo/nsh/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.foodx.nsh;
+package com.mangwalo.nsh;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;

app/src/main/AndroidManifest.xml

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.foodx.nsh">
+    package="com.mangwalo.nsh">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".activity.MainActivity" android:screenOrientation="portrait" />
-        <activity android:name=".activity.FirebaseLogin" android:screenOrientation="portrait"/>
-        <activity android:name=".activity.MenuActivity" android:screenOrientation="portrait"/>
-        <activity android:name=".activity.Splash" android:screenOrientation="portrait">
+        android:theme="@style/AppTheme"
+        >
+        <activity android:name="com.mangwalo.nsh.activity.MainActivity" android:screenOrientation="portrait" />
+        <activity android:name="com.mangwalo.nsh.activity.FirebaseLogin" android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity android:name="com.mangwalo.nsh.activity.MenuActivity" android:screenOrientation="portrait"/>
+        <activity android:name="com.mangwalo.nsh.activity.Splash" android:screenOrientation="portrait">
+        </activity>
     </application>
 
 </manifest>