diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 681f41a..2ea5962 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,26 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
+    <MarkdownNavigatorCodeStyleSettings>
+      <option name="RIGHT_MARGIN" value="72" />
+    </MarkdownNavigatorCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..a5f05cd
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?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="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml
new file mode 100644
index 0000000..a8fcc84
--- /dev/null
+++ b/.idea/markdown-navigator-enh.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownEnhProjectSettings">
+    <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
+    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imagePathType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 0000000..a2fc086
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" synchronizePreviewPosition="true" highlightPreviewType="LINE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true" lastLayoutSetsDefault="false">
+      <PanelProvider>
+        <provider providerId="com.vladsch.md.nav.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false" correctedInvalidSettings="false" emojiShortcuts="1" emojiImages="0">
+      <PegdownExtensions>
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="INTELLIJ_DUMMY_IDENTIFIER" value="true" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="PRODUCTION_SPEC_PARSER" value="true" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" addAnchorLinks="false" anchorLinksWrapText="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" defaultUrlTitle="false" migratedPlantUml="true" migratedAnchorLinks="true" plantUmlConversion="0">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.md.nav.editor.text.html.generator" providerName="Unmodified HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+      <fencedCodeConversions>
+        <option name="c4plantuml" value="NONE" />
+        <option name="ditaa" value="NONE" />
+        <option name="erd" value="NONE" />
+        <option name="graphviz" value="NONE" />
+        <option name="latex" value="KATEX" />
+        <option name="math" value="KATEX" />
+        <option name="mermaid" value="NONE" />
+        <option name="nomnoml" value="NONE" />
+        <option name="plantuml" value="NONE" />
+        <option name="puml" value="NONE" />
+        <option name="svgbob" value="NONE" />
+        <option name="umlet" value="NONE" />
+        <option name="vega" value="NONE" />
+        <option name="vegalite" value="NONE" />
+        <option name="wavedrom" value="NONE" />
+      </fencedCodeConversions>
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.md.nav.editor.text.html.css" providerName="No Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+      <cssUriHistory />
+    </CssSettings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/chat/About.java b/app/src/main/java/com/example/chat/About.java
index 90ee4da..041b998 100644
--- a/app/src/main/java/com/example/chat/About.java
+++ b/app/src/main/java/com/example/chat/About.java
@@ -1,9 +1,6 @@
 package com.example.chat;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
-import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -12,22 +9,27 @@
 import android.view.WindowManager;
 import android.widget.TextView;
 
-public class About extends AppCompatActivity implements View.OnClickListener{
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.util.Objects;
+
+public class About extends AppCompatActivity implements View.OnClickListener {
+
+    TextView feed, call, mail;
 
-    TextView feed,call,mail;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        getSupportActionBar().hide();
-        call=findViewById(R.id.textView10);
-        mail=findViewById(R.id.textView12);
+        Objects.requireNonNull(getSupportActionBar()).hide();
+        call = findViewById(R.id.textView10);
+        mail = findViewById(R.id.textView12);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
             window.setStatusBarColor(0xFF889FEF);
         }
-        feed=findViewById(R.id.feedback);
+        feed = findViewById(R.id.feedback);
         feed.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -42,21 +44,20 @@ public void onClick(View v) {
     @Override
     public void onBackPressed() {
         finish();
-        startActivity(new Intent(getApplicationContext(),ChatBox.class));
+        startActivity(new Intent(getApplicationContext(), ChatBox.class));
     }
 
     @Override
     public void onClick(View v) {
-        if(v==call)
-        {
+        if (v == call) {
             Intent intent = new Intent(Intent.ACTION_DIAL);
             intent.setData(Uri.parse("tel:+91 801-357-6138"));
             startActivity(intent);
         }
-        if(v==mail){
-            String to="subhopriyo153@gmail.com";
+        if (v == mail) {
+            String to = "subhopriyo153@gmail.com";
             Intent email = new Intent(Intent.ACTION_SEND);
-            email.putExtra(Intent.EXTRA_EMAIL, new String[]{ to});
+            email.putExtra(Intent.EXTRA_EMAIL, new String[]{to});
             email.putExtra(Intent.EXTRA_SUBJECT, "Chatable Application");
             email.putExtra(Intent.EXTRA_TEXT, "");
             email.setType("message/rfc822");
diff --git a/app/src/main/java/com/example/chat/ChatBox.java b/app/src/main/java/com/example/chat/ChatBox.java
index 31ec9b1..6fafc67 100644
--- a/app/src/main/java/com/example/chat/ChatBox.java
+++ b/app/src/main/java/com/example/chat/ChatBox.java
@@ -1,9 +1,6 @@
 package com.example.chat;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 
+import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
@@ -27,10 +24,13 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.bumptech.glide.Glide;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.database.ChildEventListener;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
@@ -42,42 +42,41 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
+import java.util.Objects;
 
 import de.hdodenhof.circleimageview.CircleImageView;
 
 public class ChatBox extends AppCompatActivity implements NewChat.NewChatListener, View.OnClickListener {
     FirebaseAuth auth;
-    DatabaseReference db,df,dl;
+    DatabaseReference db, df, dl;
     private TableLayout t;
-    int c=100;
+    int c = 100;
     Display display;
-    String allname="";
-    String hh="";
+    String allname = "";
+    String hh = "";
     //LoadingDialog loadingDialog=new LoadingDialog(ChatBox.this);
     ScrollView scr;
-    int fl=0,unseen_message=0,first_time=0;
+    int fl = 0, unseen_message = 0, first_time = 0;
     FloatingActionButton flab;
-    int flag=0;
-    String name[];
-    List<String> last=new ArrayList<>();
-    String lastChat="";
-    String a="";
-    String fblock="blockList";
-    List<String> blocks=new ArrayList<>();
+    int flag = 0;
+    String[] name;
+    List<String> last = new ArrayList<>();
+    String lastChat = "";
+    String a = "";
+    String fblock = "blockList";
+    List<String> blocks = new ArrayList<>();
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chat_box);
         auth = FirebaseAuth.getInstance();
 
-        if(!FirebaseAuth.getInstance().getCurrentUser().isEmailVerified()){
+        if (!Objects.requireNonNull(FirebaseAuth.getInstance().getCurrentUser()).isEmailVerified()) {
             auth.signOut();
-            flag=1;
+            flag = 1;
             finish();
             startActivity(new Intent(getApplicationContext(), Login.class));
         }
@@ -89,67 +88,68 @@ protected void onCreate(Bundle savedInstanceState) {
                 blocks.add(string);
                 //Toast.makeText(getApplicationContext(),string,Toast.LENGTH_SHORT).show();
             }
-        }catch(Exception e){}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         t = findViewById(R.id.table);
         db = FirebaseDatabase.getInstance().getReference().child("ChatBox");
         df = FirebaseDatabase.getInstance().getReference().child("Users");
         dl = FirebaseDatabase.getInstance().getReference().child("Last");
         display = getWindowManager().getDefaultDisplay();
         scr = findViewById(R.id.full);
-        flab=findViewById(R.id.fab);
+        flab = findViewById(R.id.fab);
         flab.setOnClickListener(this);
-        first_time=0;
-        a=auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-        if(flag==0) {
+        first_time = 0;
+        a = Objects.requireNonNull(Objects.requireNonNull(auth.getCurrentUser()).getEmail()).substring(0, Objects.requireNonNull(auth.getCurrentUser().getEmail()).indexOf('@'));
+        if (flag == 0) {
             load();
         }
 
     }
 
-    public void load()
-    {
-        lastChat="_"+auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-        last.clear();hh="";
-        FileInputStream fis2=null;
-        try{
-            fis2=openFileInput(lastChat);
-            InputStreamReader isr=new InputStreamReader(fis2);
-            BufferedReader br=new BufferedReader(isr);
-            int gl=0;String p1="";
-            while((p1=br.readLine())!=null){
-                gl=0;
-                for(String s4:last) {
-                    if(p1.equals(s4))
-                    {
-                        gl=1;
+    public void load() {
+        lastChat = "_" + Objects.requireNonNull(Objects.requireNonNull(auth.getCurrentUser()).getEmail()).substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+        last.clear();
+        hh = "";
+        FileInputStream fis2 = null;
+        try {
+            fis2 = openFileInput(lastChat);
+            InputStreamReader isr = new InputStreamReader(fis2);
+            BufferedReader br = new BufferedReader(isr);
+            int gl = 0;
+            String p1 = "";
+            while ((p1 = br.readLine()) != null) {
+                gl = 0;
+                for (String s4 : last) {
+                    if (p1.equals(s4)) {
+                        gl = 1;
                         break;
                     }
                 }
-                if(gl==0)
+                if (gl == 0)
                     last.add(p1);
             }
-        }catch(Exception e){}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         db.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                for(DataSnapshot dd:dataSnapshot.getChildren()){
-                    String zz=dd.getKey();
-                    String t1=zz.substring(0,zz.indexOf('^')),t2=zz.substring(zz.indexOf('^')+1);
-
-                    if(t1.equals(a) || t2.equals(a))
-                    {
-                        int gl=0;
-                        for(String s4:last) {
-                            if(dd.getKey().equals(s4))
-                            {
-                                gl=1;
+                for (DataSnapshot dd : dataSnapshot.getChildren()) {
+                    String zz = dd.getKey();
+                    String t1 = zz.substring(0, zz.indexOf('^')), t2 = zz.substring(zz.indexOf('^') + 1);
+
+                    if (t1.equals(a) || t2.equals(a)) {
+                        int gl = 0;
+                        for (String s4 : last) {
+                            if (dd.getKey().equals(s4)) {
+                                gl = 1;
                                 break;
                             }
                         }
-                        if(gl==0)
-                        {
-                            last.add(0,dd.getKey());
-                            hh=hh+dd.getKey();
+                        if (gl == 0) {
+                            last.add(0, dd.getKey());
+                            hh = hh + dd.getKey();
                         }
                     }
                 }
@@ -164,15 +164,15 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
         });
     }
 
-    public void display(){
+    public void display() {
         try {
             t.removeAllViews();
             flab.setVisibility(View.VISIBLE);
             scr.setBackgroundColor(Color.WHITE);
-            fl=0;
-            c=100;
-            int i=0;
-            for(String u:last) {
+            fl = 0;
+            c = 100;
+            int i = 0;
+            for (String u : last) {
                 unseen_message = 0;
                 final TableRow tr = new TableRow(getApplicationContext());
                 tr.setLayoutParams(new TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT));
@@ -181,14 +181,14 @@ public void display(){
                 String zz = auth.getCurrentUser().getEmail().substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
                 if (zz.contains("."))
                     zz = zz.replace('.', '!');
-                int gl=0;
-                for(String bl:blocks){
-                    if(bl.contains(u)){
-                        gl=1;
+                int gl = 0;
+                for (String bl : blocks) {
+                    if (bl.contains(u)) {
+                        gl = 1;
                         break;
                     }
                 }
-                final int gg=gl;
+                final int gg = gl;
                 if (u.contains(zz)) {
                     final String t1 = u.substring(0, u.indexOf('^')), t2 = u.substring(u.indexOf('^') + 1);
                     if (t1.equals(zz)) {
@@ -196,14 +196,16 @@ public void display(){
                             @Override
                             public void onDataChange(@NonNull DataSnapshot dataSnapshot2) {
                                 unseen_message = 0;
-                                for (DataSnapshot ds1 : dataSnapshot2.getChildren())  {
-                                    User uu=ds1.getValue(User.class);
-                                    if(uu.email.contains(t2+"\\"))
+                                for (DataSnapshot ds1 : dataSnapshot2.getChildren()) {
+                                    User uu = ds1.getValue(User.class);
+                                    assert uu != null;
+                                    if (uu.email.contains(t2 + "\\"))
                                         unseen_message++;
                                 }
-                                if(gg==1)
-                                    unseen_message=0;
+                                if (gg == 1)
+                                    unseen_message = 0;
                             }
+
                             @Override
                             public void onCancelled(@NonNull DatabaseError databaseError) {
                             }
@@ -225,15 +227,18 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
                             public void onDataChange(@NonNull DataSnapshot dataSnapshot2) {
                                 unseen_message = 0;
                                 for (DataSnapshot ds1 : dataSnapshot2.getChildren()) {
-                                    User uu=ds1.getValue(User.class);
-                                    if(uu.email.contains(t1+"\\"))
+                                    User uu = ds1.getValue(User.class);
+                                    assert uu != null;
+                                    if (uu.email.contains(t1 + "\\"))
                                         unseen_message++;
                                 }
-                                if(gg==1)
-                                    unseen_message=0;
+                                if (gg == 1)
+                                    unseen_message = 0;
                             }
+
                             @Override
-                            public void onCancelled(@NonNull DatabaseError databaseError) { }
+                            public void onCancelled(@NonNull DatabaseError databaseError) {
+                            }
                         });
 
                         getname(t1, c);
@@ -261,44 +266,44 @@ public void onCancelled(@NonNull DatabaseError databaseError) { }
                 checkClick();
                 checkImClick();
             } catch (Exception e) {
+                e.printStackTrace();
             }
         } catch (Exception e) {
-            Toast.makeText(getApplicationContext(),e.getMessage(),Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
         }
     }
 
-    public void getname(final String n,final int t)
-    {
+    public void getname(final String n, final int t) {
         df.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                for(DataSnapshot d1: dataSnapshot.getChildren()){
-                    Details u=d1.getValue(Details.class);
-                    if(n.equals(d1.getKey()))
-                    {
-                        CircleImageView civ=findViewById(100*t);
+                for (DataSnapshot d1 : dataSnapshot.getChildren()) {
+                    Details u = d1.getValue(Details.class);
+                    if (n.equals(d1.getKey())) {
+                        CircleImageView civ = findViewById(100 * t);
                         try {
                             Glide.with(getApplicationContext()).load(u.l).into(civ);
                         } catch (Exception e) {
                             load();
                         }
-                        Point size=new Point();
+                        Point size = new Point();
                         display.getSize(size);
-                        civ.getLayoutParams().height=size.x/7;
-                        civ.getLayoutParams().width=size.x/7;
+                        civ.getLayoutParams().height = size.x / 7;
+                        civ.getLayoutParams().width = size.x / 7;
                         civ.requestLayout();
                         civ.setLeft(5);
-                        civ.setPadding(8,8,8,8);
-                        Button b=findViewById(t);
+                        civ.setPadding(8, 8, 8, 8);
+                        Button b = findViewById(t);
                         b.setTextColor(Color.BLACK);
                         b.setTransformationMethod(null);
-                        String s1=u.n+"\t"+" (%"+unseen_message+"&"+d1.getKey()+u.d+") "+"\n"+u.s;
-                        SpannableString spannableString=new SpannableString(s1);
-                        spannableString.setSpan(new ForegroundColorSpan(Color.WHITE),s1.indexOf('('),s1.lastIndexOf(')')+1,0);
-                        if(unseen_message>0) {
+                        assert u != null;
+                        String s1 = u.n + "\t" + " (%" + unseen_message + "&" + d1.getKey() + u.d + ") " + "\n" + u.s;
+                        SpannableString spannableString = new SpannableString(s1);
+                        spannableString.setSpan(new ForegroundColorSpan(Color.WHITE), s1.indexOf('('), s1.lastIndexOf(')') + 1, 0);
+                        if (unseen_message > 0) {
                             spannableString.setSpan(new ForegroundColorSpan(Color.BLACK), s1.indexOf('%') + 1, s1.indexOf('&'), 0);
                             spannableString.setSpan(new BackgroundColorSpan(Color.GREEN), s1.indexOf('%') + 1, s1.indexOf('&'), 0);
-                            unseen_message=0;
+                            unseen_message = 0;
                         }
                         b.setText(spannableString);
                         b.setLeft(10);
@@ -315,23 +320,20 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
 
     }
 
-    public void getEmail(final String n)
-    {
-        Intent Int=new Intent(getApplicationContext(),Chats.class);
-        Int.putExtra("person",""+n.substring(n.indexOf('&')+1,n.lastIndexOf(')'))+"&"+n.substring(0,n.indexOf('(')-1));
+    public void getEmail(final String n) {
+        Intent Int = new Intent(getApplicationContext(), Chats.class);
+        Int.putExtra("person", "" + n.substring(n.indexOf('&') + 1, n.lastIndexOf(')')) + "&" + n.substring(0, n.indexOf('(') - 1));
         finish();
         startActivity(Int);
     }
 
-    public void checkClick()
-    {
-        for(int i=100;i<c;i++)
-        {
-            final Button b=scr.findViewById(i);
+    public void checkClick() {
+        for (int i = 100; i < c; i++) {
+            final Button b = scr.findViewById(i);
             b.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    getEmail(""+b.getText());
+                    getEmail("" + b.getText());
 
                 }
             });
@@ -345,8 +347,8 @@ public boolean onLongClick(View v) {
         }
     }
 
-    public void longClick(final Button b){
-        AlertDialog.Builder alt=new AlertDialog.Builder(this);
+    public void longClick(final Button b) {
+        AlertDialog.Builder alt = new AlertDialog.Builder(this);
         alt.setTitle("Warning!")
                 .setCancelable(false)
                 .setMessage("Are you sure you want to delete this chat?")
@@ -354,33 +356,33 @@ public void longClick(final Button b){
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         try {
-                            String n=b.getText().toString();
-                            n=n.substring(n.indexOf('&')+1,n.lastIndexOf('@'));
-                            n=common(a,n);
-                            String fname=n;
-                            FileOutputStream fos=openFileOutput(fname,MODE_PRIVATE);
+                            String n = b.getText().toString();
+                            n = n.substring(n.indexOf('&') + 1, n.lastIndexOf('@'));
+                            n = common(a, n);
+                            String fname = n;
+                            FileOutputStream fos = openFileOutput(fname, MODE_PRIVATE);
                             fos.write("".getBytes());
 
-                            FileInputStream fis=openFileInput(lastChat);
-                            InputStreamReader isr=new InputStreamReader(fis);
-                            BufferedReader br=new BufferedReader(isr);
-                            String p1="";
-                            List<String> refresh=new ArrayList<>();
-                            while((p1=br.readLine())!=null){
-                                if(!p1.equals(fname))
+                            FileInputStream fis = openFileInput(lastChat);
+                            InputStreamReader isr = new InputStreamReader(fis);
+                            BufferedReader br = new BufferedReader(isr);
+                            String p1 = "";
+                            List<String> refresh = new ArrayList<>();
+                            while ((p1 = br.readLine()) != null) {
+                                if (!p1.equals(fname))
                                     refresh.add(p1);
                             }
-                            p1="";
-                            fos=openFileOutput(lastChat,MODE_PRIVATE);
-                            for(String g:refresh){
-                                p1=p1+g+"\n";
+                            p1 = "";
+                            fos = openFileOutput(lastChat, MODE_PRIVATE);
+                            for (String g : refresh) {
+                                p1 = p1 + g + "\n";
                             }
                             fos.write(p1.getBytes());
-                            Toast.makeText(getApplicationContext(),"Chat deleted",Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getApplicationContext(), "Chat deleted", Toast.LENGTH_SHORT).show();
                             db.child(fname).removeValue();
                             load();
                         } catch (IOException e) {
-
+                            e.printStackTrace();
                         }
                     }
                 })
@@ -390,28 +392,25 @@ public void onClick(DialogInterface dialog, int which) {
                         dialog.dismiss();
                     }
                 });
-        AlertDialog aaa=alt.create();
+        AlertDialog aaa = alt.create();
         aaa.show();
     }
 
-    public String common(String a1,String p1){
-        int i=0;String n="";
-        while(i<a1.length() && i<p1.length())
-        {
-            if((int)(a1.charAt(i))<(int)(p1.charAt(i)))
-            {
-                n=""+(a1+"^"+p1);
+    public String common(String a1, String p1) {
+        int i = 0;
+        String n = "";
+        while (i < a1.length() && i < p1.length()) {
+            if ((int) (a1.charAt(i)) < (int) (p1.charAt(i))) {
+                n = "" + (a1 + "^" + p1);
                 break;
-            }
-            else if((int)(a1.charAt(i))>(int)(p1.charAt(i)))
-            {
-                n=""+(p1+"^"+a1);
+            } else if ((int) (a1.charAt(i)) > (int) (p1.charAt(i))) {
+                n = "" + (p1 + "^" + a1);
                 break;
-            }else{
-                if(a1.length()<p1.length())
-                    n=""+(a1+"^"+p1);
+            } else {
+                if (a1.length() < p1.length())
+                    n = "" + (a1 + "^" + p1);
                 else
-                    n=""+(p1+"^"+a1);
+                    n = "" + (p1 + "^" + a1);
             }
             i++;
         }
@@ -420,19 +419,19 @@ else if((int)(a1.charAt(i))>(int)(p1.charAt(i)))
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inf=getMenuInflater();
-        inf.inflate(R.menu.option_menu,menu);
+        MenuInflater inf = getMenuInflater();
+        inf.inflate(R.menu.option_menu, menu);
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()){
+        switch (item.getItemId()) {
             case R.id.item1:
                 openDialog();
                 return true;
             case R.id.item3:
-                AlertDialog.Builder alt=new AlertDialog.Builder(this);
+                AlertDialog.Builder alt = new AlertDialog.Builder(this);
                 alt.setTitle("Warning!")
                         .setCancelable(false)
                         .setMessage("Are you sure you want to log out of this app?")
@@ -441,7 +440,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
                             public void onClick(DialogInterface dialog, int which) {
                                 auth.signOut();
                                 finish();
-                                startActivity(new Intent(getApplicationContext(),Home.class));
+                                startActivity(new Intent(getApplicationContext(), Home.class));
                             }
                         })
                         .setNegativeButton("No", new DialogInterface.OnClickListener() {
@@ -450,57 +449,55 @@ public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
                             }
                         });
-                AlertDialog a=alt.create();
+                AlertDialog a = alt.create();
                 a.show();
                 return true;
             case R.id.item2:
                 finish();
-                startActivity(new Intent(getApplicationContext(),Edit.class));
+                startActivity(new Intent(getApplicationContext(), Edit.class));
                 return true;
             case R.id.about:
                 finish();
-                startActivity(new Intent(getApplicationContext(),About.class));
+                startActivity(new Intent(getApplicationContext(), About.class));
                 return true;
             case R.id.settings:
                 finish();
-                startActivity(new Intent(getApplicationContext(),ChatableSettings.class));
+                startActivity(new Intent(getApplicationContext(), ChatableSettings.class));
                 return true;
             case R.id.sync:
                 last.clear();
                 load();
-            default:return super.onOptionsItemSelected(item);
+            default:
+                return super.onOptionsItemSelected(item);
         }
 
     }
 
 
-
-    public void checkImClick()
-    {
-        for(int i=100;i<c;i++)
-        {
-            final Button b=findViewById(i);
-            final CircleImageView civ=findViewById(100*i);
+    public void checkImClick() {
+        for (int i = 100; i < c; i++) {
+            final Button b = findViewById(i);
+            final CircleImageView civ = findViewById(100 * i);
             try {
                 civ.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         flab.setVisibility(View.INVISIBLE);
-                        LayoutInflater inflater=getLayoutInflater();
-                        View view=inflater.inflate(R.layout.pic,null);
-                        TextView txt=view.findViewById(R.id.txt);
-                        final ImageView imv=view.findViewById(R.id.img);
-                        String n=b.getText().toString();
+                        LayoutInflater inflater = getLayoutInflater();
+                        @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.pic, null);
+                        TextView txt = view.findViewById(R.id.txt);
+                        final ImageView imv = view.findViewById(R.id.img);
+                        String n = b.getText().toString();
                         scr.setBackgroundColor(Color.BLACK);
-                        fl=1;
-                        final String file=n.substring(n.indexOf('&')+1,n.indexOf('@'));
-                        txt.setText(n.substring(0,n.indexOf('(')-1));
+                        fl = 1;
+                        final String file = n.substring(n.indexOf('&') + 1, n.indexOf('@'));
+                        txt.setText(n.substring(0, n.indexOf('(') - 1));
                         df.addValueEventListener(new ValueEventListener() {
                             @Override
                             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                                for(DataSnapshot ds: dataSnapshot.getChildren()){
-                                    Details u1=ds.getValue(Details.class);
-                                    if(file.equals(ds.getKey()))
+                                for (DataSnapshot ds : dataSnapshot.getChildren()) {
+                                    Details u1 = ds.getValue(Details.class);
+                                    if (file.equals(ds.getKey()))
                                         Glide.with(getApplicationContext()).load(u1.l).into(imv);
                                 }
                             }
@@ -521,30 +518,29 @@ public void onClick(View v) {
                     }
                 });
             } catch (Exception e) {
-                Toast.makeText(getApplicationContext(),"Picture changed",Toast.LENGTH_SHORT).show();
+                Toast.makeText(getApplicationContext(), "Picture changed", Toast.LENGTH_SHORT).show();
                 load();
             }
 
         }
     }
 
-    public void openDialog(){
-        NewChat nc=new NewChat();
-        nc.show(getSupportFragmentManager(),"New Chat");
+    public void openDialog() {
+        NewChat nc = new NewChat();
+        nc.show(getSupportFragmentManager(), "New Chat");
     }
 
     @Override
     public void applyTexts(final String n) {
-        final Intent Int=new Intent(getApplicationContext(),Chats.class);
+        final Intent Int = new Intent(getApplicationContext(), Chats.class);
 
         df.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                for(DataSnapshot d1: dataSnapshot.getChildren()){
-                    Details u=d1.getValue(Details.class);
-                    if(n.equals(d1.getKey()))
-                    {
-                        Int.putExtra("person",n+u.d+"&"+u.n);
+                for (DataSnapshot d1 : dataSnapshot.getChildren()) {
+                    Details u = d1.getValue(Details.class);
+                    if (n.equals(d1.getKey())) {
+                        Int.putExtra("person", n + u.d + "&" + u.n);
                         //finish();
                         startActivity(Int);
                     }
@@ -560,10 +556,9 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
 
     @Override
     public void onBackPressed() {
-        if(fl==0){
+        if (fl == 0) {
             finishAffinity();
-        }
-        else if(fl==1){
+        } else if (fl == 1) {
             load();
         }
 
@@ -571,10 +566,9 @@ else if(fl==1){
 
     @Override
     public void onClick(View v) {
-        if(v==flab)
-        {
+        if (v == flab) {
             //finish();
-            startActivity(new Intent(getApplicationContext(),MorePeople.class));
+            startActivity(new Intent(getApplicationContext(), MorePeople.class));
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/chat/ChatableSettings.java b/app/src/main/java/com/example/chat/ChatableSettings.java
index 6e3b6f5..f464053 100644
--- a/app/src/main/java/com/example/chat/ChatableSettings.java
+++ b/app/src/main/java/com/example/chat/ChatableSettings.java
@@ -17,6 +17,8 @@
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
 
+import java.util.Objects;
+
 public class ChatableSettings extends AppCompatActivity {
 
     FirebaseAuth auth;
@@ -28,11 +30,11 @@ public class ChatableSettings extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chatable_settings);
-        getSupportActionBar().setTitle("Settings");
+        Objects.requireNonNull(getSupportActionBar()).setTitle("Settings");
         s1=findViewById(R.id.switch1);
         s2=findViewById(R.id.switch2);
         auth=FirebaseAuth.getInstance();
-        String authemail=auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
+        String authemail= Objects.requireNonNull(Objects.requireNonNull(auth.getCurrentUser()).getEmail()).substring(0, Objects.requireNonNull(auth.getCurrentUser().getEmail()).indexOf('@'));
         if(authemail.contains("."))
             authemail=authemail.replace('.','!');
         db= FirebaseDatabase.getInstance().getReference().child("Users").child(authemail);
@@ -40,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                 Details d1=dataSnapshot.getValue(Details.class);
+                assert d1 != null;
                 n=d1.n;
                 d=d1.d;
                 s=d1.s;
@@ -70,20 +73,21 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()){
-            case R.id.save:
-                Details d2;int a,b;
-                if(s1.isChecked())
-                    a=1;
-                else
-                    a=0;
-                if(s2.isChecked())
-                    b=1;
-                else b=0;
-                d2=new Details(n,s,l,d,a,b);
-                db.setValue(d2);
-                Snackbar.make(findViewById(R.id.setting), "Changes Saved", Snackbar.LENGTH_SHORT)
-                        .setAction("Action", null).show();        }
+        if (item.getItemId() == R.id.save) {
+            Details d2;
+            int a, b;
+            if (s1.isChecked())
+                a = 1;
+            else
+                a = 0;
+            if (s2.isChecked())
+                b = 1;
+            else b = 0;
+            d2 = new Details(n, s, l, d, a, b);
+            db.setValue(d2);
+            Snackbar.make(findViewById(R.id.setting), "Changes Saved", Snackbar.LENGTH_SHORT)
+                    .setAction("Action", null).show();
+        }
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/app/src/main/java/com/example/chat/Chats.java b/app/src/main/java/com/example/chat/Chats.java
index d929317..d5915e0 100644
--- a/app/src/main/java/com/example/chat/Chats.java
+++ b/app/src/main/java/com/example/chat/Chats.java
@@ -1,10 +1,6 @@
 package com.example.chat;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-
+import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.media.MediaPlayer;
@@ -15,22 +11,22 @@
 import android.text.SpannableString;
 import android.text.style.AlignmentSpan;
 import android.text.style.RelativeSizeSpan;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TableLayout;
-import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.android.material.snackbar.Snackbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
@@ -39,11 +35,8 @@
 import com.google.firebase.database.ValueEventListener;
 
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.text.SimpleDateFormat;
@@ -51,38 +44,41 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
+
 public class Chats extends AppCompatActivity implements View.OnClickListener {
-    String p,a;
-    DatabaseReference db,ud,dbr;
+    String p, a;
+    DatabaseReference db, ud, dbr;
     FirebaseAuth auth;
     TableLayout t;
     Button b;
     EditText text;
     ScrollView scr;
-    int c=0,fl=1,bl=0,f=0;
-    int bot=0;
-    String fname,lastChat;
+    int c = 0, fl = 1, bl = 0, f = 0;
+    int bot = 0;
+    String fname, lastChat;
     int activityOnline;
-    String unread="";
-    List<String> un=new ArrayList<>();
-    String autotext="";
-    String fblock="blockList";
-    List<String> blocks=new ArrayList<>();
-    List<Integer> reply=new ArrayList<>();
-    int row=0;
+    String unread = "";
+    List<String> un = new ArrayList<>();
+    String autotext = "";
+    String fblock = "blockList";
+    List<String> blocks = new ArrayList<>();
+    List<Integer> reply = new ArrayList<>();
+    int row = 0;
     TextView re;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chats);
-        Intent intent=getIntent();
-        p=intent.getExtras().getString("person");
-        String t1=p.substring(p.indexOf('&')+1);
-        p=p.substring(0,p.indexOf('@'));
-        auth=FirebaseAuth.getInstance();
+        Intent intent = getIntent();
+        p = intent.getExtras().getString("person");
+        String t1 = p.substring(p.indexOf('&') + 1);
+        p = p.substring(0, p.indexOf('@'));
+        auth = FirebaseAuth.getInstance();
         getSupportActionBar().setTitle(t1);
-        t=findViewById(R.id.table);
-        re=findViewById(R.id.reply);
+        t = findViewById(R.id.table);
+        re = findViewById(R.id.reply);
         re.setVisibility(View.INVISIBLE);
         try {
             FileInputStream fis = openFileInput(fblock);
@@ -92,17 +88,19 @@ protected void onCreate(Bundle savedInstanceState) {
                 blocks.add(string);
                 //Toast.makeText(getApplicationContext(),string,Toast.LENGTH_SHORT).show();
             }
-        }catch(Exception e){}
-        a=auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-        if(a.contains("."))
-            a=a.replace('.','!');
-        activityOnline=1;
-        dbr=FirebaseDatabase.getInstance().getReference().child("Users").child(a);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        a = auth.getCurrentUser().getEmail().substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+        if (a.contains("."))
+            a = a.replace('.', '!');
+        activityOnline = 1;
+        dbr = FirebaseDatabase.getInstance().getReference().child("Users").child(a);
         dbr.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                Details dd=dataSnapshot.getValue(Details.class);
-                bot=dd.chatbot;
+                Details dd = dataSnapshot.getValue(Details.class);
+                bot = dd.chatbot;
             }
 
             @Override
@@ -111,11 +109,11 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
             }
         });
 
-        b=findViewById(R.id.button2);
+        b = findViewById(R.id.button2);
         b.setOnClickListener(this);
-        text=findViewById(R.id.editText3);
-        scr=findViewById(R.id.scrollView2);
-        ud=FirebaseDatabase.getInstance().getReference().child("Last");
+        text = findViewById(R.id.editText3);
+        scr = findViewById(R.id.scrollView2);
+        ud = FirebaseDatabase.getInstance().getReference().child("Last");
         scr.post(new Runnable() {
             @Override
             public void run() {
@@ -124,47 +122,45 @@ public void run() {
         });
         scr.fullScroll(ScrollView.FOCUS_DOWN);
         try {
-            chatbase(a,p);
+            chatbase(a, p);
         } catch (IOException e) {
+            e.printStackTrace();
         }
 
     }
 
     public void chatbase(String a1, String p1) throws IOException {
-        int i=0;String n="";
-        while(i<a1.length() && i<p1.length())
-        {
-            if((int)(a1.charAt(i))<(int)(p1.charAt(i)))
-            {
-                n=""+(a1+"^"+p1);
+        int i = 0;
+        String n = "";
+        while (i < a1.length() && i < p1.length()) {
+            if ((int) (a1.charAt(i)) < (int) (p1.charAt(i))) {
+                n = "" + (a1 + "^" + p1);
                 break;
-            }
-            else if((int)(a1.charAt(i))>(int)(p1.charAt(i)))
-            {
-                n=""+(p1+"^"+a1);
+            } else if ((int) (a1.charAt(i)) > (int) (p1.charAt(i))) {
+                n = "" + (p1 + "^" + a1);
                 break;
-            }else{
-                if(a1.length()<p1.length())
-                    n=""+(a1+"^"+p1);
+            } else {
+                if (a1.length() < p1.length())
+                    n = "" + (a1 + "^" + p1);
                 else
-                    n=""+(p1+"^"+a1);
+                    n = "" + (p1 + "^" + a1);
             }
             i++;
         }
-        db=FirebaseDatabase.getInstance().getReference().child("ChatBox").child(n);
-        fname=n;
+        db = FirebaseDatabase.getInstance().getReference().child("ChatBox").child(n);
+        fname = n;
 
-        lastChat="_"+a;
+        lastChat = "_" + a;
         db.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                unread="";
-                for(DataSnapshot ds2:dataSnapshot.getChildren()){
-                    User u2=ds2.getValue(User.class);
-                    if(u2.email.contains(a+"\\"))
-                    {
+                unread = "";
+                for (DataSnapshot ds2 : dataSnapshot.getChildren()) {
+                    User u2 = ds2.getValue(User.class);
+                    assert u2 != null;
+                    if (u2.email.contains(a + "\\")) {
 
-                        unread=unread+u2.email;
+                        unread = unread + u2.email;
                         //un.add(u2.email);
                     }
                     /*if (u2.email.contains(p + "\\")) {
@@ -187,14 +183,14 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                     }*/
                 }
 
-                FileInputStream fis=null;
+                FileInputStream fis = null;
                 try {
-                    fis=openFileInput(fname);
+                    fis = openFileInput(fname);
                     t.removeAllViews();
-                    InputStreamReader isr=new InputStreamReader(fis);
-                    BufferedReader br=new BufferedReader(isr);
+                    InputStreamReader isr = new InputStreamReader(fis);
+                    BufferedReader br = new BufferedReader(isr);
                     String text;
-                    String g=unread;
+                    String g = unread;
                     while ((text = br.readLine()) != null) {
                         //Toast.makeText(getApplicationContext(),g,Toast.LENGTH_SHORT).show();
                         if (text.contains(a + "\\")) {
@@ -202,12 +198,12 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                             LayoutInflater inflater = getLayoutInflater();
 
                             if (!g.contains(text)) {
-                                if (z.contains("...R\\")){
-                                    View v = inflater.inflate(R.layout.seenreply, null);
+                                if (z.contains("...R\\")) {
+                                    @SuppressLint("InflateParams") View v = inflater.inflate(R.layout.seenreply, null);
                                     TextView tvt = v.findViewById(R.id.message);
-                                    TextView tvt2=v.findViewById(R.id.remessage);
-                                    tvt2.setText(z.substring(0,z.indexOf("R\\")));
-                                    z=z.substring(z.indexOf("R\\")+2);
+                                    TextView tvt2 = v.findViewById(R.id.remessage);
+                                    tvt2.setText(z.substring(0, z.indexOf("R\\")));
+                                    z = z.substring(z.indexOf("R\\") + 2);
                                     if (z.indexOf('$') > -1) {
                                         String p;
                                         p = z.substring(0, z.indexOf('$')) + "    " + z.substring(z.indexOf('#') + 1);
@@ -220,9 +216,8 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                                     t.addView(v);
                                     row++;
                                     reply.add(v.getId());
-                                }
-                                else {
-                                    View v = inflater.inflate(R.layout.seen, null);
+                                } else {
+                                    @SuppressLint("InflateParams") View v = inflater.inflate(R.layout.seen, null);
                                     TextView tvt = v.findViewById(R.id.message);
                                     if (z.indexOf('$') > -1) {
                                         String p;
@@ -240,12 +235,12 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                             } else {
                                 //Toast.makeText(getApplicationContext(), unread, Toast.LENGTH_SHORT).show();
 
-                                if (z.contains("...R\\")){
-                                    View v = inflater.inflate(R.layout.right_chat_reply, null);
+                                if (z.contains("...R\\")) {
+                                    @SuppressLint("InflateParams") View v = inflater.inflate(R.layout.right_chat_reply, null);
                                     TextView tvt = v.findViewById(R.id.message);
-                                    TextView tvt2=v.findViewById(R.id.remessage);
-                                    tvt2.setText(z.substring(0,z.indexOf("R\\")));
-                                    z=z.substring(z.indexOf("R\\")+2);
+                                    TextView tvt2 = v.findViewById(R.id.remessage);
+                                    tvt2.setText(z.substring(0, z.indexOf("R\\")));
+                                    z = z.substring(z.indexOf("R\\") + 2);
                                     if (z.indexOf('$') > -1) {
                                         String p;
                                         p = z.substring(0, z.indexOf('$')) + "    " + z.substring(z.indexOf('#') + 1);
@@ -259,9 +254,8 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                                     t.addView(v);
                                     row++;
                                     reply.add(v.getId());
-                                }
-                                else {
-                                    View v = inflater.inflate(R.layout.right_chat, null);
+                                } else {
+                                    @SuppressLint("InflateParams") View v = inflater.inflate(R.layout.right_chat, null);
                                     TextView tvt = v.findViewById(R.id.message);
                                     if (z.indexOf('$') > -1) {
                                         String p;
@@ -284,12 +278,12 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                             String z = (text.substring(text.indexOf('\\') + 1));
                             LayoutInflater inflater = getLayoutInflater();
 
-                            if (z.contains("...R\\")){
-                                View v = inflater.inflate(R.layout.left_chat_reply, null);
+                            if (z.contains("...R\\")) {
+                                @SuppressLint("InflateParams") View v = inflater.inflate(R.layout.left_chat_reply, null);
                                 TextView tvt = v.findViewById(R.id.message);
-                                TextView tvt2=v.findViewById(R.id.remessage);
-                                tvt2.setText(z.substring(0,z.indexOf("R\\")));
-                                z=z.substring(z.indexOf("R\\")+2);
+                                TextView tvt2 = v.findViewById(R.id.remessage);
+                                tvt2.setText(z.substring(0, z.indexOf("R\\")));
+                                z = z.substring(z.indexOf("R\\") + 2);
                                 if (z.indexOf('$') > -1) {
                                     String p;
                                     p = z.substring(0, z.indexOf('$')) + "    " + z.substring(z.indexOf('#') + 1);
@@ -302,9 +296,8 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                                 t.addView(v);
                                 row++;
                                 reply.add(v.getId());
-                            }
-                            else {
-                                View v = inflater.inflate(R.layout.left_chat, null);
+                            } else {
+                                @SuppressLint("InflateParams") View v = inflater.inflate(R.layout.left_chat, null);
                                 TextView tvt = v.findViewById(R.id.message);
                                 if (z.indexOf('$') > -1) {
                                     String p;
@@ -332,13 +325,11 @@ public void run() {
                         }
                     });
 
-                }
-                catch(Exception e){
+                } catch (Exception e) {
                     //Toast.makeText(getApplicationContext(),"File Doesnt exist",Toast.LENGTH_SHORT).show();
-                }
-                finally{
+                } finally {
                     checkReply();
-                    if(!blocks.contains(fname))
+                    if (!blocks.contains(fname))
                         newChats();
 
                 }
@@ -353,53 +344,54 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
         //show();
         //viewChat();
     }
-    public void checkReply(){
-        for(int i=0;i<row;i++){
-            View v=t.getChildAt(i);
-            try{
-            final TextView tv=v.findViewById(R.id.message);
-            tv.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    //Toast.makeText(getApplicationContext(),tv.getText().toString().substring(0,tv.getText().toString().length()-8).trim(),Toast.LENGTH_SHORT).show();
-                    String nn=tv.getText().toString().substring(0,tv.getText().toString().length()-8).trim();
-                    if(nn.length()>100)
-                        nn=nn.substring(0,100)+"...";
-                    else
-                        nn=nn+"...";
-                    re.setText(nn+"\n\n");
-                    re.setVisibility(View.VISIBLE);
-                    scr.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            scr.fullScroll(View.FOCUS_DOWN);
-                        }
-                    });
 
-                }
-            });}catch (Exception e){}
+    public void checkReply() {
+        for (int i = 0; i < row; i++) {
+            View v = t.getChildAt(i);
+            try {
+                final TextView tv = v.findViewById(R.id.message);
+                tv.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        //Toast.makeText(getApplicationContext(),tv.getText().toString().substring(0,tv.getText().toString().length()-8).trim(),Toast.LENGTH_SHORT).show();
+                        String nn = tv.getText().toString().substring(0, tv.getText().toString().length() - 8).trim();
+                        if (nn.length() > 100)
+                            nn = nn.substring(0, 100) + "...";
+                        else
+                            nn = nn + "...";
+                        re.setText(nn + "\n\n");
+                        re.setVisibility(View.VISIBLE);
+                        scr.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                scr.fullScroll(View.FOCUS_DOWN);
+                            }
+                        });
+
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 
-    public void newChats(){
+    public void newChats() {
         db.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                for(DataSnapshot dss:dataSnapshot.getChildren()){
-                    User uu=dss.getValue(User.class);
-                    final String ss=(uu.email);
-                    if(ss.contains(p+"\\") && ss.contains(":"))
-                    {
+                for (DataSnapshot dss : dataSnapshot.getChildren()) {
+                    User uu = dss.getValue(User.class);
+                    final String ss = (uu.email);
+                    if (ss.contains(p + "\\") && ss.contains(":")) {
                         try {
-                            final FileOutputStream fos=openFileOutput(fname,MODE_APPEND);
-                            if(!check(ss) && activityOnline==1)
-                            {
+                            final FileOutputStream fos = openFileOutput(fname, MODE_APPEND);
+                            if (!check(ss) && activityOnline == 1) {
                                 fos.write((ss + "\n").getBytes());
-                                autotext=ss;
+                                autotext = ss;
                             }
-                            if(activityOnline==1)
-                            {
-                                db.child(dss.getKey()).removeValue();
+                            if (activityOnline == 1) {
+                                db.child(Objects.requireNonNull(dss.getKey())).removeValue();
                             }
                         } catch (IOException e) {
 
@@ -414,57 +406,52 @@ public void run() {
                     });
                 }
                 String time = new SimpleDateFormat("HH", Locale.getDefault()).format(new Date());
-                int t=Integer.parseInt(time);
-                if(!autotext.contains("Crypton says- ") && (autotext.contains("good morning") || autotext.contains("Good morning") || autotext.contains("Good Morning") || autotext.contains("GOOD MORNING"))&& bot==1 && (t>=4 && t<12) ) {
+                int t = Integer.parseInt(time);
+                if (!autotext.contains("Crypton says- ") && (autotext.contains("good morning") || autotext.contains("Good morning") || autotext.contains("Good Morning") || autotext.contains("GOOD MORNING")) && bot == 1 && (t >= 4 && t < 12)) {
 
                     autotext = "";
                     try {
-                        addChat(a+"\\"+"Crypton says- Good Morning");
+                        addChat(a + "\\" + "Crypton says- Good Morning");
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
-                }
-                else if(!autotext.contains("Crypton says- ") && (autotext.contains("good afternoon") || autotext.contains("Good Afternoon") || autotext.contains("Good afternoon") || autotext.contains("GOOD AFTERNOON"))&& bot==1 && (t>=12 && t<16)) {
+                } else if (!autotext.contains("Crypton says- ") && (autotext.contains("good afternoon") || autotext.contains("Good Afternoon") || autotext.contains("Good afternoon") || autotext.contains("GOOD AFTERNOON")) && bot == 1 && (t >= 12 && t < 16)) {
 
                     autotext = "";
                     try {
-                        addChat(a+"\\"+"Crypton says- Good Afternoon");
+                        addChat(a + "\\" + "Crypton says- Good Afternoon");
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
-                }
-                else if(!autotext.contains("Crypton says- ") && (autotext.contains("good evening") || autotext.contains("Good Evening") || autotext.contains("Good evening") || autotext.contains("GOOD EVENING"))&& bot==1 && (t>=16 && t<20)) {
+                } else if (!autotext.contains("Crypton says- ") && (autotext.contains("good evening") || autotext.contains("Good Evening") || autotext.contains("Good evening") || autotext.contains("GOOD EVENING")) && bot == 1 && (t >= 16 && t < 20)) {
 
                     autotext = "";
                     try {
-                        addChat(a+"\\"+"Crypton says- Good Evening");
+                        addChat(a + "\\" + "Crypton says- Good Evening");
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
-                }
-                else if(!autotext.contains("Crypton says- ") && (autotext.contains("good night") || autotext.contains("Good night") || autotext.contains("Good Night") || autotext.contains("GOOD NIGHT"))&& bot==1 && (t>=20 || t<3)) {
+                } else if (!autotext.contains("Crypton says- ") && (autotext.contains("good night") || autotext.contains("Good night") || autotext.contains("Good Night") || autotext.contains("GOOD NIGHT")) && bot == 1 && (t >= 20 || t < 3)) {
 
                     autotext = "";
                     try {
-                        addChat(a+"\\"+"Crypton says- Good Night");
+                        addChat(a + "\\" + "Crypton says- Good Night");
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
-                }
-                else if(!autotext.contains("Crypton says- ") && (autotext.contains("hello") || autotext.contains("Hello") || autotext.contains("HELLO"))&& bot==1 ) {
+                } else if (!autotext.contains("Crypton says- ") && (autotext.contains("hello") || autotext.contains("Hello") || autotext.contains("HELLO")) && bot == 1) {
 
                     autotext = "";
                     try {
-                        addChat(a+"\\"+"Crypton says- Hello");
+                        addChat(a + "\\" + "Crypton says- Hello");
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
-                }
-                else if(!autotext.contains("Crypton says- ") && (autotext.contains("thank you") || autotext.contains("thanks") || autotext.contains("Thank You") || autotext.contains("Thank you") || autotext.contains("Thanks") || autotext.contains("THANK YOU") || autotext.contains("THANKS"))&& bot==1 && (t>=20 || t<3)) {
+                } else if (!autotext.contains("Crypton says- ") && (autotext.contains("thank you") || autotext.contains("thanks") || autotext.contains("Thank You") || autotext.contains("Thank you") || autotext.contains("Thanks") || autotext.contains("THANK YOU") || autotext.contains("THANKS")) && bot == 1 && (t >= 20 || t < 3)) {
 
                     autotext = "";
                     try {
-                        addChat(a+"\\"+"Crypton says- Welcome");
+                        addChat(a + "\\" + "Crypton says- Welcome");
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
@@ -480,51 +467,46 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.chat_menu,menu);
+        getMenuInflater().inflate(R.menu.chat_menu, menu);
         return true;
     }
 
     @Override
     protected boolean onPrepareOptionsPanel(View view, Menu menu) {
-        MenuItem item=menu.findItem(R.id.item6);
-        if(blocks.contains(fname))
-        {
+        MenuItem item = menu.findItem(R.id.item6);
+        if (blocks.contains(fname)) {
             item.setTitle("Unblock");
-        }
-        else {
+        } else {
             item.setTitle("Block");
         }
         return true;
     }
 
     public boolean check(String t) throws IOException {
-        FileInputStream fis=null;
-        fis=openFileInput(fname);
-        InputStreamReader isr=new InputStreamReader(fis);
-        BufferedReader br=new BufferedReader(isr);
+        FileInputStream fis = null;
+        fis = openFileInput(fname);
+        InputStreamReader isr = new InputStreamReader(fis);
+        BufferedReader br = new BufferedReader(isr);
         String text;
-        while((text=br.readLine())!=null){
-            if(t.equals(text))
+        while ((text = br.readLine()) != null) {
+            if (t.equals(text))
                 return true;
         }
         return false;
     }
 
 
-
     public void addChat(String n) throws IOException {
         String currentDate = new SimpleDateFormat("dd-MM-yyyy", Locale.getDefault()).format(new Date());
         String currentTime = new SimpleDateFormat("hh:mm aa", Locale.getDefault()).format(new Date());
         //String currentTime2 = new SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(new Date());
-        if(n.contains("^BLOCK^")) {
+        if (n.contains("^BLOCK^")) {
             User b = new User("Block");
-            db.child(a+"\\"+"BLOCK").setValue(b);
-        }
-        else if(n.contains("^UNBLOCK^")){
-            User b= new User("Unblock");
-            db.child(a+"\\"+"BLOCK").setValue(b);
-        }
-        else {
+            db.child(a + "\\" + "BLOCK").setValue(b);
+        } else if (n.contains("^UNBLOCK^")) {
+            User b = new User("Unblock");
+            db.child(a + "\\" + "BLOCK").setValue(b);
+        } else {
             n = n + "$" + currentDate + "#" + currentTime;
             User u = new User(n);
             db.push().setValue(u);
@@ -558,9 +540,9 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
             if (z.contains("...R\\")) {
                 View v = inflater.inflate(R.layout.right_chat_reply, null);
                 TextView tvt = v.findViewById(R.id.message);
-                TextView tvtv=v.findViewById(R.id.remessage);
-                tvtv.setText(z.substring(0,z.indexOf("R\\")));
-                z=z.substring(z.indexOf("R\\")+2);
+                TextView tvtv = v.findViewById(R.id.remessage);
+                tvtv.setText(z.substring(0, z.indexOf("R\\")));
+                z = z.substring(z.indexOf("R\\") + 2);
                 if (z.indexOf('$') > -1) {
                     String p;
                     p = z.substring(0, z.indexOf('$')) + "    " + z.substring(z.indexOf('#') + 1);
@@ -600,7 +582,7 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
                 while ((p1 = br.readLine()) != null) {
                     last.add(p1);
                 }
-            }catch (Exception e) {
+            } catch (Exception e) {
             }
             FileOutputStream fos2 = openFileOutput(lastChat, MODE_PRIVATE);
             String p1 = fname;
@@ -615,34 +597,33 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
     @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     @Override
     public void onBackPressed() {
-        if(re.getVisibility()==View.VISIBLE){
+        if (re.getVisibility() == View.VISIBLE) {
             re.setText("");
             re.setVisibility(View.INVISIBLE);
             return;
         }
 
         finishAndRemoveTask();
-        f=1;
-        activityOnline=0;
-        startActivity(new Intent(getApplicationContext(),ChatBox.class));
+        f = 1;
+        activityOnline = 0;
+        startActivity(new Intent(getApplicationContext(), ChatBox.class));
     }
 
     @Override
     public void onClick(View v) {
-        if(v==b)
-        {
-            if(blocks.contains(fname)){
+        if (v == b) {
+            if (blocks.contains(fname)) {
                 Toast.makeText(getApplicationContext(), "Please unblock at first", Toast.LENGTH_SHORT).show();
                 return;
             }
-            if(fl==1) {
+            if (fl == 1) {
                 String n = text.getText().toString();
-                String nre=re.getText().toString();
+                String nre = re.getText().toString();
                 if (n.length() == 0) {
                     Toast.makeText(getApplicationContext(), "Message cannot be blank", Toast.LENGTH_SHORT).show();
                     return;
                 }
-                if(re.getVisibility()==View.INVISIBLE) {
+                if (re.getVisibility() == View.INVISIBLE) {
                     text.setText("");
                     text.setHint("Type your message");
                     try {
@@ -650,42 +631,39 @@ public void onClick(View v) {
                     } catch (IOException e) {
 
                     }
-                }
-                else{
-                    nre=nre.substring(0,nre.indexOf("\n\n"));
+                } else {
+                    nre = nre.substring(0, nre.indexOf("\n\n"));
                     text.setText("");
                     text.setHint("Type your message");
                     re.setText("\n");
                     re.setVisibility(View.INVISIBLE);
-                    while(n.length()<36 && nre.length()>n.length())
-                        n=n+" ";
-                try {
+                    while (n.length() < 36 && nre.length() > n.length())
+                        n = n + " ";
+                    try {
                         addChat(a + "\\" + nre + "R\\" + n);
                     } catch (IOException e) {
 
                     }
                 }
-            }
-            else
-            {
-                Toast.makeText(getApplicationContext(),"Chat is Blocked",Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(getApplicationContext(), "Chat is Blocked", Toast.LENGTH_SHORT).show();
             }
         }
     }
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()){
+        switch (item.getItemId()) {
             case R.id.item4:
-                Intent intent=new Intent(getApplicationContext(),ProfilePerson.class);
-                intent.putExtra("Email",p);
+                Intent intent = new Intent(getApplicationContext(), ProfilePerson.class);
+                intent.putExtra("Email", p);
                 finish();
                 startActivity(intent);
                 return true;
             case R.id.item5:
                 /*Snackbar.make(findViewById(R.id.scrollView2), "Delete Chats will be available in next Update", Snackbar.LENGTH_LONG)
                         .setAction("Action", null).show();*/
-                AlertDialog.Builder alt=new AlertDialog.Builder(this);
+                AlertDialog.Builder alt = new AlertDialog.Builder(this);
                 alt.setTitle("Warning!")
                         .setCancelable(false)
                         .setMessage("Are you sure you want to clear the chats from your phone? If you want to delete your unread chats for everyone,cancel this, go to home page and long press on the chat.")
@@ -693,10 +671,10 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 try {
-                                    final FileOutputStream fos=openFileOutput(fname,MODE_PRIVATE);
+                                    final FileOutputStream fos = openFileOutput(fname, MODE_PRIVATE);
                                     fos.write("".getBytes());
                                     t.removeAllViews();
-                                    Toast.makeText(getApplicationContext(),"Chats deleted",Toast.LENGTH_SHORT).show();
+                                    Toast.makeText(getApplicationContext(), "Chats deleted", Toast.LENGTH_SHORT).show();
                                 } catch (IOException e) {
 
                                 }
@@ -708,11 +686,11 @@ public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
                             }
                         });
-                AlertDialog aaa=alt.create();
+                AlertDialog aaa = alt.create();
                 aaa.show();
 
                 try {
-                    chatbase(a,p);
+                    chatbase(a, p);
                 } catch (IOException e) {
 
                 }
@@ -754,40 +732,39 @@ else if(bl==0)
                     item.setTitle("Block");
 
                  */
-                if(item.getTitle().equals("Block")){
+                if (item.getTitle().equals("Block")) {
                     blocks.add(fname);
-                    String gg="";
+                    String gg = "";
                     try {
-                        FileOutputStream fos=openFileOutput(fblock,MODE_PRIVATE);
-                        for(String blocklist:blocks){
-                            gg=gg+blocklist+"\n";
+                        FileOutputStream fos = openFileOutput(fblock, MODE_PRIVATE);
+                        for (String blocklist : blocks) {
+                            gg = gg + blocklist + "\n";
                         }
                         fos.write(gg.getBytes());
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
-                    Toast.makeText(getApplicationContext(),"Blocked",Toast.LENGTH_SHORT).show();
-                    activityOnline=0;
+                    Toast.makeText(getApplicationContext(), "Blocked", Toast.LENGTH_SHORT).show();
+                    activityOnline = 0;
                     finish();
-                    startActivity(new Intent(getApplicationContext(),ChatBox.class));
+                    startActivity(new Intent(getApplicationContext(), ChatBox.class));
 
-                }
-                else if(item.getTitle().equals("Unblock")){
+                } else if (item.getTitle().equals("Unblock")) {
                     blocks.remove(fname);
-                    String gg="";
+                    String gg = "";
                     try {
-                        FileOutputStream fos=openFileOutput(fblock,MODE_PRIVATE);
-                        for(String blocklist:blocks){
-                            gg=gg+blocklist+"\n";
+                        FileOutputStream fos = openFileOutput(fblock, MODE_PRIVATE);
+                        for (String blocklist : blocks) {
+                            gg = gg + blocklist + "\n";
                         }
                         fos.write(gg.getBytes());
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
-                    Toast.makeText(getApplicationContext(),"Unblocked",Toast.LENGTH_SHORT).show();
-                    activityOnline=0;
+                    Toast.makeText(getApplicationContext(), "Unblocked", Toast.LENGTH_SHORT).show();
+                    activityOnline = 0;
                     finish();
-                    startActivity(new Intent(getApplicationContext(),ChatBox.class));
+                    startActivity(new Intent(getApplicationContext(), ChatBox.class));
 
                 }
                 return true;
diff --git a/app/src/main/java/com/example/chat/Default.java b/app/src/main/java/com/example/chat/Default.java
index 3b6d85b..f3ee1eb 100644
--- a/app/src/main/java/com/example/chat/Default.java
+++ b/app/src/main/java/com/example/chat/Default.java
@@ -1,8 +1,5 @@
 package com.example.chat;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
 import android.media.MediaPlayer;
 import android.os.Build;
@@ -10,6 +7,9 @@
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
@@ -26,17 +26,18 @@ public class Default extends AppCompatActivity {
     FirebaseAuth auth;
     DatabaseReference db;
     String a;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_default);
         getSupportActionBar().hide();
         try {
-            auth=FirebaseAuth.getInstance();
-            a=auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-            if(a.contains("."))
-                a=a.replace('.','!');
-            db=FirebaseDatabase.getInstance().getReference().child("Users").child(a);
+            auth = FirebaseAuth.getInstance();
+            a = auth.getCurrentUser().getEmail().substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+            if (a.contains("."))
+                a = a.replace('.', '!');
+            db = FirebaseDatabase.getInstance().getReference().child("Users").child(a);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 Window window = getWindow();
                 window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
@@ -45,9 +46,9 @@ protected void onCreate(Bundle savedInstanceState) {
             db.addValueEventListener(new ValueEventListener() {
                 @Override
                 public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                    Details d=dataSnapshot.getValue(Details.class);
-                    if(d.soundEffect==1){
-                        MediaPlayer ring= MediaPlayer.create(getApplicationContext(),R.raw.home);
+                    Details d = dataSnapshot.getValue(Details.class);
+                    if (d.soundEffect == 1) {
+                        MediaPlayer ring = MediaPlayer.create(getApplicationContext(), R.raw.home);
                         ring.start();
                     }
                 }
@@ -58,9 +59,9 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
                 }
             });
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
-        timer=new Timer();
+        timer = new Timer();
         timer.schedule(new TimerTask() {
             @Override
             public void run() {
@@ -68,6 +69,6 @@ public void run() {
                 startActivity(i);
                 Default.this.finish();
             }
-        },2000);
+        }, 2000);
     }
 }
diff --git a/app/src/main/java/com/example/chat/Edit.java b/app/src/main/java/com/example/chat/Edit.java
index 089a850..bf62214 100644
--- a/app/src/main/java/com/example/chat/Edit.java
+++ b/app/src/main/java/com/example/chat/Edit.java
@@ -1,7 +1,6 @@
 package com.example.chat;
 
 import android.app.ProgressDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -14,7 +13,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.bumptech.glide.Glide;
@@ -32,62 +30,61 @@
 import com.google.firebase.storage.StorageReference;
 import com.google.firebase.storage.UploadTask;
 
-public class Edit extends AppCompatActivity implements View.OnClickListener{
+public class Edit extends AppCompatActivity implements View.OnClickListener {
     TextView t;
-    EditText u,s;
+    EditText u, s;
     DatabaseReference db;
     FirebaseAuth auth;
     Button b;
     private StorageReference mStorageRef;
-    public static final int PICK_IMAGE=1;
+    public static final int PICK_IMAGE = 1;
     private Uri imageuri;
     ImageView profile;
     String durl;
     ProgressDialog progress;
-    String name,status,domain;
+    String name, status, domain;
     TextView res;
-    int sound,chatbot;
+    int sound, chatbot;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_info);
-        t=findViewById(R.id.textView4);
-        u=findViewById(R.id.name);
-        s=findViewById(R.id.status);
-        b=findViewById(R.id.save);
-        res=findViewById(R.id.resetPass);
+        t = findViewById(R.id.textView4);
+        u = findViewById(R.id.name);
+        s = findViewById(R.id.status);
+        b = findViewById(R.id.save);
+        res = findViewById(R.id.resetPass);
         res.setVisibility(View.VISIBLE);
         res.setOnClickListener(this);
         b.setOnClickListener(this);
-        profile=findViewById(R.id.profilepic);
-        progress=new ProgressDialog(this);
+        profile = findViewById(R.id.profilepic);
+        progress = new ProgressDialog(this);
         mStorageRef = FirebaseStorage.getInstance().getReference();
         t.setText("Edit Your Details");
-        imageuri=null;
-        auth=FirebaseAuth.getInstance();
-        domain=auth.getCurrentUser().getEmail().substring(auth.getCurrentUser().getEmail().indexOf('@'));
-        db= FirebaseDatabase.getInstance().getReference().child("Users");
+        imageuri = null;
+        auth = FirebaseAuth.getInstance();
+        domain = auth.getCurrentUser().getEmail().substring(auth.getCurrentUser().getEmail().indexOf('@'));
+        db = FirebaseDatabase.getInstance().getReference().child("Users");
         db.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                 progress.setMessage("Loading...");
                 progress.show();
-                for(DataSnapshot d:dataSnapshot.getChildren()) {
-                    Details det=d.getValue(Details.class);
-                    String z1=auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-                    if(z1.contains("."))
-                    {
-                        z1=z1.replace('.','!');
+                for (DataSnapshot d : dataSnapshot.getChildren()) {
+                    Details det = d.getValue(Details.class);
+                    String z1 = auth.getCurrentUser().getEmail().substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+                    if (z1.contains(".")) {
+                        z1 = z1.replace('.', '!');
                     }
-                    if(d.getKey().equals(z1))
-                    {
+                    if (d.getKey().equals(z1)) {
                         u.setText(det.n);
                         s.setText(det.s);
-                        sound=det.soundEffect;
-                        chatbot=det.chatbot;
+                        sound = det.soundEffect;
+                        chatbot = det.chatbot;
                         Glide.with(getApplicationContext()).load(det.l).into(profile);
                         progress.dismiss();
-                        durl=det.l;
+                        durl = det.l;
                         break;
                     }
                 }
@@ -103,46 +100,41 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
 
     @Override
     public void onClick(View v) {
-        if(v==b) {
-            name=u.getText().toString();
-            status=s.getText().toString();
-            if(name.equals(""))
-            {
+        if (v == b) {
+            name = u.getText().toString();
+            status = s.getText().toString();
+            if (name.equals("")) {
                 Toast.makeText(getApplicationContext(), "Name cannot be blank", Toast.LENGTH_SHORT).show();
                 return;
             }
-            if(status.equals(""))
-            {
+            if (status.equals("")) {
                 Toast.makeText(getApplicationContext(), "Status cannot be blank", Toast.LENGTH_SHORT).show();
                 return;
             }
-            if(name.contains("!") || name.contains("@") || name.contains("#") || name.contains("$") || name.contains("%") || name.contains("^") || name.contains("&") || name.contains("(") || name.contains(")") || name.contains("*"))
-            {
+            if (name.contains("!") || name.contains("@") || name.contains("#") || name.contains("$") || name.contains("%") || name.contains("^") || name.contains("&") || name.contains("(") || name.contains(")") || name.contains("*")) {
                 Toast.makeText(getApplicationContext(), "Name cannot contain special characters '!','@','#','%','^','&','*','(' and ')'", Toast.LENGTH_SHORT).show();
                 return;
             }
             storeimage();
         }
-        if(v==profile){
+        if (v == profile) {
             Intent intent = new Intent();
             intent.setType("image/*");
             intent.setAction(Intent.ACTION_GET_CONTENT);
-            startActivityForResult(Intent.createChooser(intent,"Select a picture"),PICK_IMAGE);
+            startActivityForResult(Intent.createChooser(intent, "Select a picture"), PICK_IMAGE);
         }
-        if(v==res){
+        if (v == res) {
             res.setVisibility(View.INVISIBLE);
-            String forgetPasswordEmail=auth.getCurrentUser().getEmail().toString();
+            String forgetPasswordEmail = auth.getCurrentUser().getEmail().toString();
             auth.sendPasswordResetEmail(forgetPasswordEmail)
                     .addOnCompleteListener(new OnCompleteListener<Void>() {
                         @Override
                         public void onComplete(@NonNull Task<Void> task) {
-                            if(task.isSuccessful())
-                            {
-                                Toast.makeText(getApplicationContext(),"Reset Password link sent to your email.",Toast.LENGTH_SHORT).show();
-                            }
-                            else{
+                            if (task.isSuccessful()) {
+                                Toast.makeText(getApplicationContext(), "Reset Password link sent to your email.", Toast.LENGTH_SHORT).show();
+                            } else {
                                 res.setVisibility(View.VISIBLE);
-                                Toast.makeText(getApplicationContext(),task.getException().getMessage(),Toast.LENGTH_SHORT).show();
+                                Toast.makeText(getApplicationContext(), task.getException().getMessage(), Toast.LENGTH_SHORT).show();
                             }
 
                         }
@@ -150,17 +142,15 @@ public void onComplete(@NonNull Task<Void> task) {
         }
     }
 
-    public void storeimage()
-    {
+    public void storeimage() {
         try {
             if (imageuri != null) {
-                String z1=auth.getCurrentUser().getEmail()
-                        .substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-                if(z1.contains("."))
-                {
-                    z1=z1.replace('.','!');
+                String z1 = auth.getCurrentUser().getEmail()
+                        .substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+                if (z1.contains(".")) {
+                    z1 = z1.replace('.', '!');
                 }
-                final StorageReference user_profile = mStorageRef.child( z1+".jpg");
+                final StorageReference user_profile = mStorageRef.child(z1 + ".jpg");
                 progress.setTitle("Uploading...");
                 progress.show();
                 progress.setCancelable(false);
@@ -176,15 +166,15 @@ public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
                                     public void onSuccess(Uri uri) {
 
                                         String img_url = uri.toString();// to store url of the image
-                                        Details d=new Details(name,status,img_url,domain,sound,chatbot);
-                                        String z2=auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-                                        if(z2.contains("."))
-                                            z2=z2.replace('.','!');
+                                        Details d = new Details(name, status, img_url, domain, sound, chatbot);
+                                        String z2 = auth.getCurrentUser().getEmail().substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+                                        if (z2.contains("."))
+                                            z2 = z2.replace('.', '!');
                                         db.child(z2).setValue(d);
-                                        Toast.makeText(getApplicationContext(),"Details Saved",Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(getApplicationContext(), "Details Saved", Toast.LENGTH_SHORT).show();
                                         progress.dismiss();
                                         finish();
-                                        startActivity(new Intent(getApplicationContext(),Login.class));
+                                        startActivity(new Intent(getApplicationContext(), Login.class));
 
                                     }
                                 });
@@ -193,21 +183,20 @@ public void onSuccess(Uri uri) {
                         .addOnProgressListener(new OnProgressListener<UploadTask.TaskSnapshot>() {
                             @Override
                             public void onProgress(@NonNull UploadTask.TaskSnapshot taskSnapshot) {
-                                progress.setMessage((int)(100*taskSnapshot.getBytesTransferred()/taskSnapshot.getTotalByteCount())+ " % Completed");
+                                progress.setMessage((int) (100 * taskSnapshot.getBytesTransferred() / taskSnapshot.getTotalByteCount()) + " % Completed");
                             }
                         });
             } else {
-                Details d=new Details(name,status,durl,domain,sound,chatbot);
-                String z2=auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-                if(z2.contains("."))
-                    z2=z2.replace('.','!');
+                Details d = new Details(name, status, durl, domain, sound, chatbot);
+                String z2 = auth.getCurrentUser().getEmail().substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+                if (z2.contains("."))
+                    z2 = z2.replace('.', '!');
                 db.child(z2).setValue(d);
-                Toast.makeText(getApplicationContext(),"Details Saved",Toast.LENGTH_SHORT).show();
+                Toast.makeText(getApplicationContext(), "Details Saved", Toast.LENGTH_SHORT).show();
                 finish();
-                startActivity(new Intent(getApplicationContext(),Login.class));
+                startActivity(new Intent(getApplicationContext(), Login.class));
             }
-        }catch (Exception e)
-        {
+        } catch (Exception e) {
             Toast.makeText(getBaseContext(), e.getMessage(), Toast.LENGTH_LONG).show();
         }
     }
@@ -215,17 +204,18 @@ public void onProgress(@NonNull UploadTask.TaskSnapshot taskSnapshot) {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode==PICK_IMAGE && resultCode == RESULT_OK){
+        if (requestCode == PICK_IMAGE && resultCode == RESULT_OK) {
             try {
-                imageuri=data.getData();
+                imageuri = data.getData();
                 profile.setImageURI(imageuri);
-            } catch (Exception e) {}
+            } catch (Exception e) {
+            }
         }
     }
 
     @Override
     public void onBackPressed() {
         finish();
-        startActivity(new Intent(getApplicationContext(),ChatBox.class));
+        startActivity(new Intent(getApplicationContext(), ChatBox.class));
     }
 }
diff --git a/app/src/main/java/com/example/chat/Home.java b/app/src/main/java/com/example/chat/Home.java
index cddaa99..c18923b 100644
--- a/app/src/main/java/com/example/chat/Home.java
+++ b/app/src/main/java/com/example/chat/Home.java
@@ -1,45 +1,47 @@
 package com.example.chat;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.google.firebase.auth.FirebaseAuth;
 
+import java.util.Objects;
+
 public class Home extends AppCompatActivity {
 
     Button l;
     TextView tv;
     FirebaseAuth auth;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
-        getSupportActionBar().hide();
-        auth=FirebaseAuth.getInstance();
-        if(auth.getCurrentUser()!=null)
-        {
+        Objects.requireNonNull(getSupportActionBar()).hide();
+        auth = FirebaseAuth.getInstance();
+        if (auth.getCurrentUser() != null) {
             finish();
-            startActivity(new Intent(getApplicationContext(),ChatBox.class));
+            startActivity(new Intent(getApplicationContext(), ChatBox.class));
         }
-        l=findViewById(R.id.login);
-        tv=findViewById(R.id.textView5);
+        l = findViewById(R.id.login);
+        tv = findViewById(R.id.textView5);
         l.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
-                startActivity(new Intent(getApplicationContext(),Login.class));
+                startActivity(new Intent(getApplicationContext(), Login.class));
             }
         });
         tv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
-                startActivity(new Intent(getApplicationContext(),Registration.class));
+                startActivity(new Intent(getApplicationContext(), Registration.class));
             }
         });
     }
diff --git a/app/src/main/java/com/example/chat/Info.java b/app/src/main/java/com/example/chat/Info.java
index b3e8ed2..5eff675 100644
--- a/app/src/main/java/com/example/chat/Info.java
+++ b/app/src/main/java/com/example/chat/Info.java
@@ -1,10 +1,5 @@
 package com.example.chat;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -14,13 +9,15 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.bumptech.glide.Glide;
-import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnSuccessListener;
-import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
@@ -30,88 +27,86 @@
 import com.google.firebase.storage.UploadTask;
 
 public class Info extends AppCompatActivity implements View.OnClickListener {
-    EditText n,s;
+    EditText n, s;
     FirebaseAuth auth;
     Button bt;
     DatabaseReference db;
-    String name,status;
+    String name, status;
     private ImageView profile;
     private StorageReference mStorageRef;
-    public static final int PICK_IMAGE=1;
+    public static final int PICK_IMAGE = 1;
     private Uri imageuri;
     String domain;
     ProgressDialog progress;
     String z1;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_info);
-        auth=FirebaseAuth.getInstance();
-        domain=auth.getCurrentUser().getEmail().substring(auth.getCurrentUser().getEmail().indexOf('@'));
-        n=findViewById(R.id.name);
-        s=findViewById(R.id.status);
-        z1=auth.getCurrentUser().getEmail().substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-        if(z1.contains("."))
-        {
-            z1=z1.replace('.','!');
+        auth = FirebaseAuth.getInstance();
+        domain = auth.getCurrentUser().getEmail().substring(auth.getCurrentUser().getEmail().indexOf('@'));
+        n = findViewById(R.id.name);
+        s = findViewById(R.id.status);
+        z1 = auth.getCurrentUser().getEmail().substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+        if (z1.contains(".")) {
+            z1 = z1.replace('.', '!');
         }
-        db= FirebaseDatabase.getInstance().getReference().child("Users")
+        db = FirebaseDatabase.getInstance().getReference().child("Users")
                 .child(z1);
-        bt=findViewById(R.id.save);
+        bt = findViewById(R.id.save);
         bt.setOnClickListener(this);
         mStorageRef = FirebaseStorage.getInstance().getReference();
-        profile=findViewById(R.id.profilepic);
-        imageuri=null;
-        progress=new ProgressDialog(this);
+        profile = findViewById(R.id.profilepic);
+        imageuri = null;
+        progress = new ProgressDialog(this);
         Glide.with(getApplicationContext()).load("https://firebasestorage.googleapis.com/v0/b/chat-87dc0.appspot.com/o/default_pic.png?alt=media&token=0319c156-031c-4b07-9a0c-27ebecdd34d1").into(profile);
         profile.setOnClickListener(this);
     }
 
     @Override
     public void onClick(View v) {
-        if(v==bt)
-        {
-            name=n.getText().toString();
-            status=s.getText().toString();
-            if(name.equals(""))
-            {
+        if (v == bt) {
+            name = n.getText().toString();
+            status = s.getText().toString();
+            if (name.equals("")) {
                 Toast.makeText(getApplicationContext(), "Name cannot be blank", Toast.LENGTH_SHORT).show();
                 return;
             }
-            if(status.equals(""))
-            {
+            if (status.equals("")) {
                 Toast.makeText(getApplicationContext(), "Status cannot be blank", Toast.LENGTH_SHORT).show();
                 return;
             }
-            if(name.contains("!") || name.contains("@") || name.contains("#") || name.contains("$") || name.contains("%") || name.contains("^") || name.contains("&") || name.contains("(") || name.contains(")") || name.contains("*"))
-            {
+            if (name.contains("!") || name.contains("@") || name.contains("#") || name.contains("$") || name.contains("%") || name.contains("^") || name.contains("&") || name.contains("(") || name.contains(")") || name.contains("*")) {
                 Toast.makeText(getApplicationContext(), "Name cannot contain special characters '!','@','#','%','^','&','*','(' and ')'", Toast.LENGTH_SHORT).show();
                 return;
             }
             storeimage();
         }
-        if(v==profile){
+        if (v == profile) {
             Intent intent = new Intent();
             intent.setType("image/*");
             intent.setAction(Intent.ACTION_GET_CONTENT);
-            startActivityForResult(Intent.createChooser(intent,"Select a picture"),PICK_IMAGE);
+            startActivityForResult(Intent.createChooser(intent, "Select a picture"), PICK_IMAGE);
         }
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode==PICK_IMAGE && resultCode == RESULT_OK){
+        if (requestCode == PICK_IMAGE && resultCode == RESULT_OK) {
             try {
-                imageuri=data.getData();
+                imageuri = data.getData();
                 profile.setImageURI(imageuri);
-            } catch (Exception e) {}
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 
     @Override
     public void onBackPressed() {
-        AlertDialog.Builder alt=new AlertDialog.Builder(this);
+        AlertDialog.Builder alt = new AlertDialog.Builder(this);
         alt.setTitle("Warning!")
                 .setCancelable(false)
                 .setMessage("Please fill in the details and save to proceed.")
@@ -121,17 +116,18 @@ public void onClick(DialogInterface dialog, int which) {
                         dialog.dismiss();
                     }
                 });
-        AlertDialog a=alt.create();
+        AlertDialog a = alt.create();
         a.show();
     }
+
     void storeimage() {     //To store the pic
         try {
             if (imageuri != null) {
-                String z2=auth.getCurrentUser().getEmail()
-                        .substring(0,auth.getCurrentUser().getEmail().indexOf('@'));
-                if(z2.contains("."))
-                    z2=z2.replace('.','!');
-                final StorageReference user_profile = mStorageRef.child(z2+".jpg");
+                String z2 = auth.getCurrentUser().getEmail()
+                        .substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
+                if (z2.contains("."))
+                    z2 = z2.replace('.', '!');
+                final StorageReference user_profile = mStorageRef.child(z2 + ".jpg");
                 progress.setTitle("Uploading...");
                 progress.show();
                 progress.setCancelable(false);
@@ -147,12 +143,12 @@ public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
                                     public void onSuccess(Uri uri) {
 
                                         String img_url = uri.toString();// to store url of the image
-                                        Details d=new Details(name,status,img_url,domain,1,0);
+                                        Details d = new Details(name, status, img_url, domain, 1, 0);
                                         db.setValue(d);
-                                        Toast.makeText(getApplicationContext(),"Details Saved",Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(getApplicationContext(), "Details Saved", Toast.LENGTH_SHORT).show();
                                         progress.dismiss();
                                         finish();
-                                        startActivity(new Intent(getApplicationContext(),Login.class));
+                                        startActivity(new Intent(getApplicationContext(), Login.class));
 
                                     }
                                 });
@@ -161,7 +157,7 @@ public void onSuccess(Uri uri) {
                         .addOnProgressListener(new OnProgressListener<UploadTask.TaskSnapshot>() {
                             @Override
                             public void onProgress(@NonNull UploadTask.TaskSnapshot taskSnapshot) {
-                                progress.setMessage((int)(100*taskSnapshot.getBytesTransferred()/taskSnapshot.getTotalByteCount())+ " % Completed");
+                                progress.setMessage((int) (100 * taskSnapshot.getBytesTransferred() / taskSnapshot.getTotalByteCount()) + " % Completed");
                             }
                         });
             } else {
@@ -179,12 +175,12 @@ public void onClick(DialogInterface dialog, int which) {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 dialog.dismiss();
-                                String img_url="https://firebasestorage.googleapis.com/v0/b/chat-87dc0.appspot.com/o/default_pic.png?alt=media&token=0319c156-031c-4b07-9a0c-27ebecdd34d1";
-                                Details d=new Details(name,status,img_url,domain,1,0);
+                                String img_url = "https://firebasestorage.googleapis.com/v0/b/chat-87dc0.appspot.com/o/default_pic.png?alt=media&token=0319c156-031c-4b07-9a0c-27ebecdd34d1";
+                                Details d = new Details(name, status, img_url, domain, 1, 0);
                                 db.setValue(d);
-                                Toast.makeText(getApplicationContext(),"Details Saved",Toast.LENGTH_SHORT).show();
+                                Toast.makeText(getApplicationContext(), "Details Saved", Toast.LENGTH_SHORT).show();
                                 finish();
-                                startActivity(new Intent(getApplicationContext(),Login.class));
+                                startActivity(new Intent(getApplicationContext(), Login.class));
                             }
                         });
 
@@ -192,8 +188,7 @@ public void onClick(DialogInterface dialog, int which) {
                 a1.show();
 
             }
-        }catch (Exception e)
-        {
+        } catch (Exception e) {
             Toast.makeText(getBaseContext(), e.getMessage(), Toast.LENGTH_LONG).show();
         }
     }
diff --git a/app/src/main/java/com/example/chat/LoadingDialog.java b/app/src/main/java/com/example/chat/LoadingDialog.java
index d85e4a3..a3f2777 100644
--- a/app/src/main/java/com/example/chat/LoadingDialog.java
+++ b/app/src/main/java/com/example/chat/LoadingDialog.java
@@ -1,5 +1,6 @@
 package com.example.chat;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.view.LayoutInflater;
@@ -12,6 +13,7 @@ public class LoadingDialog
     LoadingDialog(Activity myActivity){
         activity=myActivity;
     }
+    @SuppressLint("InflateParams")
     void startLoadingDialog(){
         AlertDialog.Builder builder=new AlertDialog.Builder(activity);
         LayoutInflater inflater=activity.getLayoutInflater();
diff --git a/app/src/main/java/com/example/chat/MorePeople.java b/app/src/main/java/com/example/chat/MorePeople.java
index 80dd89b..4773eef 100644
--- a/app/src/main/java/com/example/chat/MorePeople.java
+++ b/app/src/main/java/com/example/chat/MorePeople.java
@@ -1,15 +1,11 @@
 package com.example.chat;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.SpannableString;
-import android.text.style.BackgroundColorSpan;
 import android.text.style.ForegroundColorSpan;
 import android.view.Display;
 import android.view.LayoutInflater;
@@ -22,6 +18,9 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.bumptech.glide.Glide;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.firebase.auth.FirebaseAuth;
@@ -31,25 +30,22 @@
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
 import de.hdodenhof.circleimageview.CircleImageView;
 
 public class MorePeople extends AppCompatActivity {
 
     FirebaseAuth auth;
-    DatabaseReference db,df,dl;
+    DatabaseReference db, df, dl;
     private TableLayout t;
     String u;
-    int c=100;
+    int c = 100;
     Display display;
-    LoadingDialog loadingDialog=new LoadingDialog(MorePeople.this);
+    LoadingDialog loadingDialog = new LoadingDialog(MorePeople.this);
     ScrollView scr;
-    int fl=0;
+    int fl = 0;
     Details details;
     FloatingActionButton flab;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -62,12 +58,13 @@ protected void onCreate(Bundle savedInstanceState) {
         dl = FirebaseDatabase.getInstance().getReference().child("Last");
         display = getWindowManager().getDefaultDisplay();
         scr = findViewById(R.id.full);
-        flab=findViewById(R.id.fab);
+        flab = findViewById(R.id.fab);
         flab.setVisibility(View.INVISIBLE);
         start();
     }
-    public void start(){
-        fl=0;
+
+    public void start() {
+        fl = 0;
         try {
             loadingDialog.startLoadingDialog();
             df.addValueEventListener(new ValueEventListener() {
@@ -75,11 +72,11 @@ public void start(){
                 public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                     t.removeAllViews();
                     scr.setBackgroundColor(Color.WHITE);
-                    fl=0;
-                    c=100;
-                    for(DataSnapshot d1 : dataSnapshot.getChildren())  {
-                        u=d1.getKey();
-                        details=d1.getValue(Details.class);
+                    fl = 0;
+                    c = 100;
+                    for (DataSnapshot d1 : dataSnapshot.getChildren()) {
+                        u = d1.getKey();
+                        details = d1.getValue(Details.class);
                         final TableRow tr = new TableRow(getApplicationContext());
                         tr.setLayoutParams(new TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT));
                         final Button b = new Button(getApplicationContext());
@@ -87,9 +84,8 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                         String zz = auth.getCurrentUser().getEmail().substring(0, auth.getCurrentUser().getEmail().indexOf('@'));
                         if (zz.contains("."))
                             zz = zz.replace('.', '!');
-                        if(!u.equals(zz))
-                        {
-                            getname(u,c);
+                        if (!u.equals(zz)) {
+                            getname(u, c);
                             Drawable bac = getApplicationContext().getResources().getDrawable(R.drawable.chatbox);
                             b.setBackground(bac);
                             b.setPadding(15, 5, 25000, 10);
@@ -110,50 +106,49 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                     } catch (Exception e) {
                     }
                 }
+
                 @Override
                 public void onCancelled(@NonNull DatabaseError databaseError) {
 
                 }
             });
         } catch (Exception e) {
-            Toast.makeText(getApplicationContext(),e.getMessage(), Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(), e.getMessage(), Toast.LENGTH_SHORT).show();
         }
     }
 
-    public void getname(final String n,final int t1)
-    {
+    public void getname(final String n, final int t1) {
         df.addValueEventListener(new ValueEventListener() {
             @Override
             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                for(DataSnapshot d1: dataSnapshot.getChildren()){
-                    Details u=d1.getValue(Details.class);
-                    if(n.equals(d1.getKey()))
-                    {
-                        CircleImageView civ=findViewById(100*t1);
+                for (DataSnapshot d1 : dataSnapshot.getChildren()) {
+                    Details u = d1.getValue(Details.class);
+                    if (n.equals(d1.getKey())) {
+                        CircleImageView civ = findViewById(100 * t1);
                         try {
                             Glide.with(getApplicationContext()).load(u.l).into(civ);
                         } catch (Exception e) {
                             start();
                         }
-                        Point size=new Point();
+                        Point size = new Point();
                         display.getSize(size);
-                        civ.getLayoutParams().height=size.x/7;
-                        civ.getLayoutParams().width=size.x/7;
+                        civ.getLayoutParams().height = size.x / 7;
+                        civ.getLayoutParams().width = size.x / 7;
                         civ.requestLayout();
                         civ.setLeft(5);
-                        civ.setPadding(8,8,8,8);
-                        Button b=findViewById(t1);
+                        civ.setPadding(8, 8, 8, 8);
+                        Button b = findViewById(t1);
                         b.setTextColor(Color.BLACK);
                         b.setTransformationMethod(null);
                         String n2;
-                        if(n.contains("!"))
-                            n2=n.replace('!','.');
+                        if (n.contains("!"))
+                            n2 = n.replace('!', '.');
                         else
-                            n2=n;
-                        String s1=u.n+"\t"+" (%"+"&"+"\n"+n2+u.d+") "+"\n"+u.s;
-                        SpannableString spannableString=new SpannableString(s1);
-                        spannableString.setSpan(new ForegroundColorSpan(Color.WHITE),s1.indexOf('('),s1.indexOf('&')+1,0);
-                        spannableString.setSpan(new ForegroundColorSpan(Color.WHITE),s1.indexOf(')'),s1.indexOf(')')+1,0);
+                            n2 = n;
+                        String s1 = u.n + "\t" + " (%" + "&" + "\n" + n2 + u.d + ") " + "\n" + u.s;
+                        SpannableString spannableString = new SpannableString(s1);
+                        spannableString.setSpan(new ForegroundColorSpan(Color.WHITE), s1.indexOf('('), s1.indexOf('&') + 1, 0);
+                        spannableString.setSpan(new ForegroundColorSpan(Color.WHITE), s1.indexOf(')'), s1.indexOf(')') + 1, 0);
                         b.setText(spannableString);
                         b.setLeft(10);
                         b.setTextSize(18);
@@ -168,58 +163,54 @@ public void onCancelled(@NonNull DatabaseError databaseError) {
         });
     }
 
-    public void getEmail(final String n)
-    {
-        Intent Int=new Intent(getApplicationContext(),Chats.class);
-        String p=n.substring(n.indexOf('\n')+1,n.indexOf(')'));
-        if(p.contains("."))
-            p=p.replace('.','!');
-        Int.putExtra("person",""+p+"&"+n.substring(0,n.indexOf('(')-1));
+    public void getEmail(final String n) {
+        Intent Int = new Intent(getApplicationContext(), Chats.class);
+        String p = n.substring(n.indexOf('\n') + 1, n.indexOf(')'));
+        if (p.contains("."))
+            p = p.replace('.', '!');
+        Int.putExtra("person", "" + p + "&" + n.substring(0, n.indexOf('(') - 1));
         startActivity(Int);
     }
-    public void checkClick()
-    {
-        for(int i=100;i<c;i++)
-        {
-            final Button b=scr.findViewById(i);
+
+    public void checkClick() {
+        for (int i = 100; i < c; i++) {
+            final Button b = scr.findViewById(i);
             b.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    getEmail(""+b.getText());
+                    getEmail("" + b.getText());
 
                 }
             });
         }
     }
 
-    public void checkImClick()
-    {
-        for(int i=100;i<c;i++)
-        {
-            final Button b=findViewById(i);
-            final CircleImageView civ=findViewById(100*i);
+    public void checkImClick() {
+        for (int i = 100; i < c; i++) {
+            final Button b = findViewById(i);
+            final CircleImageView civ = findViewById(100 * i);
             try {
                 civ.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        LayoutInflater inflater=getLayoutInflater();
-                        View view=inflater.inflate(R.layout.pic,null);
-                        TextView txt=view.findViewById(R.id.txt);
-                        final ImageView imv=view.findViewById(R.id.img);
-                        String n=b.getText().toString();
+                        LayoutInflater inflater = getLayoutInflater();
+                        View view = inflater.inflate(R.layout.pic, null);
+                        TextView txt = view.findViewById(R.id.txt);
+                        final ImageView imv = view.findViewById(R.id.img);
+                        String n = b.getText().toString();
                         scr.setBackgroundColor(Color.BLACK);
-                        fl=1;
-                        String file1=n.substring(n.indexOf('\n')+1,n.indexOf('@'));
-                        if(file1.contains("."))
-                            file1= file1.replace('.','!');
-                        final String file=file1;
-                        txt.setText(n.substring(0,n.indexOf('(')-1));
+                        fl = 1;
+                        String file1 = n.substring(n.indexOf('\n') + 1, n.indexOf('@'));
+                        if (file1.contains("."))
+                            file1 = file1.replace('.', '!');
+                        final String file = file1;
+                        txt.setText(n.substring(0, n.indexOf('(') - 1));
                         df.addValueEventListener(new ValueEventListener() {
                             @Override
                             public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
-                                for(DataSnapshot ds: dataSnapshot.getChildren()){
-                                    Details u1=ds.getValue(Details.class);
-                                    if(file.equals(ds.getKey()))
+                                for (DataSnapshot ds : dataSnapshot.getChildren()) {
+                                    Details u1 = ds.getValue(Details.class);
+                                    if (file.equals(ds.getKey()))
                                         Glide.with(getApplicationContext()).load(u1.l).into(imv);
                                 }
                             }
@@ -240,7 +231,7 @@ public void onClick(View v) {
                     }
                 });
             } catch (Exception e) {
-                Toast.makeText(getApplicationContext(),"Picture changed",Toast.LENGTH_SHORT).show();
+                Toast.makeText(getApplicationContext(), "Picture changed", Toast.LENGTH_SHORT).show();
                 start();
             }
 
@@ -249,12 +240,10 @@ public void onClick(View v) {
 
     @Override
     public void onBackPressed() {
-        if(fl==0){
+        if (fl == 0) {
             finish();
-            startActivity(new Intent(getApplicationContext(),ChatBox.class));
-        }
-        else if(fl==1)
-        {
+            startActivity(new Intent(getApplicationContext(), ChatBox.class));
+        } else if (fl == 1) {
             start();
         }
     }
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index cc27498..ac92345 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/aboutbackground"
+    tools:ignore="HardcodedText"
     tools:context=".About">
 
     <ImageView
@@ -16,7 +17,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
 
     <TextView
         android:id="@+id/textView8"
@@ -26,7 +28,7 @@
         android:padding="20dp"
         android:text="Chatable Application \nVersion: 0.2.2\n\u00A9 2020"
         android:textColor="#000000"
-        android:textSize="29dp"
+        android:textSize="29sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ImageView" />
@@ -39,7 +41,7 @@
         android:layout_marginTop="5dp"
         android:text="Developer Details: \n\nSubhopriyo Sadhukhan"
         android:textColor="#000000"
-        android:textSize="20dp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView8" />
 
@@ -53,7 +55,7 @@
         android:drawablePadding="10dp"
         android:text="+91 801-357-6138"
         android:textColor="#000000"
-        android:textSize="20dp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView9" />
 
@@ -67,7 +69,7 @@
         android:drawablePadding="10dp"
         android:text="subhopriyo153@gmail.com"
         android:textColor="#000000"
-        android:textSize="20dp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView10" />
 
@@ -79,7 +81,7 @@
         android:layout_marginTop="15dp"
         android:text="Write Feedback for this App."
         android:textColor="#0A1D8A"
-        android:textSize="17dp"
+        android:textSize="17sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView12" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_chat_box.xml b/app/src/main/res/layout/activity_chat_box.xml
index ec91826..d696414 100644
--- a/app/src/main/res/layout/activity_chat_box.xml
+++ b/app/src/main/res/layout/activity_chat_box.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ChatBox">
-
     <ScrollView
         android:id="@+id/full"
         android:paddingTop="10dp"
diff --git a/app/src/main/res/layout/activity_chatable_settings.xml b/app/src/main/res/layout/activity_chatable_settings.xml
index 111896f..4029ff6 100644
--- a/app/src/main/res/layout/activity_chatable_settings.xml
+++ b/app/src/main/res/layout/activity_chatable_settings.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ChatableSettings"
+    tools:ignore="HardcodedText"
     android:id="@+id/setting">
 
     <TextView
@@ -14,7 +15,7 @@
         android:padding="15dp"
         android:text="Sound Effects"
         android:textColor="#000000"
-        android:textSize="20dp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -61,7 +62,7 @@
         android:padding="15dp"
         android:text="Crypton"
         android:textColor="#000000"
-        android:textSize="20dp"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView14" />
 
diff --git a/app/src/main/res/layout/activity_chats.xml b/app/src/main/res/layout/activity_chats.xml
index 56b10f5..9bbf9b6 100644
--- a/app/src/main/res/layout/activity_chats.xml
+++ b/app/src/main/res/layout/activity_chats.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/back_chat"
+    tools:ignore="Autofill,HardcodedText,UnusedAttribute"
     tools:context=".Chats">
 
     <ScrollView
@@ -49,7 +49,8 @@
         android:paddingStart="20dp"
         android:paddingTop="5dp"
         android:paddingEnd="15dp"
-        android:paddingBottom="5dp" />
+        android:paddingBottom="5dp"
+         />
 
     <TextView
         android:id="@+id/reply"
@@ -66,7 +67,7 @@
         android:paddingTop="15dp"
         android:paddingBottom="50dp"
         android:text=""
-        android:textSize="15dp"
+        android:textSize="15sp"
         android:textStyle="bold" />
 
     <Button
diff --git a/app/src/main/res/layout/activity_default.xml b/app/src/main/res/layout/activity_default.xml
index 80843a4..768facc 100644
--- a/app/src/main/res/layout/activity_default.xml
+++ b/app/src/main/res/layout/activity_default.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 30f7447..df085e7 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Home"
+    tools:ignore="HardcodedText"
     android:background="@drawable/back_home">
 
     <Button
@@ -20,7 +21,8 @@
         app:layout_constraintHorizontal_bias="0.157"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.33" />
+        app:layout_constraintVertical_bias="0.33"
+         />
 
     <TextView
         android:id="@+id/textView5"
diff --git a/app/src/main/res/layout/activity_info.xml b/app/src/main/res/layout/activity_info.xml
index 1f7275c..25198d7 100644
--- a/app/src/main/res/layout/activity_info.xml
+++ b/app/src/main/res/layout/activity_info.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/back_login"
+    tools:ignore="HardcodedText"
     tools:context=".Info">
 
     <TextView
@@ -14,7 +15,7 @@
         android:layout_marginTop="16dp"
         android:text="Reset Password"
         android:textColor="#000000"
-        android:textSize="15dp"
+        android:textSize="15sp"
         android:visibility="invisible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.927"
@@ -38,7 +39,8 @@
         android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView6" />
+        app:layout_constraintTop_toBottomOf="@+id/textView6"
+        tools:ignore="Autofill" />
 
     <Button
         android:id="@+id/save"
@@ -75,7 +77,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.481"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/name" />
+        app:layout_constraintTop_toBottomOf="@+id/name"
+        tools:ignore="Autofill" />
 
     <TextView
         android:id="@+id/textView4"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 993930d..3b5abd5 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/back_login"
+    tools:ignore="HardcodedText,Autofill,RtlSymmetry"
     tools:context=".Login">
 
     <TextView
@@ -20,7 +21,8 @@
         app:layout_constraintHorizontal_bias="0.311"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintVertical_bias="0.0"
+         />
 
     <EditText
         android:id="@+id/editText"
@@ -36,7 +38,8 @@
         android:paddingStart="20dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2" />
+        app:layout_constraintTop_toBottomOf="@+id/textView2"
+      />
 
     <Button
         android:id="@+id/button"
@@ -91,7 +94,7 @@
         android:layout_height="45dp"
         android:layout_marginTop="34dp"
         android:text="Resend Verification Email"
-        android:textSize="18dp"
+        android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 76a4ce9..f056396 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Registration"
+    tools:ignore="HardcodedText,Autofill"
     android:background="@drawable/back_login">
 
     <TextView
@@ -19,7 +20,7 @@
         app:layout_constraintHorizontal_bias="0.289"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:textSize="35dp" />
+        tools:textSize="35sp" />
 
     <EditText
         android:id="@+id/editText"
@@ -36,7 +37,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.493"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2" />
+        app:layout_constraintTop_toBottomOf="@+id/textView2"
+        />
 
     <Button
         android:id="@+id/button"
diff --git a/app/src/main/res/layout/activity_profile_person.xml b/app/src/main/res/layout/activity_profile_person.xml
index 1665883..30a3055 100644
--- a/app/src/main/res/layout/activity_profile_person.xml
+++ b/app/src/main/res/layout/activity_profile_person.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:ignore="HardcodedText"
     tools:context=".ProfilePerson">
 
     <ImageView
@@ -15,7 +16,8 @@
         app:layout_constraintHorizontal_bias="0.437"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.053" />
+        app:layout_constraintVertical_bias="0.053"
+        tools:ignore="ContentDescription" />
 
     <TextView
         android:layout_width="match_parent"
@@ -30,7 +32,8 @@
         android:text="Name"
         android:textColor="#000000"
         android:id="@+id/name"
-        app:layout_constraintTop_toBottomOf="@+id/imageView" />
+        app:layout_constraintTop_toBottomOf="@+id/imageView"
+        />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/custom_dialog.xml b/app/src/main/res/layout/custom_dialog.xml
index 3f247f9..f3b150b 100644
--- a/app/src/main/res/layout/custom_dialog.xml
+++ b/app/src/main/res/layout/custom_dialog.xml
@@ -23,8 +23,9 @@
         android:layout_marginTop="25dp"
         android:text="Loading..."
         android:textColor="#000000"
-        android:textSize="25dp"
+        android:textSize="25sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressBar" />
+        app:layout_constraintTop_toBottomOf="@+id/progressBar"
+        tools:ignore="HardcodedText" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/left_chat.xml b/app/src/main/res/layout/left_chat.xml
index 09b865a..58c5453 100644
--- a/app/src/main/res/layout/left_chat.xml
+++ b/app/src/main/res/layout/left_chat.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:id="@+id/left">
     <RelativeLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true">
+        android:layout_alignParentStart="true"
+        tools:ignore="UselessParent">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -17,7 +19,8 @@
             android:layout_marginStart="10dp"
             android:padding="8dp"
             android:text="Hello"
-            android:background="@drawable/left_m"/>
+            android:background="@drawable/left_m"
+            tools:ignore="HardcodedText" />
 
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/left_chat_reply.xml b/app/src/main/res/layout/left_chat_reply.xml
index ddbbc92..09820c3 100644
--- a/app/src/main/res/layout/left_chat_reply.xml
+++ b/app/src/main/res/layout/left_chat_reply.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:id="@+id/left">
     <RelativeLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true">
+        android:layout_alignParentStart="true"
+        tools:ignore="UselessParent,HardcodedText">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -20,7 +22,7 @@
             android:background="@drawable/reply"
             android:layout_marginStart="10dp"
             android:layout_marginTop="5dp"
-            android:paddingStart="5dp"/>
+            />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -30,8 +32,7 @@
             android:layout_alignParentStart="true"
             android:textColor="#000000"
             android:layout_marginStart="10dp"
-            android:padding="8dp"
-            android:paddingEnd="12dp"
+            android:padding="10dp"
             android:text="Hello"
             android:background="@drawable/left_m"/>
 
diff --git a/app/src/main/res/layout/new_chat.xml b/app/src/main/res/layout/new_chat.xml
index 0a4ddeb..954dced 100644
--- a/app/src/main/res/layout/new_chat.xml
+++ b/app/src/main/res/layout/new_chat.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent" android:layout_height="match_parent"
     android:padding="20dp">
 
@@ -7,5 +8,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/people"
-        android:hint="Enter email ID"/>
+        android:hint="Enter email ID"
+        tools:ignore="Autofill,HardcodedText,TextFields" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pic.xml b/app/src/main/res/layout/pic.xml
index 27b8284..9e734a5 100644
--- a/app/src/main/res/layout/pic.xml
+++ b/app/src/main/res/layout/pic.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000">
+    android:background="#000000"
+    tools:ignore="ContentDescription">
 
     <ImageView
         android:id="@+id/img"
@@ -13,7 +14,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView7" />
+        app:layout_constraintTop_toBottomOf="@+id/textView7"
+         />
 
     <TextView
         android:id="@+id/txt"
@@ -22,12 +24,13 @@
         android:layout_marginTop="30dp"
         android:drawableStart="@drawable/ic_arrow_back_black_24dp"
         android:drawablePadding="15dp"
-        android:paddingLeft="20dp"
+        android:paddingStart="20dp"
         android:textColor="#FFFFFF"
-        android:textSize="25dp"
+        android:textSize="25sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="RtlSymmetry" />
 
     <TextView
         android:id="@+id/textView7"
diff --git a/app/src/main/res/layout/right_chat.xml b/app/src/main/res/layout/right_chat.xml
index b02075a..8725f39 100644
--- a/app/src/main/res/layout/right_chat.xml
+++ b/app/src/main/res/layout/right_chat.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:id="@+id/right">
     <RelativeLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true">
+        android:layout_alignParentEnd="true"
+        tools:ignore="UselessParent,HardcodedText">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -17,7 +19,7 @@
             android:layout_marginEnd="10dp"
             android:padding="8dp"
             android:text="Hello"
-            android:drawableRight="@drawable/ic_done_black_24dp"
+            android:drawableEnd="@drawable/ic_done_black_24dp"
             android:drawablePadding="5dp"
             android:background="@drawable/right_m" />
     </RelativeLayout>
diff --git a/app/src/main/res/layout/right_chat_reply.xml b/app/src/main/res/layout/right_chat_reply.xml
index c509fb0..46739e2 100644
--- a/app/src/main/res/layout/right_chat_reply.xml
+++ b/app/src/main/res/layout/right_chat_reply.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:id="@+id/rightreply">
     <RelativeLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true">
+        android:layout_alignParentEnd="true"
+        tools:ignore="UselessParent,HardcodedText">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -21,8 +23,7 @@
             android:layout_marginEnd="10dp"
             android:layout_marginTop="5dp"
             android:drawablePadding="0dp"
-            android:drawableEnd="@drawable/replyside"
-            android:paddingStart="8dp"/>
+            android:drawableEnd="@drawable/replyside" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -36,7 +37,7 @@
             android:layout_marginEnd="10dp"
             android:padding="8dp"
             android:text="Hello"
-            android:drawableRight="@drawable/ic_done_black_24dp"
+            android:drawableEnd="@drawable/ic_done_black_24dp"
             android:drawablePadding="5dp"
             android:background="@drawable/right_m" />
     </RelativeLayout>
diff --git a/app/src/main/res/layout/seen.xml b/app/src/main/res/layout/seen.xml
index c44543d..693cd6f 100644
--- a/app/src/main/res/layout/seen.xml
+++ b/app/src/main/res/layout/seen.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content" android:layout_height="wrap_content"
     android:id="@+id/seen">
     <RelativeLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true">
+        android:layout_alignParentEnd="true"
+        tools:ignore="UselessParent,HardcodedText">
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/seenreply.xml b/app/src/main/res/layout/seenreply.xml
index 4a8a3eb..306649a 100644
--- a/app/src/main/res/layout/seenreply.xml
+++ b/app/src/main/res/layout/seenreply.xml
@@ -1,43 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content" android:layout_height="wrap_content"
-    android:id="@+id/seenreply">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/seenreply"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
     <RelativeLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true">
+        android:layout_alignParentEnd="true"
+        tools:ignore="UselessParent,HardcodedText"
+        >
+
         <TextView
+            android:id="@+id/remessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="15sp"
-            android:id="@+id/remessage"
-            android:maxWidth="250dp"
             android:layout_alignParentEnd="true"
-            android:textColor="#000000"
-            android:padding="8dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="0dp"
-            android:text="Reply"
             android:background="@drawable/reply"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="5dp"
-            android:drawablePadding="0dp"
             android:drawableEnd="@drawable/replyside"
-            android:paddingStart="8dp"/>
+            android:drawablePadding="0dp"
+            android:maxWidth="250dp"
+            android:padding="8dp"
+            android:text="Reply"
+            android:textColor="#000000"
+            android:textSize="15sp"
+             />
 
         <TextView
+            android:id="@+id/message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="18sp"
-            android:id="@+id/message"
             android:layout_below="@+id/remessage"
             android:layout_alignParentEnd="true"
-            android:textColor="#000000"
             android:layout_marginTop="0dp"
             android:layout_marginEnd="10dp"
-            android:padding="8dp"
-            android:text="Hello"
             android:background="@drawable/right_m"
             android:drawableEnd="@drawable/ic_done_all_black_24dp"
-            android:drawablePadding="5dp"/>
+            android:drawablePadding="5dp"
+            android:padding="8dp"
+            android:text="Hello"
+            android:textColor="#000000"
+            android:textSize="18sp" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9b309b6..5663fc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.google.gms:google-services:4.3.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d22163e..af2b89f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 18 21:53:13 IST 2020
+#Fri Oct 02 16:05:39 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip