From 6fb1ee43d3fadb48e69128694220b2047f934956 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Wed, 10 Jul 2019 01:49:02 +0530
Subject: [PATCH 01/16] displays friended users, friend requests and lets
 adding new friends

---
 src/main/AndroidManifest.xml                  |   1 +
 .../java/org/amahi/anywhere/AmahiModule.java  |   6 +-
 .../anywhere/activity/FriendsActivity.java    |  92 ++++++++++++++
 .../anywhere/activity/NavigationActivity.java |  18 +++
 .../adapter/FriendRequestsListAdapter.java    |  54 +++++++++
 .../anywhere/adapter/FriendsListAdapter.java  |  53 ++++++++
 .../anywhere/adapter/FriendsPagerAdapter.java |  36 ++++++
 .../bus/AddFriendUserCompletedEvent.java      |  15 +++
 .../bus/FriendRequestsLoadFailedEvent.java    |   5 +
 .../bus/FriendRequestsLoadedEvent.java        |  18 +++
 .../bus/FriendUsersLoadFailedEvent.java       |   4 +
 .../anywhere/bus/FriendUsersLoadedEvent.java  |  17 +++
 .../anywhere/bus/FriendsSelectedEvent.java    |   4 +
 .../fragment/FriendRequestsFragment.java      | 114 ++++++++++++++++++
 .../anywhere/fragment/FriendsFragment.java    |  86 +++++++++++++
 .../anywhere/fragment/NavigationFragment.java |  19 +++
 .../amahi/anywhere/server/api/ServerApi.java  |  17 +++
 .../anywhere/server/client/ServerClient.java  |  16 +++
 .../anywhere/server/model/FriendRequest.java  |  65 ++++++++++
 .../anywhere/server/model/FriendUser.java     |  42 +++++++
 .../server/model/NewFriendRequest.java        |  27 +++++
 .../anywhere/server/model/PrimaryUser.java    |  29 +++++
 .../response/AddFriendUserResponse.java       |  29 +++++
 .../response/FriendRequestsResponse.java      |  35 ++++++
 .../server/response/FriendUsersResponse.java  |  40 ++++++
 .../java/org/amahi/anywhere/util/Intents.java |   6 +
 src/main/res/layout/activity_friends.xml      |  19 +++
 .../res/layout/fragment_friend_requests.xml   |  54 +++++++++
 src/main/res/layout/fragment_friends.xml      |  13 ++
 src/main/res/layout/fragment_navigation.xml   |  23 ++++
 .../res/layout/friend_requests_list_item.xml  |  14 +++
 src/main/res/layout/friends_list_item.xml     |  14 +++
 32 files changed, 984 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
 create mode 100644 src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
 create mode 100644 src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
 create mode 100644 src/main/java/org/amahi/anywhere/adapter/FriendsPagerAdapter.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendUsersLoadFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendsSelectedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
 create mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendUser.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
 create mode 100644 src/main/res/layout/activity_friends.xml
 create mode 100644 src/main/res/layout/fragment_friend_requests.xml
 create mode 100644 src/main/res/layout/fragment_friends.xml
 create mode 100644 src/main/res/layout/friend_requests_list_item.xml
 create mode 100644 src/main/res/layout/friends_list_item.xml

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 7c8fbd0e4..d110c050b 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -222,6 +222,7 @@
 
         <activity android:name=".activity.OfflineFilesActivity" />
         <activity android:name=".activity.RecentFilesActivity"></activity>
+        <activity android:name=".activity.FriendsActivity"></activity>
     </application>
 
 </manifest>
diff --git a/src/main/java/org/amahi/anywhere/AmahiModule.java b/src/main/java/org/amahi/anywhere/AmahiModule.java
index 7dbf6598a..feb4effb4 100644
--- a/src/main/java/org/amahi/anywhere/AmahiModule.java
+++ b/src/main/java/org/amahi/anywhere/AmahiModule.java
@@ -35,6 +35,8 @@
 import org.amahi.anywhere.activity.ServerFilesActivity;
 import org.amahi.anywhere.cache.CacheModule;
 import org.amahi.anywhere.fragment.AudioListFragment;
+import org.amahi.anywhere.fragment.FriendRequestsFragment;
+import org.amahi.anywhere.fragment.FriendsFragment;
 import org.amahi.anywhere.fragment.NavigationFragment;
 import org.amahi.anywhere.fragment.ServerAppsFragment;
 import org.amahi.anywhere.fragment.ServerFileAudioFragment;
@@ -107,7 +109,9 @@
         TvPlaybackVideoActivity.class,
         TvPlaybackAudioActivity.class,
         TvPlaybackAudioFragment.class,
-        AudioMetadataRetrievingTask.class
+        AudioMetadataRetrievingTask.class,
+        FriendsFragment.class,
+        FriendRequestsFragment.class
     }
 )
 class AmahiModule {
diff --git a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
new file mode 100644
index 000000000..aba165bbb
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
@@ -0,0 +1,92 @@
+package org.amahi.anywhere.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import com.google.android.material.tabs.TabLayout;
+
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.adapter.FriendsPagerAdapter;
+import org.amahi.anywhere.fragment.FriendRequestsFragment;
+import org.amahi.anywhere.fragment.FriendsFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FriendsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_friends);
+
+        setUpHomeNavigation();
+
+        setUpPager();
+
+        getTabLayout().setupWithViewPager(getPager());
+
+    }
+
+    private void setUpHomeNavigation() {
+        getSupportActionBar().setTitle("Friends");
+        getSupportActionBar().setHomeButtonEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    }
+
+    private void setUpPager() {
+
+        List<Fragment> fragmentList = getFragments();
+
+        List<String> fragmentTitles = getFragmentTitles();
+
+        FriendsPagerAdapter adapter = new FriendsPagerAdapter(getSupportFragmentManager(), fragmentList, fragmentTitles);
+        getPager().setAdapter(adapter);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem menuItem) {
+        switch (menuItem.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(menuItem);
+        }
+    }
+
+    private List<Fragment> getFragments() {
+
+        Fragment friendsFragment = new FriendsFragment();
+        Fragment friendRequestsFragment = new FriendRequestsFragment();
+        List<Fragment> fragmentList = new ArrayList<>();
+        fragmentList.add(friendsFragment);
+        fragmentList.add(friendRequestsFragment);
+
+        return fragmentList;
+    }
+
+    private List<String> getFragmentTitles() {
+
+        List<String> fragmentTitles = new ArrayList<>();
+        fragmentTitles.add("Friends");
+        fragmentTitles.add("Friend Requests");
+
+        return fragmentTitles;
+    }
+
+    private ViewPager getPager() {
+        return findViewById(R.id.pager_friends);
+    }
+
+    private TabLayout getTabLayout() {
+        return findViewById(R.id.tablayout_friends);
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/activity/NavigationActivity.java b/src/main/java/org/amahi/anywhere/activity/NavigationActivity.java
index 20b8d5c89..9a596af23 100644
--- a/src/main/java/org/amahi/anywhere/activity/NavigationActivity.java
+++ b/src/main/java/org/amahi/anywhere/activity/NavigationActivity.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.drawerlayout.widget.DrawerLayout;
@@ -30,6 +31,7 @@
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
+
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewStub;
@@ -43,6 +45,7 @@
 import org.amahi.anywhere.bus.AppSelectedEvent;
 import org.amahi.anywhere.bus.AppsSelectedEvent;
 import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendsSelectedEvent;
 import org.amahi.anywhere.bus.OfflineFilesSelectedEvent;
 import org.amahi.anywhere.bus.RecentFilesSelectedEvent;
 import org.amahi.anywhere.bus.SettingsSelectedEvent;
@@ -345,6 +348,21 @@ private void showRecentFiles() {
         startActivity(intent);
     }
 
+    @Subscribe
+    public void onFriendsSelected(FriendsSelectedEvent event) {
+
+        showFriends();
+
+        if (isNavigationDrawerAvailable()) {
+            hideNavigationDrawer();
+        }
+    }
+
+    private void showFriends() {
+        Intent intent = Intents.Builder.with(this).buildFriendsActivity();
+        startActivity(intent);
+    }
+
     @Subscribe
     public void onShareSelected(ShareSelectedEvent event) {
         setUpShare(event.getShare());
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
new file mode 100644
index 000000000..abbb74279
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -0,0 +1,54 @@
+package org.amahi.anywhere.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.amahi.anywhere.R;
+
+import java.util.List;
+
+public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
+    private List<String> friendRequestsEmailList;
+    private Context context;
+
+    public FriendRequestsListAdapter(Context context, List<String> friendRequestsEmailList) {
+        this.context = context;
+        this.friendRequestsEmailList = friendRequestsEmailList;
+
+    }
+
+    @NonNull
+    @Override
+    public FriendRequestsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new FriendRequestsListViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.friend_requests_list_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int position) {
+        holder.friendEmailText.setText(friendRequestsEmailList.get(position));
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return friendRequestsEmailList.size();
+    }
+
+    class FriendRequestsListViewHolder extends RecyclerView.ViewHolder {
+        TextView friendEmailText;
+
+        FriendRequestsListViewHolder(View itemView) {
+            super(itemView);
+            friendEmailText = itemView.findViewById(R.id.text_friend_request_email);
+
+        }
+    }
+}
+
+
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
new file mode 100644
index 000000000..fa9ee82cd
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -0,0 +1,53 @@
+package org.amahi.anywhere.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.amahi.anywhere.R;
+
+import java.util.List;
+
+public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
+    private List<String> friendsEmailList;
+    private Context context;
+
+    public FriendsListAdapter(Context context, List<String> friendsEmailList) {
+        this.context = context;
+        this.friendsEmailList = friendsEmailList;
+
+    }
+
+    @NonNull
+    @Override
+    public FriendsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new FriendsListViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.friends_list_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position) {
+        holder.friendEmailText.setText(friendsEmailList.get(position));
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return friendsEmailList.size();
+    }
+
+    class FriendsListViewHolder extends RecyclerView.ViewHolder {
+        TextView friendEmailText;
+        FriendsListViewHolder(View itemView) {
+            super(itemView);
+            friendEmailText = itemView.findViewById(R.id.text_friend_email);
+
+        }
+    }
+}
+
+
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsPagerAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsPagerAdapter.java
new file mode 100644
index 000000000..fea1093e6
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsPagerAdapter.java
@@ -0,0 +1,36 @@
+package org.amahi.anywhere.adapter;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
+import java.util.List;
+
+public class FriendsPagerAdapter extends FragmentStatePagerAdapter {
+    private List<Fragment> fragmentList;
+    private List<String> fragmentTitles;
+
+    public FriendsPagerAdapter(FragmentManager fm, List<Fragment> fragmentList,
+                               List<String> fragmentTitles) {
+        super(fm);
+        this.fragmentList = fragmentList;
+        this.fragmentTitles = fragmentTitles;
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return fragmentTitles.get(position);
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return fragmentList.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return fragmentList.size();
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
new file mode 100644
index 000000000..c4577e3eb
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
@@ -0,0 +1,15 @@
+package org.amahi.anywhere.bus;
+
+public class AddFriendUserCompletedEvent {
+    public boolean isSuccessful;
+
+    public boolean isSuccessful() {
+        return isSuccessful;
+    }
+
+    public AddFriendUserCompletedEvent(boolean isSuccessful) {
+        this.isSuccessful = isSuccessful;
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadFailedEvent.java
new file mode 100644
index 000000000..4a213935a
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadFailedEvent.java
@@ -0,0 +1,5 @@
+package org.amahi.anywhere.bus;
+
+
+public class FriendRequestsLoadFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
new file mode 100644
index 000000000..a81cf6736
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
@@ -0,0 +1,18 @@
+package org.amahi.anywhere.bus;
+
+
+import org.amahi.anywhere.server.model.FriendRequest;
+
+import java.util.List;
+
+public class FriendRequestsLoadedEvent implements BusEvent {
+    private final List<FriendRequest> friendRequests;
+
+    public FriendRequestsLoadedEvent(List<FriendRequest> friendRequests) {
+        this.friendRequests = friendRequests;
+    }
+
+    public List<FriendRequest> getFriendRequests() {
+        return friendRequests;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadFailedEvent.java
new file mode 100644
index 000000000..003e6bf57
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class FriendUsersLoadFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
new file mode 100644
index 000000000..e21ce0c78
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
@@ -0,0 +1,17 @@
+package org.amahi.anywhere.bus;
+
+import org.amahi.anywhere.server.model.PrimaryUser;
+
+import java.util.List;
+
+public class FriendUsersLoadedEvent implements BusEvent {
+    private final List<PrimaryUser> primaryUsers;
+
+    public FriendUsersLoadedEvent(List<PrimaryUser> primaryUsers) {
+        this.primaryUsers = primaryUsers;
+    }
+
+    public List<PrimaryUser> getPrimaryUsers() {
+        return primaryUsers;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendsSelectedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendsSelectedEvent.java
new file mode 100644
index 000000000..d66e9ab09
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendsSelectedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class FriendsSelectedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
new file mode 100644
index 000000000..6c5bdc301
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -0,0 +1,114 @@
+package org.amahi.anywhere.fragment;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.android.material.textfield.TextInputEditText;
+import com.squareup.otto.Subscribe;
+
+import org.amahi.anywhere.AmahiApplication;
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.adapter.FriendRequestsListAdapter;
+import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
+import org.amahi.anywhere.server.client.ServerClient;
+import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.server.model.NewFriendRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+/**
+ * Friend Requests Fragment, shows list of friend requests.
+ */
+public class FriendRequestsFragment extends Fragment {
+
+    @Inject
+    ServerClient serverClient;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_friend_requests, container, false);
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        setUpInjections();
+
+        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
+
+        setUpFriendRequestsList();
+
+        Button btnAddFR = getView().findViewById(R.id.btn_add_fr);
+
+        btnAddFR.setOnClickListener(v -> addFriendRequest());
+    }
+
+    private void setUpInjections() {
+        AmahiApplication.from(getActivity()).inject(this);
+    }
+
+    private RecyclerView getRecyclerView() {
+        return getView().findViewById(R.id.list_friend_requests);
+    }
+
+    private void setUpFriendRequestsList() {
+        if (serverClient.isConnected()) {
+            serverClient.getFriendRequests();
+        }
+    }
+
+    @Subscribe
+    private void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
+        showFriendRequests(event.getFriendRequests());
+    }
+
+    private void showFriendRequests(List<FriendRequest> friendRequests) {
+        List<String> friendRequestsEmailList = new ArrayList<>();
+
+        for (FriendRequest friendRequest : friendRequests) {
+            friendRequestsEmailList.add(friendRequest.getFriendUser().getEmail());
+        }
+
+        FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsEmailList);
+        getRecyclerView().setAdapter(adapter);
+    }
+
+    private void addFriendRequest() {
+        TextInputEditText etEmailFR = getView().findViewById(R.id.text_email);
+
+        if (etEmailFR != null && etEmailFR.getText() != null) {
+            NewFriendRequest newFriendRequest = new NewFriendRequest();
+            newFriendRequest.setEmail(etEmailFR.getText().toString());
+            serverClient.addFriendUser(newFriendRequest);
+        }
+
+    }
+
+    @Subscribe
+    private void onAddFriendUser(AddFriendUserCompletedEvent event) {
+        if (event.isSuccessful()) {
+            Toast.makeText(getContext(), "friend request success", Toast.LENGTH_LONG).show();
+            setUpFriendRequestsList();
+        } else {
+            Toast.makeText(getContext(), "friend request failed", Toast.LENGTH_LONG).show();
+        }
+
+    }
+
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
new file mode 100644
index 000000000..b1eaee4f7
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -0,0 +1,86 @@
+package org.amahi.anywhere.fragment;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.squareup.otto.Subscribe;
+
+import org.amahi.anywhere.AmahiApplication;
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.adapter.FriendsListAdapter;
+import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
+import org.amahi.anywhere.server.client.ServerClient;
+import org.amahi.anywhere.server.model.PrimaryUser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+/**
+ * Friends Fragment, shows list of friended users.
+ */
+public class FriendsFragment extends Fragment {
+
+    @Inject
+    ServerClient serverClient;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.fragment_friends, container, false);
+
+    }
+
+    private void setUpInjections() {
+        AmahiApplication.from(getActivity()).inject(this);
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        setUpInjections();
+
+        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
+
+        setUpFriendsList();
+    }
+
+    private RecyclerView getRecyclerView() {
+        return (RecyclerView) getView().findViewById(R.id.list_friends);
+    }
+
+    private void setUpFriendsList() {
+        serverClient.getFriendUsers();
+
+    }
+
+    @Subscribe
+    private void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
+        showFriendUsers(event.getPrimaryUsers());
+    }
+
+    private void showFriendUsers(List<PrimaryUser> primaryUsers) {
+        List<String> friendsEmailList = new ArrayList<>();
+
+        for (PrimaryUser primaryUser : primaryUsers) {
+            friendsEmailList.add(primaryUser.getFriendUser().getEmail());
+        }
+
+        FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsEmailList);
+        getRecyclerView().setAdapter(adapter);
+
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java b/src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java
index d3d2fe9b9..dc6ef38f4 100644
--- a/src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java
@@ -31,6 +31,7 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
+
 import androidx.fragment.app.Fragment;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -54,6 +55,7 @@
 import org.amahi.anywhere.adapter.NavigationDrawerAdapter;
 import org.amahi.anywhere.bus.AppsSelectedEvent;
 import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendsSelectedEvent;
 import org.amahi.anywhere.bus.OfflineFilesSelectedEvent;
 import org.amahi.anywhere.bus.RecentFilesSelectedEvent;
 import org.amahi.anywhere.bus.ServerConnectedEvent;
@@ -355,6 +357,7 @@ private void setUpNavigationList() {
             showServers();
             hideOfflineLayout();
             hideRecentLayout();
+            hideFriendsLayout();
         }
 
     }
@@ -367,6 +370,10 @@ private void hideRecentLayout() {
         getRecentFilesLayout().setVisibility(View.GONE);
     }
 
+    private void hideFriendsLayout() {
+        getFriendsLayout().setVisibility(View.GONE);
+    }
+
     private void setUpNavigationAdapter() {
         //Setting the layout of a vertical list dynamically.
 
@@ -394,6 +401,10 @@ private LinearLayout getRecentFilesLayout() {
         return getView().findViewById(R.id.recent_files_layout);
     }
 
+    private LinearLayout getFriendsLayout() {
+        return getView().findViewById(R.id.friends_layout);
+    }
+
     private LinearLayout getLinearLayoutSelectedServer() {
         return getView().findViewById(R.id.server_select_LinearLayout);
     }
@@ -418,6 +429,8 @@ private void setUpNavigationListener() {
         getOfflineFilesLayout().setOnClickListener(view -> showOfflineFiles());
 
         getRecentFilesLayout().setOnClickListener(view -> showRecentFiles());
+
+        getFriendsLayout().setOnClickListener(view -> showFriends());
     }
 
     private void selectedServerListener(int position) {
@@ -492,6 +505,7 @@ private void setUpServerSelectListener() {
                 showServers();
                 hideOfflineLayout();
                 hideRecentLayout();
+                hideFriendsLayout();
             }
         });
     }
@@ -505,6 +519,7 @@ private void showNavigationItems() {
 
         getOfflineFilesLayout().setVisibility(View.VISIBLE);
         getRecentFilesLayout().setVisibility(View.VISIBLE);
+        getFriendsLayout().setVisibility(View.VISIBLE);
     }
 
     @Subscribe
@@ -613,6 +628,10 @@ private void showRecentFiles() {
         BusProvider.getBus().post(new RecentFilesSelectedEvent());
     }
 
+    private void showFriends() {
+        BusProvider.getBus().post(new FriendsSelectedEvent());
+    }
+
     @Subscribe
     public void onServerConnectionChanged(ServerConnectionChangedEvent event) {
         areServersVisible = false;
diff --git a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
index 937c789f8..50b14133b 100644
--- a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
+++ b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
@@ -19,6 +19,9 @@
 
 package org.amahi.anywhere.server.api;
 
+import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.PrimaryUser;
 import org.amahi.anywhere.server.model.ServerApp;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
@@ -29,6 +32,7 @@
 import okhttp3.MultipartBody;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
+import retrofit2.http.Body;
 import retrofit2.http.DELETE;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
@@ -74,4 +78,17 @@ Call<ServerFileMetadata> getFileMetadata(
     @GET("/apps")
     Call<List<ServerApp>> getApps(
         @Header("Session") String session);
+
+    @GET("/frnd/users")
+    Call<List<PrimaryUser>> getFriendUsers(
+        @Header("Session") String session);
+
+    @POST("/frnd/request")
+    Call<NewFriendRequest> addFriendUser(
+        @Header("Session") String session,
+        @Body NewFriendRequest friendRequest);
+
+    @GET("/frnd/requests")
+    Call<List<FriendRequest>> getFriendRequests(
+        @Header("Session") String session);
 }
diff --git a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
index b5dd13282..bd11c0108 100644
--- a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
+++ b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
@@ -38,11 +38,15 @@
 import org.amahi.anywhere.server.ApiConnection;
 import org.amahi.anywhere.server.api.ProxyApi;
 import org.amahi.anywhere.server.api.ServerApi;
+import org.amahi.anywhere.server.model.NewFriendRequest;
 import org.amahi.anywhere.server.model.Server;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
 import org.amahi.anywhere.server.model.ServerRoute;
 import org.amahi.anywhere.server.model.ServerShare;
+import org.amahi.anywhere.server.response.AddFriendUserResponse;
+import org.amahi.anywhere.server.response.FriendRequestsResponse;
+import org.amahi.anywhere.server.response.FriendUsersResponse;
 import org.amahi.anywhere.server.response.ServerAppsResponse;
 import org.amahi.anywhere.server.response.ServerFileDeleteResponse;
 import org.amahi.anywhere.server.response.ServerFileUploadResponse;
@@ -327,4 +331,16 @@ public void getFileMetadata(ServerShare share, ServerFile file, Callback<ServerF
     public void getApps() {
         serverApi.getApps(server.getSession()).enqueue(new ServerAppsResponse());
     }
+
+    public void getFriendUsers() {
+        serverApi.getFriendUsers(server.getSession()).enqueue(new FriendUsersResponse());
+    }
+
+    public void addFriendUser(NewFriendRequest friendRequest) {
+        serverApi.addFriendUser(server.getSession(), friendRequest).enqueue(new AddFriendUserResponse());
+    }
+
+    public void getFriendRequests() {
+        serverApi.getFriendRequests(server.getSession()).enqueue(new FriendRequestsResponse());
+    }
 }
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
new file mode 100644
index 000000000..896e195a1
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
@@ -0,0 +1,65 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+
+public class FriendRequest {
+
+    @SerializedName("id")
+    private int id;
+
+    @SerializedName("created_at")
+    private Date createdAt;
+
+    @SerializedName("status")
+    private int status;
+
+    @SerializedName("amahi_user")
+    private FriendUser friendUser;
+
+    @SerializedName("last_requested_at")
+    private String lastRequestedAt;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public FriendUser getFriendUser() {
+        return friendUser;
+    }
+
+    public void setFriendUser(FriendUser friendUser) {
+        this.friendUser = friendUser;
+    }
+
+    public String getLastRequestedAt() {
+        return lastRequestedAt;
+    }
+
+    public void setLastRequestedAt(String lastRequestedAt) {
+        this.lastRequestedAt = lastRequestedAt;
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
new file mode 100644
index 000000000..e60c593e7
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
@@ -0,0 +1,42 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+
+public class FriendUser {
+    @SerializedName("id")
+    private int id;
+
+    @SerializedName("created_at")
+    private Date createdDate;
+
+    @SerializedName("email")
+    private String email;
+
+
+    public int getId() {
+        return id;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
new file mode 100644
index 000000000..d786be142
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
@@ -0,0 +1,27 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class NewFriendRequest {
+    @SerializedName("email")
+    private String email;
+
+    @SerializedName("pin")
+    private int pin;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public int getPin() {
+        return pin;
+    }
+
+    public void setPin(int pin) {
+        this.pin = pin;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java b/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
new file mode 100644
index 000000000..70e7a70f2
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
@@ -0,0 +1,29 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+
+public class PrimaryUser {
+    @SerializedName("id")
+    private int id;
+
+    @SerializedName("created_at")
+    private Date createdDate;
+
+    @SerializedName("amahi_user")
+    private FriendUser friendUser;
+
+    public int getId() {
+        return id;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public FriendUser getFriendUser() {
+        return friendUser;
+    }
+}
+
diff --git a/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
new file mode 100644
index 000000000..75967bdc2
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
@@ -0,0 +1,29 @@
+package org.amahi.anywhere.server.response;
+
+
+
+import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.server.model.NewFriendRequest;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class AddFriendUserResponse implements Callback<NewFriendRequest> {
+    @Override
+    public void onResponse(Call<NewFriendRequest> call, Response<NewFriendRequest> response) {
+        if (response.isSuccessful()) {
+            BusProvider.getBus().post(new AddFriendUserCompletedEvent(true));
+        } else
+            this.onFailure(call, new HttpException(response));
+
+    }
+
+    @Override
+    public void onFailure(Call<NewFriendRequest> call, Throwable t) {
+        BusProvider.getBus().post(new AddFriendUserCompletedEvent(false));
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
new file mode 100644
index 000000000..74b993dec
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
@@ -0,0 +1,35 @@
+package org.amahi.anywhere.server.response;
+
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendRequestsLoadFailedEvent;
+import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
+import org.amahi.anywhere.server.model.FriendRequest;
+
+import java.util.Collections;
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class FriendRequestsResponse implements Callback<List<FriendRequest>> {
+    @Override
+    public void onResponse(Call<List<FriendRequest>> call, Response<List<FriendRequest>> response) {
+        if (response.isSuccessful()) {
+            List<FriendRequest> friendRequests = response.body();
+            if (friendRequests == null) {
+                friendRequests = Collections.emptyList();
+            }
+            BusProvider.getBus().post(new FriendRequestsLoadedEvent(friendRequests));
+        } else
+            this.onFailure(call, new HttpException(response));
+
+    }
+
+    @Override
+    public void onFailure(Call<List<FriendRequest>> call, Throwable t) {
+        BusProvider.getBus().post(new FriendRequestsLoadFailedEvent());
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
new file mode 100644
index 000000000..c2d39c915
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
@@ -0,0 +1,40 @@
+package org.amahi.anywhere.server.response;
+
+import com.squareup.otto.Bus;
+
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendUsersLoadFailedEvent;
+import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
+import org.amahi.anywhere.bus.ServerFilesLoadedEvent;
+import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.server.model.PrimaryUser;
+
+import java.util.Collections;
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+
+public class FriendUsersResponse implements Callback<List<PrimaryUser>> {
+    @Override
+    public void onResponse(Call<List<PrimaryUser>> call, Response<List<PrimaryUser>> response) {
+        if (response.isSuccessful()) {
+            List<PrimaryUser> primaryUsers = response.body();
+            if (primaryUsers == null) {
+                primaryUsers = Collections.emptyList();
+            }
+            BusProvider.getBus().post(new FriendUsersLoadedEvent(primaryUsers));
+        } else
+            this.onFailure(call, new HttpException(response));
+
+    }
+
+    @Override
+    public void onFailure(Call<List<PrimaryUser>> call, Throwable t) {
+        BusProvider.getBus().post(new FriendUsersLoadFailedEvent());
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/util/Intents.java b/src/main/java/org/amahi/anywhere/util/Intents.java
index 92b45abaa..b2abb6e18 100644
--- a/src/main/java/org/amahi/anywhere/util/Intents.java
+++ b/src/main/java/org/amahi/anywhere/util/Intents.java
@@ -27,9 +27,11 @@
 import android.net.Uri;
 import android.os.Parcelable;
 import android.provider.MediaStore;
+
 import androidx.annotation.NonNull;
 
 import org.amahi.anywhere.R;
+import org.amahi.anywhere.activity.FriendsActivity;
 import org.amahi.anywhere.activity.IntroductionActivity;
 import org.amahi.anywhere.activity.OfflineFilesActivity;
 import org.amahi.anywhere.activity.RecentFilesActivity;
@@ -117,6 +119,10 @@ public Intent buildRecentFilesActivity() {
             return new Intent(context, RecentFilesActivity.class);
         }
 
+        public Intent buildFriendsActivity() {
+            return new Intent(context, FriendsActivity.class);
+        }
+
         public Intent buildServerTvFilesActivity(ServerShare share, ServerFile file) {
             Intent intent = new Intent(context, ServerFileTvActivity.class);
             intent.putExtra(Extras.SERVER_FILE, file);
diff --git a/src/main/res/layout/activity_friends.xml b/src/main/res/layout/activity_friends.xml
new file mode 100644
index 000000000..7833a70eb
--- /dev/null
+++ b/src/main/res/layout/activity_friends.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    tools:context=".activity.FriendsActivity"
+    android:orientation="vertical">
+
+    <com.google.android.material.tabs.TabLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/tablayout_friends" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/pager_friends"/>
+
+</LinearLayout>
diff --git a/src/main/res/layout/fragment_friend_requests.xml b/src/main/res/layout/fragment_friend_requests.xml
new file mode 100644
index 000000000..be6077f4b
--- /dev/null
+++ b/src/main/res/layout/fragment_friend_requests.xml
@@ -0,0 +1,54 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".fragment.FriendRequestsFragment">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/card_add_fr"
+        android:layout_margin="8dp"
+        android:padding="8dp"
+        app:cardCornerRadius="4dp">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/email_text_layout"
+                android:layout_margin="8dp"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:hint="Registered email of friend">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/text_email"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textEmailAddress"/>
+            </com.google.android.material.textfield.TextInputLayout>
+            <Button
+                android:id="@+id/btn_add_fr"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Add Friend"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:layout_below="@+id/email_text_layout"
+                android:background="@color/accent"
+                android:textColor="@android:color/white"/>
+        </RelativeLayout>
+    </androidx.cardview.widget.CardView>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/list_friend_requests"
+        android:layout_below="@+id/card_add_fr"
+        android:layout_margin="8dp"/>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/fragment_friends.xml b/src/main/res/layout/fragment_friends.xml
new file mode 100644
index 000000000..626116caa
--- /dev/null
+++ b/src/main/res/layout/fragment_friends.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+    tools:context=".fragment.FriendsFragment">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/list_friends"/>
+
+</FrameLayout>
diff --git a/src/main/res/layout/fragment_navigation.xml b/src/main/res/layout/fragment_navigation.xml
index edf107c4c..f9e2a5a15 100644
--- a/src/main/res/layout/fragment_navigation.xml
+++ b/src/main/res/layout/fragment_navigation.xml
@@ -151,6 +151,29 @@
                     android:textStyle="bold" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/friends_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="32dp"
+                    android:layout_marginStart="16dp"
+                    android:src="@drawable/ic_recent_files_24dp"
+                    tools:ignore="contentDescription" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Friends"
+                    android:textSize="@dimen/text_small"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
         </LinearLayout>
 
     </ViewAnimator>
diff --git a/src/main/res/layout/friend_requests_list_item.xml b/src/main/res/layout/friend_requests_list_item.xml
new file mode 100644
index 000000000..dae5c2a0f
--- /dev/null
+++ b/src/main/res/layout/friend_requests_list_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/text_friend_request_email"
+        android:padding="8dp"
+        android:textSize="16sp"
+        android:textColor="@color/primary_text"/>
+
+</LinearLayout>
diff --git a/src/main/res/layout/friends_list_item.xml b/src/main/res/layout/friends_list_item.xml
new file mode 100644
index 000000000..e58ec1d09
--- /dev/null
+++ b/src/main/res/layout/friends_list_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/text_friend_email"
+        android:padding="8dp"
+        android:textSize="16sp"
+        android:textColor="@color/primary_text"/>
+
+</LinearLayout>

From 025ccd788abd777b829f06ec124b0131d224c117 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Thu, 18 Jul 2019 00:24:28 +0530
Subject: [PATCH 02/16] shows request status, adding new friend from floating
 button

---
 src/main/AndroidManifest.xml                  |   3 +-
 .../java/org/amahi/anywhere/AmahiModule.java  |   4 +-
 .../anywhere/activity/FriendsActivity.java    |  74 ++++++++++++-
 .../adapter/FriendRequestsListAdapter.java    |  42 +++++++-
 .../anywhere/adapter/FriendsListAdapter.java  |  18 +++-
 .../bus/AddFriendUserCompletedEvent.java      |   2 +-
 .../fragment/AlertDialogFragment.java         | 102 +++++++++++++++++-
 .../fragment/FriendRequestsFragment.java      |  42 +++-----
 .../anywhere/fragment/FriendsFragment.java    |  26 +++--
 .../anywhere/server/model/FriendRequest.java  |   6 +-
 .../anywhere/server/model/FriendUser.java     |   6 +-
 .../res/drawable/friend_status_background.xml |  10 ++
 src/main/res/drawable/ic_add_friend.xml       |   5 +
 src/main/res/layout/activity_friends.xml      |  38 ++++---
 src/main/res/layout/dialog_add_friend.xml     |  18 ++++
 .../res/layout/fragment_friend_requests.xml   |  43 +-------
 .../res/layout/friend_requests_list_item.xml  |  50 +++++++--
 src/main/res/layout/friends_list_item.xml     |  44 ++++++--
 src/main/res/values-v21/themes.xml            |   8 ++
 src/main/res/values/colors.xml                |   6 ++
 src/main/res/values/strings.xml               |   6 +-
 src/main/res/values/themes.xml                |  13 +++
 22 files changed, 436 insertions(+), 130 deletions(-)
 create mode 100644 src/main/res/drawable/friend_status_background.xml
 create mode 100644 src/main/res/drawable/ic_add_friend.xml
 create mode 100644 src/main/res/layout/dialog_add_friend.xml

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index d110c050b..1a68db641 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -222,7 +222,8 @@
 
         <activity android:name=".activity.OfflineFilesActivity" />
         <activity android:name=".activity.RecentFilesActivity"></activity>
-        <activity android:name=".activity.FriendsActivity"></activity>
+        <activity android:name=".activity.FriendsActivity"
+            android:theme="@style/Theme.Amahi.Friends"></activity>
     </application>
 
 </manifest>
diff --git a/src/main/java/org/amahi/anywhere/AmahiModule.java b/src/main/java/org/amahi/anywhere/AmahiModule.java
index feb4effb4..33a68928a 100644
--- a/src/main/java/org/amahi/anywhere/AmahiModule.java
+++ b/src/main/java/org/amahi/anywhere/AmahiModule.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 
 import org.amahi.anywhere.activity.AuthenticationActivity;
+import org.amahi.anywhere.activity.FriendsActivity;
 import org.amahi.anywhere.activity.NativeVideoActivity;
 import org.amahi.anywhere.activity.NavigationActivity;
 import org.amahi.anywhere.activity.OfflineFilesActivity;
@@ -111,7 +112,8 @@
         TvPlaybackAudioFragment.class,
         AudioMetadataRetrievingTask.class,
         FriendsFragment.class,
-        FriendRequestsFragment.class
+        FriendRequestsFragment.class,
+        FriendsActivity.class
     }
 )
 class AmahiModule {
diff --git a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
index aba165bbb..fffe343fb 100644
--- a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
+++ b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
@@ -6,18 +6,33 @@
 
 import android.os.Bundle;
 import android.view.MenuItem;
+import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
+import com.squareup.otto.Subscribe;
 
+import org.amahi.anywhere.AmahiApplication;
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsPagerAdapter;
+import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.fragment.AlertDialogFragment;
 import org.amahi.anywhere.fragment.FriendRequestsFragment;
 import org.amahi.anywhere.fragment.FriendsFragment;
+import org.amahi.anywhere.server.client.ServerClient;
+import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.util.Fragments;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class FriendsActivity extends AppCompatActivity {
+import javax.inject.Inject;
+
+public class FriendsActivity extends AppCompatActivity
+    implements AlertDialogFragment.AddFriendDialogCallback {
+
+    @Inject
+    ServerClient serverClient;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -26,10 +41,18 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setUpHomeNavigation();
 
+        setUpInjections();
+
         setUpPager();
 
         getTabLayout().setupWithViewPager(getPager());
 
+        setUpAddFriendFAB();
+
+    }
+
+    private void setUpInjections() {
+        AmahiApplication.from(this).inject(this);
     }
 
     private void setUpHomeNavigation() {
@@ -48,6 +71,22 @@ private void setUpPager() {
         getPager().setAdapter(adapter);
     }
 
+    private void setUpAddFriendFAB() {
+        FloatingActionButton fab = findViewById(R.id.fab_add_friend);
+
+        fab.setOnClickListener(v -> showAddFriendDialog());
+    }
+
+    private void showAddFriendDialog() {
+        AlertDialogFragment addFriendDialog = new AlertDialogFragment();
+        Bundle bundle = new Bundle();
+        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.ADD_FRIEND_DIALOG);
+        addFriendDialog.setArguments(bundle);
+        addFriendDialog.show(getSupportFragmentManager(), "add_friend_dialog");
+
+    }
+
+
     @Override
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch (menuItem.getItemId()) {
@@ -89,4 +128,37 @@ private TabLayout getTabLayout() {
     }
 
 
+    @Override
+    public void dialogPositiveButtonOnClick(String email) {
+        if (serverClient.isConnected()) {
+            addFriendRequest(email);
+        }
+        //TODO: connect server if not connected
+    }
+
+    @Override
+    public void dialogNegativeButtonOnClick() {
+
+    }
+
+    private void addFriendRequest(String email) {
+
+        if (email != null) {
+            NewFriendRequest newFriendRequest = new NewFriendRequest();
+            newFriendRequest.setEmail(email);
+            serverClient.addFriendUser(newFriendRequest);
+        }
+
+    }
+
+
+    @Subscribe
+    private void onAddFriendUser(AddFriendUserCompletedEvent event) {
+        if (event.isSuccessful()) {
+            Toast.makeText(this, "friend request success", Toast.LENGTH_LONG).show();
+        } else {
+            Toast.makeText(this, "friend request failed", Toast.LENGTH_LONG).show();
+        }
+
+    }
 }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
index abbb74279..cd1d6554a 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -1,6 +1,7 @@
 package org.amahi.anywhere.adapter;
 
 import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,16 +11,17 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.amahi.anywhere.R;
+import org.amahi.anywhere.server.model.FriendRequest;
 
 import java.util.List;
 
 public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
-    private List<String> friendRequestsEmailList;
+    private List<FriendRequest> friendRequestsList;
     private Context context;
 
-    public FriendRequestsListAdapter(Context context, List<String> friendRequestsEmailList) {
+    public FriendRequestsListAdapter(Context context, List<FriendRequest> friendRequestsList) {
         this.context = context;
-        this.friendRequestsEmailList = friendRequestsEmailList;
+        this.friendRequestsList = friendRequestsList;
 
     }
 
@@ -31,21 +33,51 @@ public FriendRequestsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent
 
     @Override
     public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int position) {
-        holder.friendEmailText.setText(friendRequestsEmailList.get(position));
+        holder.friendEmailText.setText(friendRequestsList.get(position).getFriendUser().getEmail());
+        int status = friendRequestsList.get(position).getStatus();
+
+        //set status text and color based on status value
+        String statusText = "Active";
+        int colorResourceId = R.color.status_active;
+        switch (status) {
+            case 0:
+                statusText = "Active";
+                colorResourceId = R.color.status_active;
+                break;
+            case 1:
+                statusText = "Expired";
+                colorResourceId = R.color.status_expired;
+                break;
+            case 2:
+                statusText = "Accepted";
+                colorResourceId = R.color.status_accepted;
+                break;
+            case 3:
+                statusText = "Rejected";
+                colorResourceId = R.color.status_rejected;
+                break;
+
+        }
+        holder.friendRequestStatus.setText(statusText);
+        GradientDrawable drawable = (GradientDrawable) holder.friendRequestStatus.getBackground();
+        drawable.setColor(context.getResources().getColor(colorResourceId));
+        holder.friendRequestStatus.setBackground(drawable);
 
     }
 
     @Override
     public int getItemCount() {
-        return friendRequestsEmailList.size();
+        return friendRequestsList.size();
     }
 
     class FriendRequestsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
+        TextView friendRequestStatus;
 
         FriendRequestsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_request_email);
+            friendRequestStatus = itemView.findViewById(R.id.text_friend_request_status);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
index fa9ee82cd..e0e7400d0 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -10,16 +10,17 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.amahi.anywhere.R;
+import org.amahi.anywhere.server.model.FriendUser;
 
 import java.util.List;
 
 public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
-    private List<String> friendsEmailList;
+    private List<FriendUser> friendsList;
     private Context context;
 
-    public FriendsListAdapter(Context context, List<String> friendsEmailList) {
+    public FriendsListAdapter(Context context, List<FriendUser> friendsList) {
         this.context = context;
-        this.friendsEmailList = friendsEmailList;
+        this.friendsList = friendsList;
 
     }
 
@@ -31,20 +32,27 @@ public FriendsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int v
 
     @Override
     public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position) {
-        holder.friendEmailText.setText(friendsEmailList.get(position));
+        holder.friendEmailText.setText(friendsList.get(position).getEmail());
+        StringBuilder builder = new StringBuilder();
+        builder.append("Friends since ");
+        builder.append(friendsList.get(position).getCreatedDate());
+        holder.createdAt.setText(builder);
 
     }
 
     @Override
     public int getItemCount() {
-        return friendsEmailList.size();
+        return friendsList.size();
     }
 
     class FriendsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
+        TextView createdAt;
+
         FriendsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_email);
+            createdAt = itemView.findViewById(R.id.text_friend_created_at);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
index c4577e3eb..61a49f097 100644
--- a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
@@ -1,6 +1,6 @@
 package org.amahi.anywhere.bus;
 
-public class AddFriendUserCompletedEvent {
+public class AddFriendUserCompletedEvent implements BusEvent {
     public boolean isSuccessful;
 
     public boolean isSuccessful() {
diff --git a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
index c67c26360..78b8fe1a3 100644
--- a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
@@ -1,13 +1,23 @@
 package org.amahi.anywhere.fragment;
 
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 
 import android.app.AlertDialog;
+
 import androidx.fragment.app.DialogFragment;
+
 import android.util.Log;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.android.material.textfield.TextInputEditText;
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.util.Fragments;
@@ -18,8 +28,10 @@ public class AlertDialogFragment extends DialogFragment implements DialogInterfa
     File file;
     private int dialogType = -1;
     AlertDialog.Builder builder;
+    private TextInputEditText textFriendEmail;
     public static final int DELETE_FILE_DIALOG = 0;
     public static final int DUPLICATE_FILE_DIALOG = 1;
+    public static final int ADD_FRIEND_DIALOG = 2;
 
 
     @NonNull
@@ -40,9 +52,19 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             case DUPLICATE_FILE_DIALOG:
                 buildDuplicateDialog();
                 break;
+
+            case ADD_FRIEND_DIALOG:
+                buildAddFriendDialog();
+                break;
         }
 
-        return builder.create();
+        Dialog dialog = builder.create();
+
+        if (dialogType == ADD_FRIEND_DIALOG) {
+            addFriendButtonClickListener(dialog);
+        }
+
+        return dialog;
     }
 
     private void buildDeleteDialog() {
@@ -60,6 +82,57 @@ private void buildDuplicateDialog() {
             .setNegativeButton(getString(R.string.button_no), this);
     }
 
+    private void buildAddFriendDialog() {
+        View v = getActivity().getLayoutInflater().inflate(R.layout.dialog_add_friend, null);
+        textFriendEmail = v.findViewById(R.id.text_email);
+
+        builder.setTitle(getString(R.string.title_add_new_friend))
+            .setMessage(getString(R.string.message_add_new_friend))
+            .setPositiveButton(getString(R.string.text_button_add_friend), this)
+            .setNegativeButton(getString(R.string.text_cancel), this);
+        builder.setView(v);
+    }
+
+    private void addFriendButtonClickListener(Dialog dialog) {
+        dialog.setOnShowListener(dialogInterface -> {
+
+            setCursorAndShowKeyboard(textFriendEmail);
+
+            Button positiveButton = ((AlertDialog) dialogInterface).getButton(DialogInterface.BUTTON_POSITIVE);
+            positiveButton.setOnClickListener(v -> {
+                AddFriendDialogCallback callback = getAddFriendCallback();
+                if (callback != null) {
+                    if (textFriendEmail.getText() != null && !textFriendEmail.getText().toString().equals("")) {
+                        dialogInterface.dismiss();
+                        callback.dialogPositiveButtonOnClick(textFriendEmail.getText().toString());
+                        hideKeyboard();
+                    } else {
+                        Toast.makeText(getContext(), R.string.message_empty_email_add_friend, Toast.LENGTH_LONG).show();
+                    }
+                }
+            });
+
+            Button negativeButton = ((AlertDialog) dialogInterface).getButton(DialogInterface.BUTTON_NEGATIVE);
+            negativeButton.setOnClickListener(v -> {
+                dialogInterface.dismiss();
+                hideKeyboard();
+            });
+        });
+    }
+
+    private void setCursorAndShowKeyboard(TextInputEditText editText) {
+        editText.setFocusable(true);
+        editText.requestFocus();
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+    }
+
+    private void hideKeyboard() {
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
+    }
+
+
     @Override
     public void onClick(DialogInterface dialog, int which) {
 
@@ -133,6 +206,25 @@ private DeleteFileDialogCallback getDeleteDialogCallback() {
         return callback;
     }
 
+    private AddFriendDialogCallback getAddFriendCallback() {
+        AddFriendDialogCallback callback;
+        if (getTargetFragment() != null) {
+            try {
+                callback = (AddFriendDialogCallback) getTargetFragment();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
+                throw e;
+            }
+        } else {
+            try {
+                callback = (AddFriendDialogCallback) getActivity();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
+                throw e;
+            }
+        }
+        return callback;
+    }
 
     public interface DuplicateFileDialogCallback {
 
@@ -147,6 +239,14 @@ public interface DeleteFileDialogCallback {
         void dialogPositiveButtonOnClick();
 
 
+        void dialogNegativeButtonOnClick();
+    }
+
+    public interface AddFriendDialogCallback {
+
+        void dialogPositiveButtonOnClick(String email);
+
+
         void dialogNegativeButtonOnClick();
     }
 
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index 6c5bdc301..2ed55b483 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -10,10 +10,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.Toast;
 
-import com.google.android.material.textfield.TextInputEditText;
 import com.squareup.otto.Subscribe;
 
 import org.amahi.anywhere.AmahiApplication;
@@ -23,7 +20,7 @@
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendRequest;
-import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.FriendUser;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,9 +51,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpFriendRequestsList();
 
-        Button btnAddFR = getView().findViewById(R.id.btn_add_fr);
 
-        btnAddFR.setOnClickListener(v -> addFriendRequest());
+        showFriendRequests();
     }
 
     private void setUpInjections() {
@@ -75,40 +71,32 @@ private void setUpFriendRequestsList() {
 
     @Subscribe
     private void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
-        showFriendRequests(event.getFriendRequests());
+        showFriendRequests();
     }
 
-    private void showFriendRequests(List<FriendRequest> friendRequests) {
-        List<String> friendRequestsEmailList = new ArrayList<>();
+    private void showFriendRequests() {
+        List<FriendRequest> friendRequestsList = new ArrayList<>();
 
-        for (FriendRequest friendRequest : friendRequests) {
-            friendRequestsEmailList.add(friendRequest.getFriendUser().getEmail());
-        }
-
-        FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsEmailList);
-        getRecyclerView().setAdapter(adapter);
-    }
+        //TODO: dummy data to be replaced with data from server
 
-    private void addFriendRequest() {
-        TextInputEditText etEmailFR = getView().findViewById(R.id.text_email);
-
-        if (etEmailFR != null && etEmailFR.getText() != null) {
-            NewFriendRequest newFriendRequest = new NewFriendRequest();
-            newFriendRequest.setEmail(etEmailFR.getText().toString());
-            serverClient.addFriendUser(newFriendRequest);
+        for (int i = 0; i <= 6; i++) {
+            FriendRequest friendRequest = new FriendRequest();
+            FriendUser friendUser = new FriendUser();
+            friendUser.setEmail("dummyuser@dummydomain.com");
+            friendRequest.setFriendUser(friendUser);
+            friendRequest.setStatus(i % 4);
+            friendRequestsList.add(friendRequest);
         }
 
+        FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsList);
+        getRecyclerView().setAdapter(adapter);
     }
 
     @Subscribe
     private void onAddFriendUser(AddFriendUserCompletedEvent event) {
         if (event.isSuccessful()) {
-            Toast.makeText(getContext(), "friend request success", Toast.LENGTH_LONG).show();
             setUpFriendRequestsList();
-        } else {
-            Toast.makeText(getContext(), "friend request failed", Toast.LENGTH_LONG).show();
         }
-
     }
 
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
index b1eaee4f7..469fb5291 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -18,9 +18,10 @@
 import org.amahi.anywhere.adapter.FriendsListAdapter;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.PrimaryUser;
+import org.amahi.anywhere.server.model.FriendUser;
 
 import java.util.ArrayList;
+
 import java.util.List;
 
 import javax.inject.Inject;
@@ -53,7 +54,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
 
-        setUpFriendsList();
+        //setUpFriendsList();
+        showFriendUsers();
     }
 
     private RecyclerView getRecyclerView() {
@@ -67,17 +69,27 @@ private void setUpFriendsList() {
 
     @Subscribe
     private void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
-        showFriendUsers(event.getPrimaryUsers());
+        //showFriendUsers(event.getPrimaryUsers());
     }
 
-    private void showFriendUsers(List<PrimaryUser> primaryUsers) {
-        List<String> friendsEmailList = new ArrayList<>();
+    private void showFriendUsers() {
+        List<FriendUser> friendsList = new ArrayList<>();
+
 
-        for (PrimaryUser primaryUser : primaryUsers) {
+        /*for (PrimaryUser primaryUser : primaryUsers) {
             friendsEmailList.add(primaryUser.getFriendUser().getEmail());
+        }*/
+
+        //TODO: dummy data to be replaced with data from server
+        for (int i = 0; i <= 5; i++) {
+            FriendUser friendUser = new FriendUser();
+            friendUser.setEmail("dummyuser@dummydomain.com");
+            friendUser.setCreatedDate("14-07-2019");
+            friendsList.add(friendUser);
         }
 
-        FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsEmailList);
+
+        FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsList);
         getRecyclerView().setAdapter(adapter);
 
     }
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
index 896e195a1..5389681a1 100644
--- a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
@@ -10,7 +10,7 @@ public class FriendRequest {
     private int id;
 
     @SerializedName("created_at")
-    private Date createdAt;
+    private String createdAt;
 
     @SerializedName("status")
     private int status;
@@ -29,11 +29,11 @@ public void setId(int id) {
         this.id = id;
     }
 
-    public Date getCreatedAt() {
+    public String getCreatedAt() {
         return createdAt;
     }
 
-    public void setCreatedAt(Date createdAt) {
+    public void setCreatedAt(String createdAt) {
         this.createdAt = createdAt;
     }
 
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
index e60c593e7..48517dfdf 100644
--- a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
@@ -9,7 +9,7 @@ public class FriendUser {
     private int id;
 
     @SerializedName("created_at")
-    private Date createdDate;
+    private String createdDate;
 
     @SerializedName("email")
     private String email;
@@ -19,7 +19,7 @@ public int getId() {
         return id;
     }
 
-    public Date getCreatedDate() {
+    public String getCreatedDate() {
         return createdDate;
     }
 
@@ -36,7 +36,7 @@ public void setEmail(String email) {
         this.email = email;
     }
 
-    public void setCreatedDate(Date createdDate) {
+    public void setCreatedDate(String createdDate) {
         this.createdDate = createdDate;
     }
 }
diff --git a/src/main/res/drawable/friend_status_background.xml b/src/main/res/drawable/friend_status_background.xml
new file mode 100644
index 000000000..49ba6fea1
--- /dev/null
+++ b/src/main/res/drawable/friend_status_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/status_active" />
+    <corners
+        android:radius="5dp"
+        android:topRightRadius="30dp"
+        android:topLeftRadius="30dp"
+        android:bottomLeftRadius="30dp"
+        android:bottomRightRadius="30dp" />
+</shape>
diff --git a/src/main/res/drawable/ic_add_friend.xml b/src/main/res/drawable/ic_add_friend.xml
new file mode 100644
index 000000000..c273ca40b
--- /dev/null
+++ b/src/main/res/drawable/ic_add_friend.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/src/main/res/layout/activity_friends.xml b/src/main/res/layout/activity_friends.xml
index 7833a70eb..2fd6c32d7 100644
--- a/src/main/res/layout/activity_friends.xml
+++ b/src/main/res/layout/activity_friends.xml
@@ -1,19 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
-    tools:context=".activity.FriendsActivity"
-    android:orientation="vertical">
-
-    <com.google.android.material.tabs.TabLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/tablayout_friends" />
-
-    <androidx.viewpager.widget.ViewPager
+    tools:context=".activity.FriendsActivity">
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/pager_friends"/>
+        android:orientation="vertical">
 
-</LinearLayout>
+        <com.google.android.material.tabs.TabLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/tablayout_friends"
+            android:background="@color/background_toolbar" />
+
+        <androidx.viewpager.widget.ViewPager
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/pager_friends"/>
+
+    </LinearLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_add_friend"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginBottom="25dp"
+        android:layout_marginEnd="25dp"
+        android:src="@drawable/ic_add_friend"/>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/src/main/res/layout/dialog_add_friend.xml b/src/main/res/layout/dialog_add_friend.xml
new file mode 100644
index 000000000..d73a7b6f1
--- /dev/null
+++ b/src/main/res/layout/dialog_add_friend.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp">
+    <com.google.android.material.textfield.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/email_text_layout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:hint="Registered email of friend">
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/text_email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textEmailAddress"/>
+    </com.google.android.material.textfield.TextInputLayout>
+</RelativeLayout>
diff --git a/src/main/res/layout/fragment_friend_requests.xml b/src/main/res/layout/fragment_friend_requests.xml
index be6077f4b..7ff8ef9db 100644
--- a/src/main/res/layout/fragment_friend_requests.xml
+++ b/src/main/res/layout/fragment_friend_requests.xml
@@ -3,52 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".fragment.FriendRequestsFragment">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/card_add_fr"
-        android:layout_margin="8dp"
-        android:padding="8dp"
-        app:cardCornerRadius="4dp">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/email_text_layout"
-                android:layout_margin="8dp"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:hint="Registered email of friend">
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/text_email"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"/>
-            </com.google.android.material.textfield.TextInputLayout>
-            <Button
-                android:id="@+id/btn_add_fr"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Add Friend"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:layout_below="@+id/email_text_layout"
-                android:background="@color/accent"
-                android:textColor="@android:color/white"/>
-        </RelativeLayout>
-    </androidx.cardview.widget.CardView>
-
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/list_friend_requests"
-        android:layout_below="@+id/card_add_fr"
-        android:layout_margin="8dp"/>
+        android:id="@+id/list_friend_requests" />
 
 </RelativeLayout>
diff --git a/src/main/res/layout/friend_requests_list_item.xml b/src/main/res/layout/friend_requests_list_item.xml
index dae5c2a0f..74ff3f05e 100644
--- a/src/main/res/layout/friend_requests_list_item.xml
+++ b/src/main/res/layout/friend_requests_list_item.xml
@@ -1,14 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="4dp"
+    style="@style/Widget.MaterialComponents.CardView"
+    android:focusable="true"
+    android:clickable="true"
+    android:background="?android:attr/selectableItemBackground"
+    app:cardElevation="4dp"
+    android:layout_margin="4dp"
+    android:padding="8dp">
+    <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/text_friend_request_email"
-        android:padding="8dp"
-        android:textSize="16sp"
-        android:textColor="@color/primary_text"/>
+        android:padding="8dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="3"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_friend_request_email"
+            android:padding="8dp"
+            android:textSize="16sp"
+            android:textColor="@color/primary_text" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:id="@+id/text_friend_request_status"
+            android:text="Accepted"
+            android:layout_gravity="center"
+            android:textSize="14sp"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:background="@drawable/friend_status_background" />
+
+    </LinearLayout>
 
-</LinearLayout>
+</androidx.cardview.widget.CardView>
diff --git a/src/main/res/layout/friends_list_item.xml b/src/main/res/layout/friends_list_item.xml
index e58ec1d09..b1fe3eeb8 100644
--- a/src/main/res/layout/friends_list_item.xml
+++ b/src/main/res/layout/friends_list_item.xml
@@ -1,14 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardCornerRadius="4dp"
+    style="@style/Widget.MaterialComponents.CardView"
+    android:focusable="true"
+    android:clickable="true"
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="horizontal"
+    app:cardElevation="4dp"
+    android:layout_margin="4dp"
+    android:padding="8dp">
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/text_friend_email"
-        android:padding="8dp"
-        android:textSize="16sp"
-        android:textColor="@color/primary_text"/>
+        android:padding="8dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_friend_email"
+            android:textSize="18sp"
+            android:textColor="@color/primary_text"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_friend_created_at"
+            android:text="Friends since 01-08-2018"
+            android:textSize="14sp"/>
+
+
 
-</LinearLayout>
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 68f84ae63..e0b24fe84 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -37,6 +37,14 @@
         <item name="android:elevation">8dp</item>
     </style>
 
+    <style name="Theme.Amahi.ActionBar.NoElevation" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:background">@color/background_toolbar</item>
+        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
+        <!--Adding Support for the Support Library-->
+        <item name="background">@color/background_toolbar</item>
+        <item name="displayOptions">showHome|homeAsUp|showTitle</item>
+    </style>
+
     <style name="Theme.Amahi.NoActionBar">
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index ebd234459..577dd01ed 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -46,4 +46,10 @@
     <color name="intro_4">#26a69a</color>
     <color name="intro_5">#ffab00</color>
     <color name="intro_6">#303f9f</color>
+
+    <!--Friend request status colors-->
+    <color name="status_active">#19B4F4</color>
+    <color name="status_accepted">#4CBB17</color>
+    <color name="status_rejected">#E60000</color>
+    <color name="status_expired">#fad201</color>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 486a0b32a..1d4a30835 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -188,7 +188,11 @@
 
     <string name="download_channel" translatable="false">File Download</string>
     <string name="download_channel_desc" translatable="false">Shows file download progress</string>
-
+    <string name="message_empty_email_add_friend">Email should not be empty</string>
+    <string name="title_add_new_friend">Add New Friend</string>
+    <string name="message_add_new_friend">Friend request will be sent to the provided email</string>
+    <string name="text_button_add_friend">Add Friend</string>
+    <string name="text_cancel">Cancel</string>
 
 
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 87bef4394..425acac57 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -71,6 +71,19 @@
         <item name="elevation">8dp</item>
     </style>
 
+    <style name="Theme.Amahi.Friends" parent="Theme.Amahi">
+        <item name="android:actionBarStyle">@style/Theme.Amahi.ActionBar.NoElevation</item>
+        <item name="actionBarStyle">@style/Theme.Amahi.ActionBar.NoElevation</item>
+    </style>
+
+    <style name="Theme.Amahi.ActionBar.NoElevation" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="android:background">@color/background_toolbar</item>
+        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
+        <!--Adding Support for the Support Library-->
+        <item name="background">@color/background_toolbar</item>
+        <item name="displayOptions">showHome|homeAsUp|showTitle</item>
+    </style>
+
     <style name="DrawerArrowStyle" parent="@style/Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">true</item>
         <item name="color">@color/primary_text</item>

From 8e2ceac281c811cd32412efa41bcae3c464a6f39 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 21 Jul 2019 00:44:45 +0530
Subject: [PATCH 03/16] adds delete friend user, delete and resend friend
 request options

---
 .../adapter/FriendRequestsListAdapter.java    |  28 ++++
 .../anywhere/adapter/FriendsListAdapter.java  |  28 ++++
 .../amahi/anywhere/bus/FriendDeleteEvent.java |   5 +
 .../bus/FriendRequestDeleteEvent.java         |   4 +
 .../bus/FriendRequestResendEvent.java         |   4 +
 .../fragment/AlertDialogFragment.java         | 114 +++++++++++++-
 .../fragment/FriendRequestsFragment.java      | 144 +++++++++++++++---
 .../FriendRequestsOptionsDialogFragment.java  |  44 ++++++
 .../anywhere/fragment/FriendsFragment.java    | 140 +++++++++++++++--
 .../FriendsOptionsDialogFragment.java         |  46 ++++++
 .../amahi/anywhere/server/api/ServerApi.java  |  10 ++
 .../anywhere/server/client/ServerClient.java  |   8 +
 .../org/amahi/anywhere/util/Fragments.java    |  14 ++
 .../util/FriendRequestsItemClickListener.java |  15 ++
 .../util/FriendsItemClickListener.java        |  16 ++
 src/main/res/drawable/ic_resend.xml           |   9 ++
 .../layout/friend_requests_bottom_sheet.xml   |  32 ++++
 .../res/layout/friend_requests_list_item.xml  |  12 +-
 src/main/res/layout/friends_bottom_sheet.xml  |  32 ++++
 src/main/res/layout/friends_list_item.xml     |  50 ++++--
 src/main/res/values/strings.xml               |   5 +
 21 files changed, 712 insertions(+), 48 deletions(-)
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
 create mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
 create mode 100644 src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
 create mode 100644 src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
 create mode 100644 src/main/res/drawable/ic_resend.xml
 create mode 100644 src/main/res/layout/friend_requests_bottom_sheet.xml
 create mode 100644 src/main/res/layout/friends_bottom_sheet.xml

diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
index cd1d6554a..cc866cc9b 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -5,6 +5,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -12,12 +13,15 @@
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
 import java.util.List;
 
 public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
     private List<FriendRequest> friendRequestsList;
     private Context context;
+    private FriendRequestsItemClickListener friendsItemClickListener;
+    private int selectedPosition = RecyclerView.NO_POSITION;
 
     public FriendRequestsListAdapter(Context context, List<FriendRequest> friendRequestsList) {
         this.context = context;
@@ -25,6 +29,23 @@ public FriendRequestsListAdapter(Context context, List<FriendRequest> friendRequ
 
     }
 
+    public void setOnClickListener(FriendRequestsItemClickListener listener) {
+        this.friendsItemClickListener = listener;
+    }
+
+    public int getSelectedPosition() {
+        return selectedPosition;
+    }
+
+    public void setSelectedPosition(int selectedPosition) {
+        this.selectedPosition = selectedPosition;
+    }
+
+    public void removeFriend(int position) {
+        this.friendRequestsList.remove(position);
+        notifyDataSetChanged();
+    }
+
     @NonNull
     @Override
     public FriendRequestsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -63,6 +84,11 @@ public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int p
         drawable.setColor(context.getResources().getColor(colorResourceId));
         holder.friendRequestStatus.setBackground(drawable);
 
+        holder.moreOptions.setOnClickListener(v -> {
+            friendsItemClickListener.onMoreOptionClick(holder.itemView, position);
+
+        });
+
     }
 
     @Override
@@ -73,11 +99,13 @@ public int getItemCount() {
     class FriendRequestsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
         TextView friendRequestStatus;
+        ImageView moreOptions;
 
         FriendRequestsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_request_email);
             friendRequestStatus = itemView.findViewById(R.id.text_friend_request_status);
+            moreOptions = itemView.findViewById(R.id.friend_requests_options);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
index e0e7400d0..21ca08e6d 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -4,6 +4,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -11,12 +12,15 @@
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.util.FriendsItemClickListener;
 
 import java.util.List;
 
 public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
     private List<FriendUser> friendsList;
     private Context context;
+    private FriendsItemClickListener friendsItemClickListener;
+    private int selectedPosition = RecyclerView.NO_POSITION;
 
     public FriendsListAdapter(Context context, List<FriendUser> friendsList) {
         this.context = context;
@@ -24,6 +28,23 @@ public FriendsListAdapter(Context context, List<FriendUser> friendsList) {
 
     }
 
+    public void setOnClickListener(FriendsItemClickListener listener) {
+        this.friendsItemClickListener = listener;
+    }
+
+    public int getSelectedPosition() {
+        return selectedPosition;
+    }
+
+    public void setSelectedPosition(int selectedPosition) {
+        this.selectedPosition = selectedPosition;
+    }
+
+    public void removeFriend(int position) {
+        this.friendsList.remove(position);
+        notifyDataSetChanged();
+    }
+
     @NonNull
     @Override
     public FriendsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -38,6 +59,11 @@ public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position
         builder.append(friendsList.get(position).getCreatedDate());
         holder.createdAt.setText(builder);
 
+        holder.moreOptions.setOnClickListener(v -> {
+            friendsItemClickListener.onMoreOptionClick(holder.itemView, position);
+
+        });
+
     }
 
     @Override
@@ -48,11 +74,13 @@ public int getItemCount() {
     class FriendsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
         TextView createdAt;
+        ImageView moreOptions;
 
         FriendsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_email);
             createdAt = itemView.findViewById(R.id.text_friend_created_at);
+            moreOptions = itemView.findViewById(R.id.friends_more_options);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
new file mode 100644
index 000000000..cb1ccbdab
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
@@ -0,0 +1,5 @@
+package org.amahi.anywhere.bus;
+
+public class FriendDeleteEvent {
+
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
new file mode 100644
index 000000000..8cf007ad8
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class FriendRequestDeleteEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
new file mode 100644
index 000000000..e5b8121ca
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class FreindRequestResendEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
index 78b8fe1a3..08eaf03a4 100644
--- a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
@@ -32,6 +32,8 @@ public class AlertDialogFragment extends DialogFragment implements DialogInterfa
     public static final int DELETE_FILE_DIALOG = 0;
     public static final int DUPLICATE_FILE_DIALOG = 1;
     public static final int ADD_FRIEND_DIALOG = 2;
+    public static final int DELETE_FRIEND_DIALOG = 3;
+    public static final int DELETE_FRIEND_REQUEST_DIALOG = 4;
 
 
     @NonNull
@@ -56,6 +58,12 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             case ADD_FRIEND_DIALOG:
                 buildAddFriendDialog();
                 break;
+            case DELETE_FRIEND_DIALOG:
+                buildDeleteFriendDialog();
+                break;
+
+            case DELETE_FRIEND_REQUEST_DIALOG:
+                buildDeleteFriendRequestDialog();
         }
 
         Dialog dialog = builder.create();
@@ -93,6 +101,20 @@ private void buildAddFriendDialog() {
         builder.setView(v);
     }
 
+    private void buildDeleteFriendDialog() {
+        builder.setTitle(R.string.title_delete_friend)
+            .setMessage(getString(R.string.message_delete_friend))
+            .setPositiveButton(R.string.text_delete, this)
+            .setNegativeButton(getString(R.string.text_cancel), this);
+    }
+
+    private void buildDeleteFriendRequestDialog() {
+        builder.setTitle(getString(R.string.title_delete_friend_request))
+            .setMessage(getString(R.string.message_delete_friend_request))
+            .setPositiveButton(R.string.text_delete, this)
+            .setNegativeButton(R.string.text_cancel, this);
+    }
+
     private void addFriendButtonClickListener(Dialog dialog) {
         dialog.setOnShowListener(dialogInterface -> {
 
@@ -123,13 +145,17 @@ private void addFriendButtonClickListener(Dialog dialog) {
     private void setCursorAndShowKeyboard(TextInputEditText editText) {
         editText.setFocusable(true);
         editText.requestFocus();
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        if (getActivity() != null) {
+            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        }
     }
 
     private void hideKeyboard() {
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
+        if (getActivity() != null) {
+            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
+        }
     }
 
 
@@ -152,6 +178,30 @@ public void onClick(DialogInterface dialog, int which) {
         } else if (dialogType == DELETE_FILE_DIALOG) {
             DeleteFileDialogCallback callback = getDeleteDialogCallback();
 
+            if (callback != null) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    dialog.dismiss();
+                    callback.dialogPositiveButtonOnClick();
+                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
+                    dialog.dismiss();
+                    callback.dialogNegativeButtonOnClick();
+                }
+            }
+        } else if (dialogType == DELETE_FRIEND_DIALOG) {
+            DeleteFriendDialogCallback callback = getDeleteFriendDialogCallback();
+
+            if (callback != null) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    dialog.dismiss();
+                    callback.dialogPositiveButtonOnClick();
+                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
+                    dialog.dismiss();
+                    callback.dialogNegativeButtonOnClick();
+                }
+            }
+        } else if (dialogType == DELETE_FRIEND_REQUEST_DIALOG) {
+            DeleteFriendRequestDialogCallback callback = getDeleteFriendRequestDialogCallback();
+
             if (callback != null) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
                     dialog.dismiss();
@@ -226,6 +276,46 @@ private AddFriendDialogCallback getAddFriendCallback() {
         return callback;
     }
 
+    private DeleteFriendDialogCallback getDeleteFriendDialogCallback() {
+        DeleteFriendDialogCallback callback;
+        if (getTargetFragment() != null) {
+            try {
+                callback = (DeleteFriendDialogCallback) getTargetFragment();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
+                throw e;
+            }
+        } else {
+            try {
+                callback = (DeleteFriendDialogCallback) getActivity();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
+                throw e;
+            }
+        }
+        return callback;
+    }
+
+    private DeleteFriendRequestDialogCallback getDeleteFriendRequestDialogCallback() {
+        DeleteFriendRequestDialogCallback callback;
+        if (getTargetFragment() != null) {
+            try {
+                callback = (DeleteFriendRequestDialogCallback) getTargetFragment();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
+                throw e;
+            }
+        } else {
+            try {
+                callback = (DeleteFriendRequestDialogCallback) getActivity();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
+                throw e;
+            }
+        }
+        return callback;
+    }
+
     public interface DuplicateFileDialogCallback {
 
         void dialogPositiveButtonOnClick(File file);
@@ -247,6 +337,22 @@ public interface AddFriendDialogCallback {
         void dialogPositiveButtonOnClick(String email);
 
 
+        void dialogNegativeButtonOnClick();
+    }
+
+    public interface DeleteFriendDialogCallback {
+
+        void dialogPositiveButtonOnClick();
+
+
+        void dialogNegativeButtonOnClick();
+    }
+
+    public interface DeleteFriendRequestDialogCallback {
+
+        void dialogPositiveButtonOnClick();
+
+
         void dialogNegativeButtonOnClick();
     }
 
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index 2ed55b483..4f2131d59 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -1,7 +1,9 @@
 package org.amahi.anywhere.fragment;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -10,6 +12,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import com.squareup.otto.Subscribe;
 
@@ -17,10 +20,14 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendRequestsListAdapter;
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendRequest;
 import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.util.Fragments;
+import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,10 +37,15 @@
 /**
  * Friend Requests Fragment, shows list of friend requests.
  */
-public class FriendRequestsFragment extends Fragment {
+public class FriendRequestsFragment extends Fragment implements
+    FriendRequestsItemClickListener,
+    AlertDialogFragment.DeleteFriendRequestDialogCallback {
 
     @Inject
     ServerClient serverClient;
+    private ProgressDialog deleteProgressDialog;
+    List<FriendRequest> friendRequestsList;
+    private final static String SELECTED_ITEM = "selected_item";
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -47,12 +59,10 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpInjections();
 
-        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
-
-        setUpFriendRequestsList();
+        setUpFriendRequestsList(savedInstanceState);
 
+        setUpProgressDialog();
 
-        showFriendRequests();
     }
 
     private void setUpInjections() {
@@ -63,19 +73,27 @@ private RecyclerView getRecyclerView() {
         return getView().findViewById(R.id.list_friend_requests);
     }
 
-    private void setUpFriendRequestsList() {
-        if (serverClient.isConnected()) {
+    private void setUpFriendRequestsList(Bundle state) {
+        setUpItemsMenu();
+        /*if (serverClient.isConnected()) {
             serverClient.getFriendRequests();
-        }
+        }*/
+        setUpListAdapter(state);
+        setUpListActions();
+
+
     }
 
-    @Subscribe
-    private void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
-        showFriendRequests();
+    private void setUpItemsMenu() {
+        setHasOptionsMenu(true);
+    }
+
+    private void setUpListActions() {
+        getListAdapter().setOnClickListener(this);
     }
 
-    private void showFriendRequests() {
-        List<FriendRequest> friendRequestsList = new ArrayList<>();
+    private void setUpListAdapter(Bundle state) {
+        friendRequestsList = new ArrayList<>();
 
         //TODO: dummy data to be replaced with data from server
 
@@ -89,14 +107,106 @@ private void showFriendRequests() {
         }
 
         FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsList);
+        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
+
+        if (isStateValid(state)) {
+            getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
+        }
+    }
+
+    private FriendRequestsListAdapter getListAdapter() {
+        return (FriendRequestsListAdapter) getRecyclerView().getAdapter();
+    }
+
+    private boolean isStateValid(Bundle state) {
+        return (state != null) && state.containsKey(SELECTED_ITEM);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        BusProvider.getBus().register(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        BusProvider.getBus().unregister(this);
+    }
+
+
     @Subscribe
-    private void onAddFriendUser(AddFriendUserCompletedEvent event) {
-        if (event.isSuccessful()) {
-            setUpFriendRequestsList();
-        }
+    public void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
+        //setUpListAdapter();
     }
 
+    @Subscribe
+    public void onAddFriendUser(AddFriendUserCompletedEvent event) {
+        /*if (event.isSuccessful()) {
+            setUpListAdapter();
+        }*/
+    }
+
+    @Subscribe
+    public void onDeleteFriendRequest(FriendRequestDeleteEvent event) {
+        deleteFriendRequest();
+    }
+
+    private void deleteFriendRequest() {
+        AlertDialogFragment deleteFriendRequestDialog = new AlertDialogFragment();
+        Bundle bundle = new Bundle();
+        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.DELETE_FRIEND_REQUEST_DIALOG);
+        deleteFriendRequestDialog.setArguments(bundle);
+        deleteFriendRequestDialog.setTargetFragment(this, 2);
+        deleteFriendRequestDialog.show(getFragmentManager(), "delete_friend_request_dialog");
+    }
+
+    @Override
+    public void onItemClick(View view, int position) {
+
+    }
+
+    @Override
+    public void onMoreOptionClick(View view, int position) {
+        getListAdapter().setSelectedPosition(position);
+        Fragments.Builder.buildFriendRequestsOptionsDialogFragment()
+            .show(getChildFragmentManager(), "friend_requests_options_dialog");
+
+
+    }
+
+    private void setUpProgressDialog() {
+        deleteProgressDialog = new ProgressDialog(getContext());
+        deleteProgressDialog.setMessage(getString(R.string.message_delete_progress));
+        deleteProgressDialog.setIndeterminate(true);
+        deleteProgressDialog.setCancelable(false);
+    }
+
+
+    @Override
+    public void dialogPositiveButtonOnClick() {
+
+        int selectedPosition = getListAdapter().getSelectedPosition();
+        //show progress dialog and delete data from server
+        //deleteProgressDialog.show();
+        //serverClient.deleteFriendRequest(friendRequestsList.get(selectedPosition).getId());
+
+        getListAdapter().removeFriend(selectedPosition);
+        Toast.makeText(getContext(), "Friend Request deleted successfully", Toast.LENGTH_LONG).show();
+
+    }
+
+    @Override
+    public void dialogNegativeButtonOnClick() {
+
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(SELECTED_ITEM, getListAdapter().getSelectedPosition());
+    }
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
new file mode 100644
index 000000000..fdf016fee
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
@@ -0,0 +1,44 @@
+package org.amahi.anywhere.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
+
+public class FriendRequestsOptionsDialogFragment extends BottomSheetDialogFragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.friend_requests_bottom_sheet, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        setUpViews(view);
+    }
+
+    private void setUpViews(View view) {
+
+        LinearLayout deleteLayout = view.findViewById(R.id.friend_requests_delete_layout);
+
+        deleteLayout.setOnClickListener(v -> setUpDelete());
+    }
+
+    private void setUpDelete() {
+        BusProvider.getBus().post(new FriendRequestDeleteEvent());
+        dismiss();
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
index 469fb5291..595f1519f 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -1,5 +1,6 @@
 package org.amahi.anywhere.fragment;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -10,15 +11,20 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import com.squareup.otto.Subscribe;
 
 import org.amahi.anywhere.AmahiApplication;
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsListAdapter;
+import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
+import org.amahi.anywhere.bus.FriendDeleteEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.util.Fragments;
+import org.amahi.anywhere.util.FriendsItemClickListener;
 
 import java.util.ArrayList;
 
@@ -29,10 +35,15 @@
 /**
  * Friends Fragment, shows list of friended users.
  */
-public class FriendsFragment extends Fragment {
+public class FriendsFragment extends Fragment implements
+    FriendsItemClickListener,
+    AlertDialogFragment.DeleteFriendDialogCallback {
 
     @Inject
     ServerClient serverClient;
+    private ProgressDialog deleteProgressDialog;
+    private List<FriendUser> friendsList;
+    private final static String SELECTED_ITEM = "selected_item";
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -52,28 +63,45 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpInjections();
 
-        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
+        setUpFriendsList(savedInstanceState);
+
+        setUpProgressDialog();
 
         //setUpFriendsList();
-        showFriendUsers();
+
     }
 
     private RecyclerView getRecyclerView() {
         return (RecyclerView) getView().findViewById(R.id.list_friends);
     }
 
-    private void setUpFriendsList() {
-        serverClient.getFriendUsers();
+    private void setUpFriendsList(Bundle state) {
+        setUpItemsMenu();
+        //setup data from server
+        /*if (serverClient.isConnected()) {
+            serverClient.getFriendUsers();
+        }*/
+        setUpListAdapter(state);
+        setUpListActions();
+
 
     }
 
-    @Subscribe
-    private void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
-        //showFriendUsers(event.getPrimaryUsers());
+    private void setUpItemsMenu() {
+        setHasOptionsMenu(true);
     }
 
-    private void showFriendUsers() {
-        List<FriendUser> friendsList = new ArrayList<>();
+
+    private void setUpListActions() {
+        getListAdapter().setOnClickListener(this);
+    }
+
+    private FriendsListAdapter getListAdapter() {
+        return (FriendsListAdapter) getRecyclerView().getAdapter();
+    }
+
+    private void setUpListAdapter(Bundle state) {
+        friendsList = new ArrayList<>();
 
 
         /*for (PrimaryUser primaryUser : primaryUsers) {
@@ -85,14 +113,104 @@ private void showFriendUsers() {
             FriendUser friendUser = new FriendUser();
             friendUser.setEmail("dummyuser@dummydomain.com");
             friendUser.setCreatedDate("14-07-2019");
+            friendUser.setId(1234);
             friendsList.add(friendUser);
         }
 
-
         FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsList);
+        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
 
+        if (isStateValid(state)) {
+            getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
+        }
+
+
+    }
+
+    private boolean isStateValid(Bundle state) {
+        return (state != null) && state.containsKey(SELECTED_ITEM);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        BusProvider.getBus().register(this);
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        BusProvider.getBus().unregister(this);
+    }
+
+    @Subscribe
+    public void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
+        //setUpListAdapter(event.getPrimaryUsers());
+    }
+
+    @Subscribe
+    public void onDeleteFriend(FriendDeleteEvent event) {
+        deleteFriend();
+
+    }
+
+    private void deleteFriend() {
+        AlertDialogFragment deleteFriendDialog = new AlertDialogFragment();
+        Bundle bundle = new Bundle();
+        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.DELETE_FRIEND_DIALOG);
+        deleteFriendDialog.setArguments(bundle);
+        deleteFriendDialog.setTargetFragment(this, 2);
+        deleteFriendDialog.show(getFragmentManager(), "delete_friend_dialog");
+    }
+
+
+    @Override
+    public void onItemClick(View view, int position) {
+
+    }
+
+    @Override
+    public void onMoreOptionClick(View view, int position) {
+        getListAdapter().setSelectedPosition(position);
+        Fragments.Builder.buildFriendsOptionsDialogFragment()
+            .show(getChildFragmentManager(), "friends_options_dialog");
+
+
+    }
+
+    private void setUpProgressDialog() {
+        deleteProgressDialog = new ProgressDialog(getContext());
+        deleteProgressDialog.setMessage(getString(R.string.message_delete_progress));
+        deleteProgressDialog.setIndeterminate(true);
+        deleteProgressDialog.setCancelable(false);
+    }
+
+    //delete friend confirmation dialog callback methods
+    @Override
+    public void dialogPositiveButtonOnClick() {
+        int selectedPosition = getListAdapter().getSelectedPosition();
+        //delete data from server and show progress dialog
+        //deleteProgressDialog.show();
+        //serverClient.deleteFriendUser(friendsList.get(selectedPosition).getId());
+
+        getListAdapter().removeFriend(selectedPosition);
+        Toast.makeText(getContext(), "Friend deleted successfully", Toast.LENGTH_LONG).show();
+
+    }
+
+    @Override
+    public void dialogNegativeButtonOnClick() {
+
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(SELECTED_ITEM, getListAdapter().getSelectedPosition());
+    }
 
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
new file mode 100644
index 000000000..c3c7d4a72
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
@@ -0,0 +1,46 @@
+package org.amahi.anywhere.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendDeleteEvent;
+
+public class FriendsOptionsDialogFragment extends BottomSheetDialogFragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.friends_bottom_sheet, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        setUpViews(view);
+    }
+
+    private void setUpViews(View view) {
+        LinearLayout deleteLayout = view.findViewById(R.id.friends_delete_layout);
+
+        deleteLayout.setOnClickListener(v -> setUpDelete());
+
+    }
+
+    private void setUpDelete() {
+        BusProvider.getBus().post(new FriendDeleteEvent());
+        dismiss();
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
index 50b14133b..c37a36006 100644
--- a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
+++ b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
@@ -91,4 +91,14 @@ Call<NewFriendRequest> addFriendUser(
     @GET("/frnd/requests")
     Call<List<FriendRequest>> getFriendRequests(
         @Header("Session") String session);
+
+    @DELETE("/frnd/user/")
+    Call<Void> deleteFriendUser(
+        @Header("Session") String session,
+        @Query("id") int id);
+
+    @DELETE("/frnd/request")
+    Call<VerifyError> deleteFriendRequest(
+        @Header("Session") String session,
+        @Query("id") int id);
 }
diff --git a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
index bd11c0108..e57cf7d3d 100644
--- a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
+++ b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
@@ -343,4 +343,12 @@ public void addFriendUser(NewFriendRequest friendRequest) {
     public void getFriendRequests() {
         serverApi.getFriendRequests(server.getSession()).enqueue(new FriendRequestsResponse());
     }
+
+    public void deleteFriendUser(int id) {
+        serverApi.deleteFriendUser(server.getSession(), id);
+    }
+
+    public void deleteFriendRequest(int id) {
+        serverApi.deleteFriendRequest(server.getSession(), id);
+    }
 }
diff --git a/src/main/java/org/amahi/anywhere/util/Fragments.java b/src/main/java/org/amahi/anywhere/util/Fragments.java
index 97d52d05e..70058a52b 100644
--- a/src/main/java/org/amahi/anywhere/util/Fragments.java
+++ b/src/main/java/org/amahi/anywhere/util/Fragments.java
@@ -21,13 +21,17 @@
 
 import android.content.Context;
 import android.os.Bundle;
+
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.amahi.anywhere.fragment.AudioListFragment;
 import org.amahi.anywhere.fragment.FileOptionsDialogFragment;
+import org.amahi.anywhere.fragment.FriendRequestsOptionsDialogFragment;
+import org.amahi.anywhere.fragment.FriendsOptionsDialogFragment;
 import org.amahi.anywhere.fragment.NavigationFragment;
 import org.amahi.anywhere.fragment.ServerAppsFragment;
 import org.amahi.anywhere.fragment.ServerFileAudioFragment;
@@ -187,6 +191,16 @@ public static BottomSheetDialogFragment buildOfflineFileOptionsDialogFragment()
             return fragment;
         }
 
+        public static BottomSheetDialogFragment buildFriendsOptionsDialogFragment() {
+            BottomSheetDialogFragment fragment = new FriendsOptionsDialogFragment();
+            return fragment;
+        }
+
+        public static BottomSheetDialogFragment buildFriendRequestsOptionsDialogFragment() {
+            BottomSheetDialogFragment fragment = new FriendRequestsOptionsDialogFragment();
+            return fragment;
+        }
+
     }
 
     public static final class Operator {
diff --git a/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java b/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
new file mode 100644
index 000000000..0289bc7be
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
@@ -0,0 +1,15 @@
+package org.amahi.anywhere.util;
+
+import android.view.View;
+
+/**
+ * FriendRequestsItemClickListener interface.
+ * Handles onItemClick and onMoreOptionClick for FriendRequestsListAdapter
+ */
+
+public interface FriendRequestsItemClickListener {
+
+    void onItemClick(View view, int position);
+
+    void onMoreOptionClick(View view, int position);
+}
diff --git a/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java b/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
new file mode 100644
index 000000000..8273729c4
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
@@ -0,0 +1,16 @@
+package org.amahi.anywhere.util;
+
+import android.view.View;
+
+/**
+ * FriendsItemClickListener interface.
+ * Handles onItemClick and onMoreOptionClick for FriendsListAdapter
+ */
+
+public interface FriendsItemClickListener {
+
+    void onItemClick(View view, int position);
+
+    void onMoreOptionClick(View view, int position);
+
+}
diff --git a/src/main/res/drawable/ic_resend.xml b/src/main/res/drawable/ic_resend.xml
new file mode 100644
index 000000000..0ff0a64d7
--- /dev/null
+++ b/src/main/res/drawable/ic_resend.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
+</vector>
diff --git a/src/main/res/layout/friend_requests_bottom_sheet.xml b/src/main/res/layout/friend_requests_bottom_sheet.xml
new file mode 100644
index 000000000..c12a333cb
--- /dev/null
+++ b/src/main/res/layout/friend_requests_bottom_sheet.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/friend_requests_delete_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:src="@drawable/ic_delete"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/menu_delete"
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/src/main/res/layout/friend_requests_list_item.xml b/src/main/res/layout/friend_requests_list_item.xml
index 74ff3f05e..9d8526514 100644
--- a/src/main/res/layout/friend_requests_list_item.xml
+++ b/src/main/res/layout/friend_requests_list_item.xml
@@ -19,7 +19,7 @@
 
         <TextView
             android:layout_width="0dp"
-            android:layout_weight="3"
+            android:layout_weight="8"
             android:layout_height="wrap_content"
             android:id="@+id/text_friend_request_email"
             android:padding="8dp"
@@ -28,7 +28,7 @@
 
         <TextView
             android:layout_width="0dp"
-            android:layout_weight="1"
+            android:layout_weight="3"
             android:layout_height="wrap_content"
             android:padding="8dp"
             android:id="@+id/text_friend_request_status"
@@ -39,6 +39,14 @@
             android:textColor="@android:color/white"
             android:background="@drawable/friend_status_background" />
 
+        <ImageView
+            android:id="@+id/friend_requests_options"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/ic_more_vert"
+            android:layout_gravity="center" />
+
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>
diff --git a/src/main/res/layout/friends_bottom_sheet.xml b/src/main/res/layout/friends_bottom_sheet.xml
new file mode 100644
index 000000000..ae07db636
--- /dev/null
+++ b/src/main/res/layout/friends_bottom_sheet.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/friends_delete_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:src="@drawable/ic_delete"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/menu_delete"
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/src/main/res/layout/friends_list_item.xml b/src/main/res/layout/friends_list_item.xml
index b1fe3eeb8..5819ef0c2 100644
--- a/src/main/res/layout/friends_list_item.xml
+++ b/src/main/res/layout/friends_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView 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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -13,26 +14,47 @@
     android:layout_margin="4dp"
     android:padding="8dp">
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
         android:padding="8dp">
-
-        <TextView
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="8"
             android:layout_height="wrap_content"
-            android:id="@+id/text_friend_email"
-            android:textSize="18sp"
-            android:textColor="@color/primary_text"/>
+            android:orientation="vertical">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/text_friend_created_at"
-            android:text="Friends since 01-08-2018"
-            android:textSize="14sp"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/text_friend_email"
+                android:textSize="18sp"
+                android:textColor="@color/primary_text"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/text_friend_created_at"
+                android:gravity="center_vertical"
+                android:paddingEnd="5dp"
+                android:paddingTop="5dp"
+                android:text="Friends since 01-08-2018"
+                android:textSize="14sp"/>
+
+        </LinearLayout>
 
 
 
+        <ImageView
+            android:id="@+id/friends_more_options"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/ic_more_vert"
+            tools:ignore="contentDescription" />
+
     </LinearLayout>
+
+
 </androidx.cardview.widget.CardView>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1d4a30835..c9a6df36f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -193,6 +193,11 @@
     <string name="message_add_new_friend">Friend request will be sent to the provided email</string>
     <string name="text_button_add_friend">Add Friend</string>
     <string name="text_cancel">Cancel</string>
+    <string name="title_delete_friend">Delete Friend</string>
+    <string name="message_delete_friend">The action cannot be undone</string>
+    <string name="text_delete">Delete</string>
+    <string name="title_delete_friend_request">Delete Friend Request</string>
+    <string name="message_delete_friend_request">This action cannot be undone</string>
 
 
 </resources>

From 84ba455948e56e72047826470ee85c915ea2d780 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 21 Jul 2019 00:49:29 +0530
Subject: [PATCH 04/16] adds resend friend request option

---
 .../bus/FriendRequestResendEvent.java         |  2 +-
 .../fragment/FriendRequestsFragment.java      | 16 +++++++++++++
 .../FriendRequestsOptionsDialogFragment.java  |  9 ++++++++
 .../layout/friend_requests_bottom_sheet.xml   | 23 +++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
index e5b8121ca..f40fcdef3 100644
--- a/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
@@ -1,4 +1,4 @@
 package org.amahi.anywhere.bus;
 
-public class FreindRequestResendEvent {
+public class FriendRequestResendEvent {
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index 4f2131d59..e5692bb63 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -22,6 +22,7 @@
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
+import org.amahi.anywhere.bus.FriendRequestResendEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendRequest;
@@ -155,6 +156,11 @@ public void onDeleteFriendRequest(FriendRequestDeleteEvent event) {
         deleteFriendRequest();
     }
 
+    @Subscribe
+    public void onResendFriendRequest(FriendRequestResendEvent event) {
+        resendFriendRequest();
+    }
+
     private void deleteFriendRequest() {
         AlertDialogFragment deleteFriendRequestDialog = new AlertDialogFragment();
         Bundle bundle = new Bundle();
@@ -164,6 +170,16 @@ private void deleteFriendRequest() {
         deleteFriendRequestDialog.show(getFragmentManager(), "delete_friend_request_dialog");
     }
 
+    private void resendFriendRequest() {
+        int position = getListAdapter().getSelectedPosition();
+
+        friendRequestsList.get(position).setStatus(0);
+        //set other variables like lastRequestedAt
+        getListAdapter().notifyItemChanged(position);
+
+        Toast.makeText(getContext(), "Friend request resent successfully!", Toast.LENGTH_LONG).show();
+    }
+
     @Override
     public void onItemClick(View view, int position) {
 
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
index fdf016fee..31e5b6899 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
@@ -14,6 +14,7 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
+import org.amahi.anywhere.bus.FriendRequestResendEvent;
 
 public class FriendRequestsOptionsDialogFragment extends BottomSheetDialogFragment {
 
@@ -33,12 +34,20 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     private void setUpViews(View view) {
 
         LinearLayout deleteLayout = view.findViewById(R.id.friend_requests_delete_layout);
+        LinearLayout resendLayout = view.findViewById(R.id.friend_requests_resend_layout);
 
         deleteLayout.setOnClickListener(v -> setUpDelete());
+
+        resendLayout.setOnClickListener(v -> setUpResend());
     }
 
     private void setUpDelete() {
         BusProvider.getBus().post(new FriendRequestDeleteEvent());
         dismiss();
     }
+
+    private void setUpResend() {
+        BusProvider.getBus().post(new FriendRequestResendEvent());
+        dismiss();
+    }
 }
diff --git a/src/main/res/layout/friend_requests_bottom_sheet.xml b/src/main/res/layout/friend_requests_bottom_sheet.xml
index c12a333cb..e08b43d21 100644
--- a/src/main/res/layout/friend_requests_bottom_sheet.xml
+++ b/src/main/res/layout/friend_requests_bottom_sheet.xml
@@ -29,4 +29,27 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/friend_requests_resend_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:src="@drawable/ic_resend"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Resend"
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
 </LinearLayout>

From 43baf1244e34ba5085d9ed0805ac6b6c3dd23fdd Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 28 Jul 2019 03:28:19 +0530
Subject: [PATCH 05/16] changes pojo files according to changed json format
 from test server

---
 .../anywhere/activity/FriendsActivity.java    |  45 +++++-
 .../adapter/FriendRequestsListAdapter.java    |   8 +-
 .../anywhere/adapter/FriendsListAdapter.java  |   8 +-
 .../bus/AddFriendUserCompletedEvent.java      |  20 ++-
 .../bus/AddFriendUserFailedEvent.java         |   4 +
 .../bus/DeleteFriendCompletedEvent.java       |  23 +++
 .../anywhere/bus/DeleteFriendFailedEvent.java |   4 +
 .../DeleteFriendRequestCompletedEvent.java    |  19 +++
 .../bus/DeleteFriendRequestFailedEvent.java   |   4 +
 .../bus/FriendRequestsLoadedEvent.java        |   8 +-
 .../anywhere/bus/FriendUsersLoadedEvent.java  |  16 +-
 .../anywhere/bus/ResendFriendFailedEvent.java |   4 +
 .../ResendFriendRequestCompletedEvent.java    |  23 +++
 .../fragment/FriendRequestsFragment.java      | 102 +++++++------
 .../anywhere/fragment/FriendsFragment.java    |  59 ++++----
 .../amahi/anywhere/server/api/ServerApi.java  |  47 +++---
 .../anywhere/server/client/ServerClient.java  |  35 +++--
 .../model/DeleteFriendRequestResponse.java    |  37 +++++
 .../server/model/DeleteFriendResponse.java    |  37 +++++
 .../anywhere/server/model/FriendRequest.java  |  65 --------
 .../server/model/FriendRequestItem.java       | 143 ++++++++++++++++++
 .../server/model/FriendRequestResponse.java   |  39 +++++
 .../anywhere/server/model/FriendUser.java     |  42 -----
 .../anywhere/server/model/FriendUserItem.java |  85 +++++++++++
 .../server/model/FriendUserResponse.java      |  39 +++++
 .../server/model/NewFriendRequest.java        |  54 +++++--
 .../model/NewFriendRequestResponse.java       |  49 ++++++
 .../server/model/PostFriendRequest.java       |  28 ++++
 .../anywhere/server/model/PrimaryUser.java    |  29 ----
 .../model/ResendFriendRequestResponse.java    |  37 +++++
 .../response/AddFriendUserResponse.java       |  26 ++--
 .../response/FriendRequestDeleteResponse.java |  29 ++++
 .../response/FriendRequestResendResponse.java |  32 ++++
 .../response/FriendRequestsResponse.java      |  18 +--
 .../response/FriendUserDeleteResponse.java    |  31 ++++
 .../server/response/FriendUsersResponse.java  |  25 +--
 src/main/res/drawable-notnight/ic_friends.xml |   9 ++
 src/main/res/drawable/ic_friends.xml          |  10 ++
 src/main/res/layout/fragment_navigation.xml   |   2 +-
 src/main/res/values/strings.xml               |   2 +
 40 files changed, 968 insertions(+), 329 deletions(-)
 create mode 100644 src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/DeleteFriendRequestResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/DeleteFriendResponse.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendRequestItem.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendRequestResponse.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendUser.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendUserItem.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendUserResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/NewFriendRequestResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/PostFriendRequest.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/ResendFriendRequestResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
 create mode 100644 src/main/res/drawable-notnight/ic_friends.xml
 create mode 100644 src/main/res/drawable/ic_friends.xml

diff --git a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
index fffe343fb..e0e0279bb 100644
--- a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
+++ b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
@@ -4,6 +4,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.widget.Toast;
@@ -16,11 +17,12 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsPagerAdapter;
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.fragment.AlertDialogFragment;
 import org.amahi.anywhere.fragment.FriendRequestsFragment;
 import org.amahi.anywhere.fragment.FriendsFragment;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.PostFriendRequest;
 import org.amahi.anywhere.util.Fragments;
 
 import java.util.ArrayList;
@@ -33,6 +35,7 @@ public class FriendsActivity extends AppCompatActivity
 
     @Inject
     ServerClient serverClient;
+    private ProgressDialog progressDialog;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -86,7 +89,6 @@ private void showAddFriendDialog() {
 
     }
 
-
     @Override
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch (menuItem.getItemId()) {
@@ -128,14 +130,40 @@ private TabLayout getTabLayout() {
     }
 
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        BusProvider.getBus().register(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        BusProvider.getBus().unregister(this);
+    }
+
+
+    //add friend dialog onclick
     @Override
     public void dialogPositiveButtonOnClick(String email) {
         if (serverClient.isConnected()) {
             addFriendRequest(email);
+            showProgressDialog(getString(R.string.message_add_friend_user));
         }
+
         //TODO: connect server if not connected
     }
 
+    private void showProgressDialog(String message) {
+        progressDialog = new ProgressDialog(this);
+        progressDialog.setMessage(message);
+        progressDialog.setIndeterminate(true);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+    }
+
     @Override
     public void dialogNegativeButtonOnClick() {
 
@@ -144,8 +172,10 @@ public void dialogNegativeButtonOnClick() {
     private void addFriendRequest(String email) {
 
         if (email != null) {
-            NewFriendRequest newFriendRequest = new NewFriendRequest();
+            PostFriendRequest newFriendRequest = new PostFriendRequest();
             newFriendRequest.setEmail(email);
+            //TODO: set proper pin
+            newFriendRequest.setPin(1234);
             serverClient.addFriendUser(newFriendRequest);
         }
 
@@ -153,12 +183,11 @@ private void addFriendRequest(String email) {
 
 
     @Subscribe
-    private void onAddFriendUser(AddFriendUserCompletedEvent event) {
-        if (event.isSuccessful()) {
-            Toast.makeText(this, "friend request success", Toast.LENGTH_LONG).show();
-        } else {
-            Toast.makeText(this, "friend request failed", Toast.LENGTH_LONG).show();
+    public void onAddFriendUser(AddFriendUserCompletedEvent event) {
+        if (progressDialog.isShowing()) {
+            progressDialog.dismiss();
         }
+        Toast.makeText(this, event.getMessage(), Toast.LENGTH_LONG).show();
 
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
index cc866cc9b..8aeb7ef6a 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -12,18 +12,18 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.amahi.anywhere.R;
-import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.server.model.FriendRequestItem;
 import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
 import java.util.List;
 
 public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
-    private List<FriendRequest> friendRequestsList;
+    private List<FriendRequestItem> friendRequestsList;
     private Context context;
     private FriendRequestsItemClickListener friendsItemClickListener;
     private int selectedPosition = RecyclerView.NO_POSITION;
 
-    public FriendRequestsListAdapter(Context context, List<FriendRequest> friendRequestsList) {
+    public FriendRequestsListAdapter(Context context, List<FriendRequestItem> friendRequestsList) {
         this.context = context;
         this.friendRequestsList = friendRequestsList;
 
@@ -54,7 +54,7 @@ public FriendRequestsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent
 
     @Override
     public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int position) {
-        holder.friendEmailText.setText(friendRequestsList.get(position).getFriendUser().getEmail());
+        holder.friendEmailText.setText(friendRequestsList.get(position).getEmail());
         int status = friendRequestsList.get(position).getStatus();
 
         //set status text and color based on status value
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
index 21ca08e6d..9c862dbb7 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -11,18 +11,18 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.amahi.anywhere.R;
-import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.server.model.FriendUserItem;
 import org.amahi.anywhere.util.FriendsItemClickListener;
 
 import java.util.List;
 
 public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
-    private List<FriendUser> friendsList;
+    private List<FriendUserItem> friendsList;
     private Context context;
     private FriendsItemClickListener friendsItemClickListener;
     private int selectedPosition = RecyclerView.NO_POSITION;
 
-    public FriendsListAdapter(Context context, List<FriendUser> friendsList) {
+    public FriendsListAdapter(Context context, List<FriendUserItem> friendsList) {
         this.context = context;
         this.friendsList = friendsList;
 
@@ -56,7 +56,7 @@ public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position
         holder.friendEmailText.setText(friendsList.get(position).getEmail());
         StringBuilder builder = new StringBuilder();
         builder.append("Friends since ");
-        builder.append(friendsList.get(position).getCreatedDate());
+        builder.append(friendsList.get(position).getCreatedAt());
         holder.createdAt.setText(builder);
 
         holder.moreOptions.setOnClickListener(v -> {
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
index 61a49f097..246595b15 100644
--- a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
@@ -1,14 +1,24 @@
 package org.amahi.anywhere.bus;
 
 public class AddFriendUserCompletedEvent implements BusEvent {
-    public boolean isSuccessful;
+    private String message;
+    private Boolean success;
 
-    public boolean isSuccessful() {
-        return isSuccessful;
+    public AddFriendUserCompletedEvent(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
     }
 
-    public AddFriendUserCompletedEvent(boolean isSuccessful) {
-        this.isSuccessful = isSuccessful;
+    public Boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
     }
 
 
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
new file mode 100644
index 000000000..15cb56965
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class AddFriendUserFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
new file mode 100644
index 000000000..d783a78f6
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
@@ -0,0 +1,23 @@
+package org.amahi.anywhere.bus;
+
+public class DeleteFriendCompletedEvent implements BusEvent {
+    private String message;
+    private Boolean success;
+
+    public DeleteFriendCompletedEvent(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
+    }
+
+    public Boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
new file mode 100644
index 000000000..7b8f2e948
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class DeleteFriendFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
new file mode 100644
index 000000000..bb209a11e
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
@@ -0,0 +1,19 @@
+package org.amahi.anywhere.bus;
+
+public class DeleteFriendRequestCompletedEvent implements BusEvent {
+    private Boolean success;
+    private String message;
+
+    public DeleteFriendRequestCompletedEvent(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
+    }
+
+    public Boolean isSuccess() {
+        return success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
new file mode 100644
index 000000000..fcf860e5f
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class DeleteFriendRequestFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
index a81cf6736..2c585e7b5 100644
--- a/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
@@ -1,18 +1,18 @@
 package org.amahi.anywhere.bus;
 
 
-import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.server.model.FriendRequestItem;
 
 import java.util.List;
 
 public class FriendRequestsLoadedEvent implements BusEvent {
-    private final List<FriendRequest> friendRequests;
+    private final List<FriendRequestItem> friendRequests;
 
-    public FriendRequestsLoadedEvent(List<FriendRequest> friendRequests) {
+    public FriendRequestsLoadedEvent(List<FriendRequestItem> friendRequests) {
         this.friendRequests = friendRequests;
     }
 
-    public List<FriendRequest> getFriendRequests() {
+    public List<FriendRequestItem> getFriendRequests() {
         return friendRequests;
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
index e21ce0c78..69210e354 100644
--- a/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
@@ -1,17 +1,21 @@
 package org.amahi.anywhere.bus;
 
-import org.amahi.anywhere.server.model.PrimaryUser;
+import android.util.Log;
+
+import org.amahi.anywhere.server.model.FriendUserItem;
 
 import java.util.List;
 
 public class FriendUsersLoadedEvent implements BusEvent {
-    private final List<PrimaryUser> primaryUsers;
+    private final List<FriendUserItem> friendUsers;
+
+    public FriendUsersLoadedEvent(List<FriendUserItem> friendUsers) {
+        this.friendUsers = friendUsers;
 
-    public FriendUsersLoadedEvent(List<PrimaryUser> primaryUsers) {
-        this.primaryUsers = primaryUsers;
     }
 
-    public List<PrimaryUser> getPrimaryUsers() {
-        return primaryUsers;
+    public List<FriendUserItem> getFriendUsers() {
+        Log.d("entered", "getLEFriendUsrs:");
+        return friendUsers;
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
new file mode 100644
index 000000000..b2ff3bcff
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class ResendFriendFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
new file mode 100644
index 000000000..a0a74db15
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
@@ -0,0 +1,23 @@
+package org.amahi.anywhere.bus;
+
+public class ResendFriendRequestCompletedEvent {
+    private String message;
+    private Boolean success;
+
+    public ResendFriendRequestCompletedEvent(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
+    }
+
+    public Boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index e5692bb63..f497837c4 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -21,12 +21,13 @@
 import org.amahi.anywhere.adapter.FriendRequestsListAdapter;
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
 import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.DeleteFriendRequestCompletedEvent;
 import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
 import org.amahi.anywhere.bus.FriendRequestResendEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
+import org.amahi.anywhere.bus.ResendFriendRequestCompletedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.FriendRequest;
-import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.server.model.FriendRequestItem;
 import org.amahi.anywhere.util.Fragments;
 import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
@@ -44,8 +45,8 @@ public class FriendRequestsFragment extends Fragment implements
 
     @Inject
     ServerClient serverClient;
-    private ProgressDialog deleteProgressDialog;
-    List<FriendRequest> friendRequestsList;
+    private ProgressDialog progressDialog;
+    private List<FriendRequestItem> friendRequestsList = new ArrayList<>();
     private final static String SELECTED_ITEM = "selected_item";
 
     @Override
@@ -62,8 +63,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpFriendRequestsList(savedInstanceState);
 
-        setUpProgressDialog();
-
     }
 
     private void setUpInjections() {
@@ -76,11 +75,11 @@ private RecyclerView getRecyclerView() {
 
     private void setUpFriendRequestsList(Bundle state) {
         setUpItemsMenu();
-        /*if (serverClient.isConnected()) {
+        if (serverClient.isConnected()) {
             serverClient.getFriendRequests();
-        }*/
-        setUpListAdapter(state);
-        setUpListActions();
+        }
+        setUpListAdapter();
+        setUpSelectedItem(state);
 
 
     }
@@ -93,24 +92,15 @@ private void setUpListActions() {
         getListAdapter().setOnClickListener(this);
     }
 
-    private void setUpListAdapter(Bundle state) {
-        friendRequestsList = new ArrayList<>();
-
-        //TODO: dummy data to be replaced with data from server
-
-        for (int i = 0; i <= 6; i++) {
-            FriendRequest friendRequest = new FriendRequest();
-            FriendUser friendUser = new FriendUser();
-            friendUser.setEmail("dummyuser@dummydomain.com");
-            friendRequest.setFriendUser(friendUser);
-            friendRequest.setStatus(i % 4);
-            friendRequestsList.add(friendRequest);
-        }
+    private void setUpListAdapter() {
 
         FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsList);
         getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
+        setUpListActions();
+    }
 
+    private void setUpSelectedItem(Bundle state) {
         if (isStateValid(state)) {
             getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
         }
@@ -141,14 +131,15 @@ public void onPause() {
 
     @Subscribe
     public void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
-        //setUpListAdapter();
+        friendRequestsList = event.getFriendRequests();
+        setUpListAdapter();
     }
 
     @Subscribe
     public void onAddFriendUser(AddFriendUserCompletedEvent event) {
-        /*if (event.isSuccessful()) {
-            setUpListAdapter();
-        }*/
+        if (event.isSuccess()) {
+            getListAdapter().notifyDataSetChanged();
+        }
     }
 
     @Subscribe
@@ -161,6 +152,33 @@ public void onResendFriendRequest(FriendRequestResendEvent event) {
         resendFriendRequest();
     }
 
+    @Subscribe
+    public void onDeleteFriendRequestCompleted(DeleteFriendRequestCompletedEvent event) {
+        if (event.isSuccess()) {
+            getListAdapter().removeFriend(getListAdapter().getSelectedPosition());
+        }
+        if(progressDialog.isShowing()) {
+            progressDialog.dismiss();
+        }
+        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
+    }
+
+    @Subscribe
+    public void onResendFriendRequestCompleted(ResendFriendRequestCompletedEvent event) {
+        if(event.isSuccess()) {
+            int position = getListAdapter().getSelectedPosition();
+
+            friendRequestsList.get(position).setStatus(0);
+            //set other variables like lastRequestedAt
+            getListAdapter().notifyItemChanged(position);
+        }
+        if(progressDialog.isShowing()) {
+            progressDialog.dismiss();
+        }
+
+        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
+    }
+
     private void deleteFriendRequest() {
         AlertDialogFragment deleteFriendRequestDialog = new AlertDialogFragment();
         Bundle bundle = new Bundle();
@@ -172,12 +190,8 @@ private void deleteFriendRequest() {
 
     private void resendFriendRequest() {
         int position = getListAdapter().getSelectedPosition();
-
-        friendRequestsList.get(position).setStatus(0);
-        //set other variables like lastRequestedAt
-        getListAdapter().notifyItemChanged(position);
-
-        Toast.makeText(getContext(), "Friend request resent successfully!", Toast.LENGTH_LONG).show();
+        showProgressDialog(getString(R.string.message_resend_progress));
+        serverClient.resendFriendRequest(friendRequestsList.get(position).getId());
     }
 
     @Override
@@ -194,25 +208,21 @@ public void onMoreOptionClick(View view, int position) {
 
     }
 
-    private void setUpProgressDialog() {
-        deleteProgressDialog = new ProgressDialog(getContext());
-        deleteProgressDialog.setMessage(getString(R.string.message_delete_progress));
-        deleteProgressDialog.setIndeterminate(true);
-        deleteProgressDialog.setCancelable(false);
+    private void showProgressDialog(String message) {
+        progressDialog = new ProgressDialog(getContext());
+        progressDialog.setMessage(message);
+        progressDialog.setIndeterminate(true);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
     }
 
 
+    //delete friend request dialog listeners
     @Override
     public void dialogPositiveButtonOnClick() {
-
         int selectedPosition = getListAdapter().getSelectedPosition();
-        //show progress dialog and delete data from server
-        //deleteProgressDialog.show();
-        //serverClient.deleteFriendRequest(friendRequestsList.get(selectedPosition).getId());
-
-        getListAdapter().removeFriend(selectedPosition);
-        Toast.makeText(getContext(), "Friend Request deleted successfully", Toast.LENGTH_LONG).show();
-
+        showProgressDialog(getString(R.string.message_delete_progress));
+        serverClient.deleteFriendRequest(friendRequestsList.get(selectedPosition).getId());
     }
 
     @Override
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
index 595f1519f..52edd69fa 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -19,10 +19,11 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsListAdapter;
 import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.DeleteFriendCompletedEvent;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
 import org.amahi.anywhere.bus.FriendDeleteEvent;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.server.model.FriendUserItem;
 import org.amahi.anywhere.util.Fragments;
 import org.amahi.anywhere.util.FriendsItemClickListener;
 
@@ -42,7 +43,7 @@ public class FriendsFragment extends Fragment implements
     @Inject
     ServerClient serverClient;
     private ProgressDialog deleteProgressDialog;
-    private List<FriendUser> friendsList;
+    private List<FriendUserItem> friendsList = new ArrayList<>();
     private final static String SELECTED_ITEM = "selected_item";
 
     @Override
@@ -67,7 +68,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpProgressDialog();
 
-        //setUpFriendsList();
 
     }
 
@@ -77,12 +77,11 @@ private RecyclerView getRecyclerView() {
 
     private void setUpFriendsList(Bundle state) {
         setUpItemsMenu();
-        //setup data from server
-        /*if (serverClient.isConnected()) {
+        if (serverClient.isConnected()) {
             serverClient.getFriendUsers();
-        }*/
-        setUpListAdapter(state);
-        setUpListActions();
+        }
+        setUpListAdapter();
+        setUpSelectedItem(state);
 
 
     }
@@ -100,32 +99,20 @@ private FriendsListAdapter getListAdapter() {
         return (FriendsListAdapter) getRecyclerView().getAdapter();
     }
 
-    private void setUpListAdapter(Bundle state) {
-        friendsList = new ArrayList<>();
-
 
-        /*for (PrimaryUser primaryUser : primaryUsers) {
-            friendsEmailList.add(primaryUser.getFriendUser().getEmail());
-        }*/
-
-        //TODO: dummy data to be replaced with data from server
-        for (int i = 0; i <= 5; i++) {
-            FriendUser friendUser = new FriendUser();
-            friendUser.setEmail("dummyuser@dummydomain.com");
-            friendUser.setCreatedDate("14-07-2019");
-            friendUser.setId(1234);
-            friendsList.add(friendUser);
-        }
+    private void setUpListAdapter() {
 
         FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsList);
         getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
 
+        setUpListActions();
+    }
+
+    private void setUpSelectedItem(Bundle state) {
         if (isStateValid(state)) {
             getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
         }
-
-
     }
 
     private boolean isStateValid(Bundle state) {
@@ -148,7 +135,8 @@ public void onPause() {
 
     @Subscribe
     public void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
-        //setUpListAdapter(event.getPrimaryUsers());
+        friendsList = event.getFriendUsers();
+        setUpListAdapter();
     }
 
     @Subscribe
@@ -157,6 +145,18 @@ public void onDeleteFriend(FriendDeleteEvent event) {
 
     }
 
+    @Subscribe
+    public void onDeleteFriendCompleted(DeleteFriendCompletedEvent event) {
+
+        if (event.isSuccess()) {
+            getListAdapter().removeFriend(getListAdapter().getSelectedPosition());
+        }
+        if (deleteProgressDialog.isShowing()) {
+            deleteProgressDialog.dismiss();
+        }
+        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
+    }
+
     private void deleteFriend() {
         AlertDialogFragment deleteFriendDialog = new AlertDialogFragment();
         Bundle bundle = new Bundle();
@@ -193,11 +193,8 @@ private void setUpProgressDialog() {
     public void dialogPositiveButtonOnClick() {
         int selectedPosition = getListAdapter().getSelectedPosition();
         //delete data from server and show progress dialog
-        //deleteProgressDialog.show();
-        //serverClient.deleteFriendUser(friendsList.get(selectedPosition).getId());
-
-        getListAdapter().removeFriend(selectedPosition);
-        Toast.makeText(getContext(), "Friend deleted successfully", Toast.LENGTH_LONG).show();
+        deleteProgressDialog.show();
+        serverClient.deleteFriendUser(friendsList.get(selectedPosition).getId());
 
     }
 
diff --git a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
index c37a36006..81f90f743 100644
--- a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
+++ b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
@@ -19,9 +19,13 @@
 
 package org.amahi.anywhere.server.api;
 
-import org.amahi.anywhere.server.model.FriendRequest;
-import org.amahi.anywhere.server.model.NewFriendRequest;
-import org.amahi.anywhere.server.model.PrimaryUser;
+import org.amahi.anywhere.server.model.DeleteFriendRequestResponse;
+import org.amahi.anywhere.server.model.DeleteFriendResponse;
+import org.amahi.anywhere.server.model.FriendRequestResponse;
+import org.amahi.anywhere.server.model.FriendUserResponse;
+import org.amahi.anywhere.server.model.NewFriendRequestResponse;
+import org.amahi.anywhere.server.model.PostFriendRequest;
+import org.amahi.anywhere.server.model.ResendFriendRequestResponse;
 import org.amahi.anywhere.server.model.ServerApp;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
@@ -38,7 +42,9 @@
 import retrofit2.http.Header;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
+import retrofit2.http.PUT;
 import retrofit2.http.Part;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 /**
@@ -80,25 +86,30 @@ Call<List<ServerApp>> getApps(
         @Header("Session") String session);
 
     @GET("/frnd/users")
-    Call<List<PrimaryUser>> getFriendUsers(
-        @Header("Session") String session);
+    Call<FriendUserResponse> getFriendUsers(
+        @Header("api-key") String apiKey);
 
     @POST("/frnd/request")
-    Call<NewFriendRequest> addFriendUser(
-        @Header("Session") String session,
-        @Body NewFriendRequest friendRequest);
+    Call<NewFriendRequestResponse> addFriendUser(
+        @Header("api-key") String apiKey,
+        @Body PostFriendRequest friendRequest);
 
     @GET("/frnd/requests")
-    Call<List<FriendRequest>> getFriendRequests(
-        @Header("Session") String session);
+    Call<FriendRequestResponse> getFriendRequests(
+        @Header("api-key") String apiKey);
 
-    @DELETE("/frnd/user/")
-    Call<Void> deleteFriendUser(
-        @Header("Session") String session,
-        @Query("id") int id);
+    @DELETE("/frnd/user/{id}")
+    Call<DeleteFriendResponse> deleteFriendUser(
+        @Header("api-key") String apiKey,
+        @Path("id") int id);
 
-    @DELETE("/frnd/request")
-    Call<VerifyError> deleteFriendRequest(
-        @Header("Session") String session,
-        @Query("id") int id);
+    @DELETE("/frnd/request/{id}")
+    Call<DeleteFriendRequestResponse> deleteFriendRequest(
+        @Header("api-key") String apiKey,
+        @Path("id") int id);
+
+    @PUT("/frnd/request/{id}/resend")
+    Call<ResendFriendRequestResponse> resendFriendRequest(
+        @Header("api-key") String key,
+        @Path("id") int id);
 }
diff --git a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
index e57cf7d3d..dd2a120d5 100644
--- a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
+++ b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
@@ -38,14 +38,17 @@
 import org.amahi.anywhere.server.ApiConnection;
 import org.amahi.anywhere.server.api.ProxyApi;
 import org.amahi.anywhere.server.api.ServerApi;
-import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.PostFriendRequest;
 import org.amahi.anywhere.server.model.Server;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
 import org.amahi.anywhere.server.model.ServerRoute;
 import org.amahi.anywhere.server.model.ServerShare;
 import org.amahi.anywhere.server.response.AddFriendUserResponse;
+import org.amahi.anywhere.server.response.FriendRequestDeleteResponse;
+import org.amahi.anywhere.server.response.FriendRequestResendResponse;
 import org.amahi.anywhere.server.response.FriendRequestsResponse;
+import org.amahi.anywhere.server.response.FriendUserDeleteResponse;
 import org.amahi.anywhere.server.response.FriendUsersResponse;
 import org.amahi.anywhere.server.response.ServerAppsResponse;
 import org.amahi.anywhere.server.response.ServerFileDeleteResponse;
@@ -89,6 +92,9 @@ public class ServerClient {
     private String serverAddress;
     private ApiConnection serverConnection;
 
+    private static final String BASE_URL = "https://friending-testing.herokuapp.com";
+    private static final String apiKey = "abcdef";
+
     private int network;
 
     @Inject
@@ -133,7 +139,7 @@ private boolean isServerRouteLoaded() {
     }
 
     private void startServerConnectionDetection() {
-        this.serverAddress = serverRoute.getLocalAddress();
+        this.serverAddress = BASE_URL;
         this.serverApi = buildServerApi();
 
         ServerConnectionDetectingTask.execute(serverRoute);
@@ -145,7 +151,8 @@ private ServerApi buildServerApi() {
 
     @Subscribe
     public void onServerConnectionDetected(ServerConnectionDetectedEvent event) {
-        this.serverAddress = event.getServerAddress();
+        this.serverAddress = BASE_URL;
+        //this.serverAddress = event.getServerAddress();
         this.serverApi = buildServerApi();
 
         finishServerConnectionDetection();
@@ -224,7 +231,8 @@ public void connectLocal() {
         if (!isServerRouteLoaded()) {
             return;
         }
-        this.serverAddress = serverRoute.getLocalAddress();
+        this.serverAddress = BASE_URL;
+        //this.serverAddress = serverRoute.getLocalAddress();
         this.serverApi = buildServerApi();
         finishServerConnectionDetection();
     }
@@ -234,7 +242,8 @@ public void connectRemote() {
         if (!isServerRouteLoaded()) {
             return;
         }
-        this.serverAddress = serverRoute.getRemoteAddress();
+        this.serverAddress = BASE_URL;
+        //this.serverAddress = serverRoute.getRemoteAddress();
         this.serverApi = buildServerApi();
         finishServerConnectionDetection();
     }
@@ -333,22 +342,26 @@ public void getApps() {
     }
 
     public void getFriendUsers() {
-        serverApi.getFriendUsers(server.getSession()).enqueue(new FriendUsersResponse());
+        serverApi.getFriendUsers(apiKey).enqueue(new FriendUsersResponse());
     }
 
-    public void addFriendUser(NewFriendRequest friendRequest) {
-        serverApi.addFriendUser(server.getSession(), friendRequest).enqueue(new AddFriendUserResponse());
+    public void addFriendUser(PostFriendRequest friendRequest) {
+        serverApi.addFriendUser(apiKey, friendRequest).enqueue(new AddFriendUserResponse());
     }
 
     public void getFriendRequests() {
-        serverApi.getFriendRequests(server.getSession()).enqueue(new FriendRequestsResponse());
+        serverApi.getFriendRequests(apiKey).enqueue(new FriendRequestsResponse());
     }
 
     public void deleteFriendUser(int id) {
-        serverApi.deleteFriendUser(server.getSession(), id);
+        serverApi.deleteFriendUser(apiKey, id).enqueue(new FriendUserDeleteResponse());
     }
 
     public void deleteFriendRequest(int id) {
-        serverApi.deleteFriendRequest(server.getSession(), id);
+        serverApi.deleteFriendRequest(apiKey, id).enqueue(new FriendRequestDeleteResponse());
+    }
+
+    public void resendFriendRequest(int id) {
+        serverApi.resendFriendRequest(apiKey, id).enqueue(new FriendRequestResendResponse());
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/server/model/DeleteFriendRequestResponse.java b/src/main/java/org/amahi/anywhere/server/model/DeleteFriendRequestResponse.java
new file mode 100644
index 000000000..29bda1132
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/DeleteFriendRequestResponse.java
@@ -0,0 +1,37 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class DeleteFriendRequestResponse{
+
+    @SerializedName("message")
+	private String message;
+
+    @SerializedName("success")
+	private boolean success;
+
+	public void setMessage(String message){
+		this.message = message;
+	}
+
+	public String getMessage(){
+		return message;
+	}
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"DeleteFriendRequestResponse{" + 
+			"“message” = '" + message + '\'' + 
+			",“success” = '" + success + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/DeleteFriendResponse.java b/src/main/java/org/amahi/anywhere/server/model/DeleteFriendResponse.java
new file mode 100644
index 000000000..e37369b42
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/DeleteFriendResponse.java
@@ -0,0 +1,37 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class DeleteFriendResponse{
+
+    @SerializedName("message")
+	private String message;
+
+    @SerializedName("success")
+	private boolean success;
+
+	public void setMessage(String message){
+		this.message = message;
+	}
+
+	public String getMessage(){
+		return message;
+	}
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	@Override
+ 	public String toString(){
+		return
+			"DeleteFriendResponse{" +
+			"“message” = '" + message + '\'' +
+			",“success” = '" + success + '\'' +
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
deleted file mode 100644
index 5389681a1..000000000
--- a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.amahi.anywhere.server.model;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.Date;
-
-public class FriendRequest {
-
-    @SerializedName("id")
-    private int id;
-
-    @SerializedName("created_at")
-    private String createdAt;
-
-    @SerializedName("status")
-    private int status;
-
-    @SerializedName("amahi_user")
-    private FriendUser friendUser;
-
-    @SerializedName("last_requested_at")
-    private String lastRequestedAt;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(String createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public FriendUser getFriendUser() {
-        return friendUser;
-    }
-
-    public void setFriendUser(FriendUser friendUser) {
-        this.friendUser = friendUser;
-    }
-
-    public String getLastRequestedAt() {
-        return lastRequestedAt;
-    }
-
-    public void setLastRequestedAt(String lastRequestedAt) {
-        this.lastRequestedAt = lastRequestedAt;
-    }
-
-
-}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequestItem.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequestItem.java
new file mode 100644
index 000000000..582a8b227
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendRequestItem.java
@@ -0,0 +1,143 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class FriendRequestItem{
+
+    @SerializedName("amahi_user_id")
+	private int amahiUserId;
+
+    @SerializedName("pin")
+	private String pin;
+
+    @SerializedName("last_requested_at")
+	private String lastRequestedAt;
+
+    @SerializedName("updated_at")
+	private String updatedAt;
+
+    @SerializedName("system_id")
+	private int systemId;
+
+    @SerializedName("created_at")
+	private String createdAt;
+
+    @SerializedName("id")
+	private int id;
+
+    @SerializedName("invite_token")
+	private String inviteToken;
+
+    @SerializedName("email")
+	private String email;
+
+    @SerializedName("status_txt")
+	private String statusTxt;
+	private int status;
+
+	public void setAmahiUserId(int amahiUserId){
+		this.amahiUserId = amahiUserId;
+	}
+
+	public int getAmahiUserId(){
+		return amahiUserId;
+	}
+
+	public void setPin(String pin){
+		this.pin = pin;
+	}
+
+	public String getPin(){
+		return pin;
+	}
+
+	public void setLastRequestedAt(String lastRequestedAt){
+		this.lastRequestedAt = lastRequestedAt;
+	}
+
+	public String getLastRequestedAt(){
+		return lastRequestedAt;
+	}
+
+	public void setUpdatedAt(String updatedAt){
+		this.updatedAt = updatedAt;
+	}
+
+	public String getUpdatedAt(){
+		return updatedAt;
+	}
+
+	public void setSystemId(int systemId){
+		this.systemId = systemId;
+	}
+
+	public int getSystemId(){
+		return systemId;
+	}
+
+	public void setCreatedAt(String createdAt){
+		this.createdAt = createdAt;
+	}
+
+	public String getCreatedAt(){
+		return createdAt;
+	}
+
+	public void setId(int id){
+		this.id = id;
+	}
+
+	public int getId(){
+		return id;
+	}
+
+	public void setInviteToken(String inviteToken){
+		this.inviteToken = inviteToken;
+	}
+
+	public String getInviteToken(){
+		return inviteToken;
+	}
+
+	public void setEmail(String email){
+		this.email = email;
+	}
+
+	public String getEmail(){
+		return email;
+	}
+
+	public void setStatusTxt(String statusTxt){
+		this.statusTxt = statusTxt;
+	}
+
+	public String getStatusTxt(){
+		return statusTxt;
+	}
+
+	public void setStatus(int status){
+		this.status = status;
+	}
+
+	public int getStatus(){
+		return status;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"FriendRequestItem{" + 
+			"amahi_user_id = '" + amahiUserId + '\'' + 
+			",pin = '" + pin + '\'' + 
+			",last_requested_at = '" + lastRequestedAt + '\'' + 
+			",updated_at = '" + updatedAt + '\'' + 
+			",system_id = '" + systemId + '\'' + 
+			",created_at = '" + createdAt + '\'' + 
+			",id = '" + id + '\'' + 
+			",invite_token = '" + inviteToken + '\'' + 
+			",email = '" + email + '\'' + 
+			",status_txt = '" + statusTxt + '\'' + 
+			",status = '" + status + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequestResponse.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequestResponse.java
new file mode 100644
index 000000000..3ae780c48
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendRequestResponse.java
@@ -0,0 +1,39 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class FriendRequestResponse{
+
+    @SerializedName("success")
+	private boolean success;
+
+    @SerializedName("data")
+	private List<FriendRequestItem> friendRequests;
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	public void setFriendRequests(List<FriendRequestItem> friendRequests){
+		this.friendRequests = friendRequests;
+	}
+
+	public List<FriendRequestItem> getFriendRequests(){
+		return friendRequests;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"FriendRequestResponse{" + 
+			"success = '" + success + '\'' + 
+			",friend_request = '" + friendRequests + '\'' +
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
deleted file mode 100644
index 48517dfdf..000000000
--- a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.amahi.anywhere.server.model;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.Date;
-
-public class FriendUser {
-    @SerializedName("id")
-    private int id;
-
-    @SerializedName("created_at")
-    private String createdDate;
-
-    @SerializedName("email")
-    private String email;
-
-
-    public int getId() {
-        return id;
-    }
-
-    public String getCreatedDate() {
-        return createdDate;
-    }
-
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public void setCreatedDate(String createdDate) {
-        this.createdDate = createdDate;
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUserItem.java b/src/main/java/org/amahi/anywhere/server/model/FriendUserItem.java
new file mode 100644
index 000000000..95b03a687
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendUserItem.java
@@ -0,0 +1,85 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class FriendUserItem{
+
+    @SerializedName("amahi_user_id")
+	private int amahiUserId;
+
+    @SerializedName("updated_at")
+	private String updatedAt;
+
+    @SerializedName("system_id")
+	private int systemId;
+
+    @SerializedName("created_at")
+	private String createdAt;
+
+    @SerializedName("id")
+	private int id;
+
+    @SerializedName("email")
+	private String email;
+
+	public void setAmahiUserId(int amahiUserId){
+		this.amahiUserId = amahiUserId;
+	}
+
+	public int getAmahiUserId(){
+		return amahiUserId;
+	}
+
+	public void setUpdatedAt(String updatedAt){
+		this.updatedAt = updatedAt;
+	}
+
+	public String getUpdatedAt(){
+		return updatedAt;
+	}
+
+	public void setSystemId(int systemId){
+		this.systemId = systemId;
+	}
+
+	public int getSystemId(){
+		return systemId;
+	}
+
+	public void setCreatedAt(String createdAt){
+		this.createdAt = createdAt;
+	}
+
+	public String getCreatedAt(){
+		return createdAt;
+	}
+
+	public void setId(int id){
+		this.id = id;
+	}
+
+	public int getId(){
+		return id;
+	}
+
+	public void setEmail(String email){
+		this.email = email;
+	}
+
+	public String getEmail(){
+		return email;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"FriendUserItem{" + 
+			"amahi_user_id = '" + amahiUserId + '\'' + 
+			",updated_at = '" + updatedAt + '\'' + 
+			",system_id = '" + systemId + '\'' + 
+			",created_at = '" + createdAt + '\'' + 
+			",id = '" + id + '\'' + 
+			",email = '" + email + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUserResponse.java b/src/main/java/org/amahi/anywhere/server/model/FriendUserResponse.java
new file mode 100644
index 000000000..7d3f53e4d
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendUserResponse.java
@@ -0,0 +1,39 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class FriendUserResponse{
+
+    @SerializedName("data")
+	private List<FriendUserItem> friendUsers;
+
+    @SerializedName("success")
+	private boolean success;
+
+	public void setFriendUsers(List<FriendUserItem> friendUsers){
+		this.friendUsers = friendUsers;
+	}
+
+	public List<FriendUserItem> getFriendUsers(){
+		return friendUsers;
+	}
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	@Override
+ 	public String toString(){
+		return
+			"FriendUserResponse{" +
+			"friend_user = '" + friendUsers + '\'' +
+			",success = '" + success + '\'' +
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
index d786be142..fab3c6a04 100644
--- a/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
+++ b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
@@ -2,26 +2,48 @@
 
 import com.google.gson.annotations.SerializedName;
 
-public class NewFriendRequest {
+public class NewFriendRequest{
+
+    @SerializedName("id")
+	private String id;
+
+    @SerializedName("status_txt")
+	private String statusTxt;
+
     @SerializedName("email")
-    private String email;
+	private String email;
+
+	public void setId(String id){
+		this.id = id;
+	}
+
+	public String getId(){
+		return id;
+	}
 
-    @SerializedName("pin")
-    private int pin;
+	public void setStatusTxt(String statusTxt){
+		this.statusTxt = statusTxt;
+	}
 
-    public String getEmail() {
-        return email;
-    }
+	public String getStatusTxt(){
+		return statusTxt;
+	}
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
+	public void setEmail(String email){
+		this.email = email;
+	}
 
-    public int getPin() {
-        return pin;
-    }
+	public String getEmail(){
+		return email;
+	}
 
-    public void setPin(int pin) {
-        this.pin = pin;
-    }
+	@Override
+ 	public String toString(){
+		return 
+			"NewFriendRequest{" + 
+			"id = '" + id + '\'' + 
+			",status_txt = '" + statusTxt + '\'' + 
+			",email = '" + email + '\'' + 
+			"}";
+		}
 }
diff --git a/src/main/java/org/amahi/anywhere/server/model/NewFriendRequestResponse.java b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequestResponse.java
new file mode 100644
index 000000000..01ba8df12
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequestResponse.java
@@ -0,0 +1,49 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class NewFriendRequestResponse{
+
+    @SerializedName("success")
+	private boolean success;
+
+    @SerializedName("message")
+	private String message;
+
+    @SerializedName("request")
+	private NewFriendRequest newFriendRequest;
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	public void setMessage(String message){
+		this.message = message;
+	}
+
+	public String getMessage(){
+		return message;
+	}
+
+	public void setNewFriendRequest(NewFriendRequest newFriendRequest){
+		this.newFriendRequest = newFriendRequest;
+	}
+
+	public NewFriendRequest getNewFriendRequest(){
+		return newFriendRequest;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"NewFriendRequestResponse{" + 
+			"success = '" + success + '\'' + 
+			",message = '" + message + '\'' + 
+			",“new_friend_request” = '" + newFriendRequest + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/PostFriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/PostFriendRequest.java
new file mode 100644
index 000000000..b504fbdb0
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/PostFriendRequest.java
@@ -0,0 +1,28 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class PostFriendRequest {
+
+    @SerializedName("email")
+    private String email;
+
+    @SerializedName("pin")
+    private int pin;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public int getPin() {
+        return pin;
+    }
+
+    public void setPin(int pin) {
+        this.pin = pin;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java b/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
deleted file mode 100644
index 70e7a70f2..000000000
--- a/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.amahi.anywhere.server.model;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.Date;
-
-public class PrimaryUser {
-    @SerializedName("id")
-    private int id;
-
-    @SerializedName("created_at")
-    private Date createdDate;
-
-    @SerializedName("amahi_user")
-    private FriendUser friendUser;
-
-    public int getId() {
-        return id;
-    }
-
-    public Date getCreatedDate() {
-        return createdDate;
-    }
-
-    public FriendUser getFriendUser() {
-        return friendUser;
-    }
-}
-
diff --git a/src/main/java/org/amahi/anywhere/server/model/ResendFriendRequestResponse.java b/src/main/java/org/amahi/anywhere/server/model/ResendFriendRequestResponse.java
new file mode 100644
index 000000000..809d168cc
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/ResendFriendRequestResponse.java
@@ -0,0 +1,37 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class ResendFriendRequestResponse{
+
+    @SerializedName("message")
+	private String message;
+
+    @SerializedName("success")
+	private boolean success;
+
+	public void setMessage(String message){
+		this.message = message;
+	}
+
+	public String getMessage(){
+		return message;
+	}
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"ResendFriendRequestResponse{" + 
+			"“message” = '" + message + '\'' + 
+			",“success” = '" + success + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
index 75967bdc2..15beae268 100644
--- a/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
+++ b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
@@ -1,29 +1,35 @@
 package org.amahi.anywhere.server.response;
 
 
-
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.AddFriendUserFailedEvent;
 import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.NewFriendRequestResponse;
 
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.HttpException;
 import retrofit2.Response;
 
-public class AddFriendUserResponse implements Callback<NewFriendRequest> {
+public class AddFriendUserResponse implements Callback<NewFriendRequestResponse> {
     @Override
-    public void onResponse(Call<NewFriendRequest> call, Response<NewFriendRequest> response) {
+    public void onResponse(Call<NewFriendRequestResponse> call, Response<NewFriendRequestResponse> response) {
         if (response.isSuccessful()) {
-            BusProvider.getBus().post(new AddFriendUserCompletedEvent(true));
-        } else
-            this.onFailure(call, new HttpException(response));
+            NewFriendRequestResponse requestResponse = response.body();
+            if (requestResponse.isSuccess()) {
+                BusProvider.getBus().post(new AddFriendUserCompletedEvent(requestResponse.isSuccess(), requestResponse.getMessage()));
+            } else {
+                BusProvider.getBus().post(new AddFriendUserFailedEvent());
+            }
+        } else {
+            BusProvider.getBus().post(new AddFriendUserFailedEvent());
+        }
+
 
     }
 
     @Override
-    public void onFailure(Call<NewFriendRequest> call, Throwable t) {
-        BusProvider.getBus().post(new AddFriendUserCompletedEvent(false));
+    public void onFailure(Call<NewFriendRequestResponse> call, Throwable t) {
+        BusProvider.getBus().post(new AddFriendUserFailedEvent());
 
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
new file mode 100644
index 000000000..57dd476ad
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
@@ -0,0 +1,29 @@
+package org.amahi.anywhere.server.response;
+
+import org.amahi.anywhere.bus.BusEvent;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.DeleteFriendRequestCompletedEvent;
+import org.amahi.anywhere.bus.DeleteFriendRequestFailedEvent;
+import org.amahi.anywhere.server.model.DeleteFriendRequestResponse;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class FriendRequestDeleteResponse implements Callback<DeleteFriendRequestResponse> {
+    @Override
+    public void onResponse(Call<DeleteFriendRequestResponse> call, Response<DeleteFriendRequestResponse> response) {
+        if (response.isSuccessful()) {
+            DeleteFriendRequestResponse deleteFriendRequestResponse = response.body();
+            BusProvider.getBus().post(new DeleteFriendRequestCompletedEvent(deleteFriendRequestResponse.isSuccess(), deleteFriendRequestResponse.getMessage()));
+        } else {
+            this.onFailure(call, new HttpException(response));
+        }
+    }
+
+    @Override
+    public void onFailure(Call<DeleteFriendRequestResponse> call, Throwable t) {
+        BusProvider.getBus().post(new DeleteFriendRequestFailedEvent());
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
new file mode 100644
index 000000000..9e3734d97
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
@@ -0,0 +1,32 @@
+package org.amahi.anywhere.server.response;
+
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.ResendFriendFailedEvent;
+import org.amahi.anywhere.bus.ResendFriendRequestCompletedEvent;
+import org.amahi.anywhere.server.model.ResendFriendRequestResponse;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class FriendRequestResendResponse implements Callback<ResendFriendRequestResponse> {
+    @Override
+    public void onResponse(Call<ResendFriendRequestResponse> call, Response<ResendFriendRequestResponse> response) {
+
+        if (response.isSuccessful()) {
+            ResendFriendRequestResponse resendFriendRequestResponse = response.body();
+            BusProvider.getBus().post(new ResendFriendRequestCompletedEvent(resendFriendRequestResponse.isSuccess(),
+                resendFriendRequestResponse.getMessage()));
+        } else {
+            this.onFailure(call, new HttpException(response));
+        }
+
+    }
+
+    @Override
+    public void onFailure(Call<ResendFriendRequestResponse> call, Throwable t) {
+        BusProvider.getBus().post(new ResendFriendFailedEvent());
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
index 74b993dec..413f1fef9 100644
--- a/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
@@ -3,32 +3,26 @@
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendRequestsLoadFailedEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
-import org.amahi.anywhere.server.model.FriendRequest;
-
-import java.util.Collections;
-import java.util.List;
+import org.amahi.anywhere.server.model.FriendRequestResponse;
 
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.HttpException;
 import retrofit2.Response;
 
-public class FriendRequestsResponse implements Callback<List<FriendRequest>> {
+public class FriendRequestsResponse implements Callback<FriendRequestResponse> {
     @Override
-    public void onResponse(Call<List<FriendRequest>> call, Response<List<FriendRequest>> response) {
+    public void onResponse(Call<FriendRequestResponse> call, Response<FriendRequestResponse> response) {
         if (response.isSuccessful()) {
-            List<FriendRequest> friendRequests = response.body();
-            if (friendRequests == null) {
-                friendRequests = Collections.emptyList();
-            }
-            BusProvider.getBus().post(new FriendRequestsLoadedEvent(friendRequests));
+            FriendRequestResponse friendRequestResponse = response.body();
+            BusProvider.getBus().post(new FriendRequestsLoadedEvent(friendRequestResponse.getFriendRequests()));
         } else
             this.onFailure(call, new HttpException(response));
 
     }
 
     @Override
-    public void onFailure(Call<List<FriendRequest>> call, Throwable t) {
+    public void onFailure(Call<FriendRequestResponse> call, Throwable t) {
         BusProvider.getBus().post(new FriendRequestsLoadFailedEvent());
 
     }
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
new file mode 100644
index 000000000..83e39a67e
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
@@ -0,0 +1,31 @@
+package org.amahi.anywhere.server.response;
+
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.DeleteFriendFailedEvent;
+import org.amahi.anywhere.bus.DeleteFriendCompletedEvent;
+import org.amahi.anywhere.server.model.DeleteFriendResponse;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class FriendUserDeleteResponse implements Callback<DeleteFriendResponse> {
+    @Override
+    public void onResponse(Call<DeleteFriendResponse> call, Response<DeleteFriendResponse> response) {
+        DeleteFriendResponse deleteFriendResponse = response.body();
+        if (response.isSuccessful()) {
+            BusProvider.getBus().post(new DeleteFriendCompletedEvent(deleteFriendResponse.isSuccess(), deleteFriendResponse.getMessage()));
+
+        } else {
+            this.onFailure(call, new HttpException(response));
+        }
+
+    }
+
+    @Override
+    public void onFailure(Call<DeleteFriendResponse> call, Throwable t) {
+        BusProvider.getBus().post(new DeleteFriendFailedEvent());
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
index c2d39c915..7d80d6202 100644
--- a/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
@@ -1,16 +1,10 @@
 package org.amahi.anywhere.server.response;
 
-import com.squareup.otto.Bus;
 
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendUsersLoadFailedEvent;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
-import org.amahi.anywhere.bus.ServerFilesLoadedEvent;
-import org.amahi.anywhere.server.model.FriendUser;
-import org.amahi.anywhere.server.model.PrimaryUser;
-
-import java.util.Collections;
-import java.util.List;
+import org.amahi.anywhere.server.model.FriendUserResponse;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -18,23 +12,20 @@
 import retrofit2.Response;
 
 
-public class FriendUsersResponse implements Callback<List<PrimaryUser>> {
+public class FriendUsersResponse implements Callback<FriendUserResponse> {
     @Override
-    public void onResponse(Call<List<PrimaryUser>> call, Response<List<PrimaryUser>> response) {
+    public void onResponse(Call<FriendUserResponse> call, Response<FriendUserResponse> response) {
         if (response.isSuccessful()) {
-            List<PrimaryUser> primaryUsers = response.body();
-            if (primaryUsers == null) {
-                primaryUsers = Collections.emptyList();
-            }
-            BusProvider.getBus().post(new FriendUsersLoadedEvent(primaryUsers));
-        } else
+            FriendUserResponse friendUserResponse = response.body();
+            BusProvider.getBus().post(new FriendUsersLoadedEvent(friendUserResponse.getFriendUsers()));
+        } else {
             this.onFailure(call, new HttpException(response));
+        }
 
     }
 
     @Override
-    public void onFailure(Call<List<PrimaryUser>> call, Throwable t) {
+    public void onFailure(Call<FriendUserResponse> call, Throwable t) {
         BusProvider.getBus().post(new FriendUsersLoadFailedEvent());
-
     }
 }
diff --git a/src/main/res/drawable-notnight/ic_friends.xml b/src/main/res/drawable-notnight/ic_friends.xml
new file mode 100644
index 000000000..087a5904b
--- /dev/null
+++ b/src/main/res/drawable-notnight/ic_friends.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_friends.xml b/src/main/res/drawable/ic_friends.xml
new file mode 100644
index 000000000..e9c32676b
--- /dev/null
+++ b/src/main/res/drawable/ic_friends.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:tint="#FFFFFF"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/src/main/res/layout/fragment_navigation.xml b/src/main/res/layout/fragment_navigation.xml
index f9e2a5a15..0052faa59 100644
--- a/src/main/res/layout/fragment_navigation.xml
+++ b/src/main/res/layout/fragment_navigation.xml
@@ -163,7 +163,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="32dp"
                     android:layout_marginStart="16dp"
-                    android:src="@drawable/ic_recent_files_24dp"
+                    android:src="@drawable/ic_friends"
                     tools:ignore="contentDescription" />
 
                 <TextView
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c9a6df36f..f659328ea 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -198,6 +198,8 @@
     <string name="text_delete">Delete</string>
     <string name="title_delete_friend_request">Delete Friend Request</string>
     <string name="message_delete_friend_request">This action cannot be undone</string>
+    <string name="message_resend_progress">Resending friend request</string>
+    <string name="message_add_friend_user">Sending friend request</string>
 
 
 </resources>

From 12e063215950a69a178dd9a6db3c52e4d5f0e4ab Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 28 Jul 2019 18:14:23 +0530
Subject: [PATCH 06/16] updates friend requests list after adding new friend
 request

---
 .../org/amahi/anywhere/fragment/FriendRequestsFragment.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index f497837c4..dc35d70f6 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -138,7 +138,7 @@ public void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
     @Subscribe
     public void onAddFriendUser(AddFriendUserCompletedEvent event) {
         if (event.isSuccess()) {
-            getListAdapter().notifyDataSetChanged();
+            serverClient.getFriendRequests();
         }
     }
 

From 2dbd3926a23147038b012286aaecfd07154cf49a Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 28 Jul 2019 19:59:57 +0530
Subject: [PATCH 07/16] fixes failed travis build

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index bb4eb1c6d..edd221c68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ before_install:
 
 jdk:
  - oraclejdk8
+ - oraclejdk9
+ - oraclejdk11
 
 sudo: required
 android:

From 5c80de108e33de1f1ada9a7d270140f4d3314c19 Mon Sep 17 00:00:00 2001
From: Balaji Ramavathu <balajiramavathu12@gmail.com>
Date: Wed, 31 Jul 2019 02:31:30 +0530
Subject: [PATCH 08/16] Fix: Unable to make HTTP requests in Android Pie (#482)

---
 src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 7c8fbd0e4..f1feac084 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -54,6 +54,7 @@
         android:label="@string/application_name"
         android:resizeableActivity="true"
         android:theme="@style/Theme.Amahi"
+        android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
         <provider
             android:name="androidx.core.content.FileProvider"

From d9537731b2a49ee202d1bd8f94380b72191a4f3c Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Wed, 10 Jul 2019 01:49:02 +0530
Subject: [PATCH 09/16] displays friended users, friend requests and lets
 adding new friends

---
 src/main/AndroidManifest.xml                  |   1 +
 .../java/org/amahi/anywhere/AmahiModule.java  |   6 +-
 .../anywhere/activity/FriendsActivity.java    |  92 ++++++++++++++
 .../anywhere/activity/NavigationActivity.java |  18 +++
 .../adapter/FriendRequestsListAdapter.java    |  54 +++++++++
 .../anywhere/adapter/FriendsListAdapter.java  |  53 ++++++++
 .../anywhere/adapter/FriendsPagerAdapter.java |  36 ++++++
 .../bus/AddFriendUserCompletedEvent.java      |  15 +++
 .../bus/FriendRequestsLoadFailedEvent.java    |   5 +
 .../bus/FriendRequestsLoadedEvent.java        |  18 +++
 .../bus/FriendUsersLoadFailedEvent.java       |   4 +
 .../anywhere/bus/FriendUsersLoadedEvent.java  |  17 +++
 .../anywhere/bus/FriendsSelectedEvent.java    |   4 +
 .../fragment/FriendRequestsFragment.java      | 114 ++++++++++++++++++
 .../anywhere/fragment/FriendsFragment.java    |  86 +++++++++++++
 .../anywhere/fragment/NavigationFragment.java |  19 +++
 .../amahi/anywhere/server/api/ServerApi.java  |  17 +++
 .../anywhere/server/client/ServerClient.java  |  16 +++
 .../anywhere/server/model/FriendRequest.java  |  65 ++++++++++
 .../anywhere/server/model/FriendUser.java     |  42 +++++++
 .../server/model/NewFriendRequest.java        |  27 +++++
 .../anywhere/server/model/PrimaryUser.java    |  29 +++++
 .../response/AddFriendUserResponse.java       |  29 +++++
 .../response/FriendRequestsResponse.java      |  35 ++++++
 .../server/response/FriendUsersResponse.java  |  40 ++++++
 .../java/org/amahi/anywhere/util/Intents.java |   6 +
 src/main/res/layout/activity_friends.xml      |  19 +++
 .../res/layout/fragment_friend_requests.xml   |  54 +++++++++
 src/main/res/layout/fragment_friends.xml      |  13 ++
 src/main/res/layout/fragment_navigation.xml   |  23 ++++
 .../res/layout/friend_requests_list_item.xml  |  14 +++
 src/main/res/layout/friends_list_item.xml     |  14 +++
 32 files changed, 984 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
 create mode 100644 src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
 create mode 100644 src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
 create mode 100644 src/main/java/org/amahi/anywhere/adapter/FriendsPagerAdapter.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendUsersLoadFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendsSelectedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
 create mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendUser.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
 create mode 100644 src/main/res/layout/activity_friends.xml
 create mode 100644 src/main/res/layout/fragment_friend_requests.xml
 create mode 100644 src/main/res/layout/fragment_friends.xml
 create mode 100644 src/main/res/layout/friend_requests_list_item.xml
 create mode 100644 src/main/res/layout/friends_list_item.xml

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index f1feac084..7e8fff864 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -223,6 +223,7 @@
 
         <activity android:name=".activity.OfflineFilesActivity" />
         <activity android:name=".activity.RecentFilesActivity"></activity>
+        <activity android:name=".activity.FriendsActivity"></activity>
     </application>
 
 </manifest>
diff --git a/src/main/java/org/amahi/anywhere/AmahiModule.java b/src/main/java/org/amahi/anywhere/AmahiModule.java
index 7dbf6598a..feb4effb4 100644
--- a/src/main/java/org/amahi/anywhere/AmahiModule.java
+++ b/src/main/java/org/amahi/anywhere/AmahiModule.java
@@ -35,6 +35,8 @@
 import org.amahi.anywhere.activity.ServerFilesActivity;
 import org.amahi.anywhere.cache.CacheModule;
 import org.amahi.anywhere.fragment.AudioListFragment;
+import org.amahi.anywhere.fragment.FriendRequestsFragment;
+import org.amahi.anywhere.fragment.FriendsFragment;
 import org.amahi.anywhere.fragment.NavigationFragment;
 import org.amahi.anywhere.fragment.ServerAppsFragment;
 import org.amahi.anywhere.fragment.ServerFileAudioFragment;
@@ -107,7 +109,9 @@
         TvPlaybackVideoActivity.class,
         TvPlaybackAudioActivity.class,
         TvPlaybackAudioFragment.class,
-        AudioMetadataRetrievingTask.class
+        AudioMetadataRetrievingTask.class,
+        FriendsFragment.class,
+        FriendRequestsFragment.class
     }
 )
 class AmahiModule {
diff --git a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
new file mode 100644
index 000000000..aba165bbb
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
@@ -0,0 +1,92 @@
+package org.amahi.anywhere.activity;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import com.google.android.material.tabs.TabLayout;
+
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.adapter.FriendsPagerAdapter;
+import org.amahi.anywhere.fragment.FriendRequestsFragment;
+import org.amahi.anywhere.fragment.FriendsFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FriendsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_friends);
+
+        setUpHomeNavigation();
+
+        setUpPager();
+
+        getTabLayout().setupWithViewPager(getPager());
+
+    }
+
+    private void setUpHomeNavigation() {
+        getSupportActionBar().setTitle("Friends");
+        getSupportActionBar().setHomeButtonEnabled(true);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    }
+
+    private void setUpPager() {
+
+        List<Fragment> fragmentList = getFragments();
+
+        List<String> fragmentTitles = getFragmentTitles();
+
+        FriendsPagerAdapter adapter = new FriendsPagerAdapter(getSupportFragmentManager(), fragmentList, fragmentTitles);
+        getPager().setAdapter(adapter);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem menuItem) {
+        switch (menuItem.getItemId()) {
+            case android.R.id.home:
+                onBackPressed();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(menuItem);
+        }
+    }
+
+    private List<Fragment> getFragments() {
+
+        Fragment friendsFragment = new FriendsFragment();
+        Fragment friendRequestsFragment = new FriendRequestsFragment();
+        List<Fragment> fragmentList = new ArrayList<>();
+        fragmentList.add(friendsFragment);
+        fragmentList.add(friendRequestsFragment);
+
+        return fragmentList;
+    }
+
+    private List<String> getFragmentTitles() {
+
+        List<String> fragmentTitles = new ArrayList<>();
+        fragmentTitles.add("Friends");
+        fragmentTitles.add("Friend Requests");
+
+        return fragmentTitles;
+    }
+
+    private ViewPager getPager() {
+        return findViewById(R.id.pager_friends);
+    }
+
+    private TabLayout getTabLayout() {
+        return findViewById(R.id.tablayout_friends);
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/activity/NavigationActivity.java b/src/main/java/org/amahi/anywhere/activity/NavigationActivity.java
index 20b8d5c89..9a596af23 100644
--- a/src/main/java/org/amahi/anywhere/activity/NavigationActivity.java
+++ b/src/main/java/org/amahi/anywhere/activity/NavigationActivity.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
+
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.drawerlayout.widget.DrawerLayout;
@@ -30,6 +31,7 @@
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
+
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewStub;
@@ -43,6 +45,7 @@
 import org.amahi.anywhere.bus.AppSelectedEvent;
 import org.amahi.anywhere.bus.AppsSelectedEvent;
 import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendsSelectedEvent;
 import org.amahi.anywhere.bus.OfflineFilesSelectedEvent;
 import org.amahi.anywhere.bus.RecentFilesSelectedEvent;
 import org.amahi.anywhere.bus.SettingsSelectedEvent;
@@ -345,6 +348,21 @@ private void showRecentFiles() {
         startActivity(intent);
     }
 
+    @Subscribe
+    public void onFriendsSelected(FriendsSelectedEvent event) {
+
+        showFriends();
+
+        if (isNavigationDrawerAvailable()) {
+            hideNavigationDrawer();
+        }
+    }
+
+    private void showFriends() {
+        Intent intent = Intents.Builder.with(this).buildFriendsActivity();
+        startActivity(intent);
+    }
+
     @Subscribe
     public void onShareSelected(ShareSelectedEvent event) {
         setUpShare(event.getShare());
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
new file mode 100644
index 000000000..abbb74279
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -0,0 +1,54 @@
+package org.amahi.anywhere.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.amahi.anywhere.R;
+
+import java.util.List;
+
+public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
+    private List<String> friendRequestsEmailList;
+    private Context context;
+
+    public FriendRequestsListAdapter(Context context, List<String> friendRequestsEmailList) {
+        this.context = context;
+        this.friendRequestsEmailList = friendRequestsEmailList;
+
+    }
+
+    @NonNull
+    @Override
+    public FriendRequestsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new FriendRequestsListViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.friend_requests_list_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int position) {
+        holder.friendEmailText.setText(friendRequestsEmailList.get(position));
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return friendRequestsEmailList.size();
+    }
+
+    class FriendRequestsListViewHolder extends RecyclerView.ViewHolder {
+        TextView friendEmailText;
+
+        FriendRequestsListViewHolder(View itemView) {
+            super(itemView);
+            friendEmailText = itemView.findViewById(R.id.text_friend_request_email);
+
+        }
+    }
+}
+
+
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
new file mode 100644
index 000000000..fa9ee82cd
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -0,0 +1,53 @@
+package org.amahi.anywhere.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.amahi.anywhere.R;
+
+import java.util.List;
+
+public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
+    private List<String> friendsEmailList;
+    private Context context;
+
+    public FriendsListAdapter(Context context, List<String> friendsEmailList) {
+        this.context = context;
+        this.friendsEmailList = friendsEmailList;
+
+    }
+
+    @NonNull
+    @Override
+    public FriendsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new FriendsListViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.friends_list_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position) {
+        holder.friendEmailText.setText(friendsEmailList.get(position));
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return friendsEmailList.size();
+    }
+
+    class FriendsListViewHolder extends RecyclerView.ViewHolder {
+        TextView friendEmailText;
+        FriendsListViewHolder(View itemView) {
+            super(itemView);
+            friendEmailText = itemView.findViewById(R.id.text_friend_email);
+
+        }
+    }
+}
+
+
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsPagerAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsPagerAdapter.java
new file mode 100644
index 000000000..fea1093e6
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsPagerAdapter.java
@@ -0,0 +1,36 @@
+package org.amahi.anywhere.adapter;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
+import java.util.List;
+
+public class FriendsPagerAdapter extends FragmentStatePagerAdapter {
+    private List<Fragment> fragmentList;
+    private List<String> fragmentTitles;
+
+    public FriendsPagerAdapter(FragmentManager fm, List<Fragment> fragmentList,
+                               List<String> fragmentTitles) {
+        super(fm);
+        this.fragmentList = fragmentList;
+        this.fragmentTitles = fragmentTitles;
+    }
+
+    @Nullable
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return fragmentTitles.get(position);
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return fragmentList.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return fragmentList.size();
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
new file mode 100644
index 000000000..c4577e3eb
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
@@ -0,0 +1,15 @@
+package org.amahi.anywhere.bus;
+
+public class AddFriendUserCompletedEvent {
+    public boolean isSuccessful;
+
+    public boolean isSuccessful() {
+        return isSuccessful;
+    }
+
+    public AddFriendUserCompletedEvent(boolean isSuccessful) {
+        this.isSuccessful = isSuccessful;
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadFailedEvent.java
new file mode 100644
index 000000000..4a213935a
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadFailedEvent.java
@@ -0,0 +1,5 @@
+package org.amahi.anywhere.bus;
+
+
+public class FriendRequestsLoadFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
new file mode 100644
index 000000000..a81cf6736
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
@@ -0,0 +1,18 @@
+package org.amahi.anywhere.bus;
+
+
+import org.amahi.anywhere.server.model.FriendRequest;
+
+import java.util.List;
+
+public class FriendRequestsLoadedEvent implements BusEvent {
+    private final List<FriendRequest> friendRequests;
+
+    public FriendRequestsLoadedEvent(List<FriendRequest> friendRequests) {
+        this.friendRequests = friendRequests;
+    }
+
+    public List<FriendRequest> getFriendRequests() {
+        return friendRequests;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadFailedEvent.java
new file mode 100644
index 000000000..003e6bf57
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class FriendUsersLoadFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
new file mode 100644
index 000000000..e21ce0c78
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
@@ -0,0 +1,17 @@
+package org.amahi.anywhere.bus;
+
+import org.amahi.anywhere.server.model.PrimaryUser;
+
+import java.util.List;
+
+public class FriendUsersLoadedEvent implements BusEvent {
+    private final List<PrimaryUser> primaryUsers;
+
+    public FriendUsersLoadedEvent(List<PrimaryUser> primaryUsers) {
+        this.primaryUsers = primaryUsers;
+    }
+
+    public List<PrimaryUser> getPrimaryUsers() {
+        return primaryUsers;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendsSelectedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendsSelectedEvent.java
new file mode 100644
index 000000000..d66e9ab09
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendsSelectedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class FriendsSelectedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
new file mode 100644
index 000000000..6c5bdc301
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -0,0 +1,114 @@
+package org.amahi.anywhere.fragment;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.android.material.textfield.TextInputEditText;
+import com.squareup.otto.Subscribe;
+
+import org.amahi.anywhere.AmahiApplication;
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.adapter.FriendRequestsListAdapter;
+import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
+import org.amahi.anywhere.server.client.ServerClient;
+import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.server.model.NewFriendRequest;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+/**
+ * Friend Requests Fragment, shows list of friend requests.
+ */
+public class FriendRequestsFragment extends Fragment {
+
+    @Inject
+    ServerClient serverClient;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_friend_requests, container, false);
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        setUpInjections();
+
+        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
+
+        setUpFriendRequestsList();
+
+        Button btnAddFR = getView().findViewById(R.id.btn_add_fr);
+
+        btnAddFR.setOnClickListener(v -> addFriendRequest());
+    }
+
+    private void setUpInjections() {
+        AmahiApplication.from(getActivity()).inject(this);
+    }
+
+    private RecyclerView getRecyclerView() {
+        return getView().findViewById(R.id.list_friend_requests);
+    }
+
+    private void setUpFriendRequestsList() {
+        if (serverClient.isConnected()) {
+            serverClient.getFriendRequests();
+        }
+    }
+
+    @Subscribe
+    private void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
+        showFriendRequests(event.getFriendRequests());
+    }
+
+    private void showFriendRequests(List<FriendRequest> friendRequests) {
+        List<String> friendRequestsEmailList = new ArrayList<>();
+
+        for (FriendRequest friendRequest : friendRequests) {
+            friendRequestsEmailList.add(friendRequest.getFriendUser().getEmail());
+        }
+
+        FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsEmailList);
+        getRecyclerView().setAdapter(adapter);
+    }
+
+    private void addFriendRequest() {
+        TextInputEditText etEmailFR = getView().findViewById(R.id.text_email);
+
+        if (etEmailFR != null && etEmailFR.getText() != null) {
+            NewFriendRequest newFriendRequest = new NewFriendRequest();
+            newFriendRequest.setEmail(etEmailFR.getText().toString());
+            serverClient.addFriendUser(newFriendRequest);
+        }
+
+    }
+
+    @Subscribe
+    private void onAddFriendUser(AddFriendUserCompletedEvent event) {
+        if (event.isSuccessful()) {
+            Toast.makeText(getContext(), "friend request success", Toast.LENGTH_LONG).show();
+            setUpFriendRequestsList();
+        } else {
+            Toast.makeText(getContext(), "friend request failed", Toast.LENGTH_LONG).show();
+        }
+
+    }
+
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
new file mode 100644
index 000000000..b1eaee4f7
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -0,0 +1,86 @@
+package org.amahi.anywhere.fragment;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.squareup.otto.Subscribe;
+
+import org.amahi.anywhere.AmahiApplication;
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.adapter.FriendsListAdapter;
+import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
+import org.amahi.anywhere.server.client.ServerClient;
+import org.amahi.anywhere.server.model.PrimaryUser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+/**
+ * Friends Fragment, shows list of friended users.
+ */
+public class FriendsFragment extends Fragment {
+
+    @Inject
+    ServerClient serverClient;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.fragment_friends, container, false);
+
+    }
+
+    private void setUpInjections() {
+        AmahiApplication.from(getActivity()).inject(this);
+    }
+
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        setUpInjections();
+
+        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
+
+        setUpFriendsList();
+    }
+
+    private RecyclerView getRecyclerView() {
+        return (RecyclerView) getView().findViewById(R.id.list_friends);
+    }
+
+    private void setUpFriendsList() {
+        serverClient.getFriendUsers();
+
+    }
+
+    @Subscribe
+    private void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
+        showFriendUsers(event.getPrimaryUsers());
+    }
+
+    private void showFriendUsers(List<PrimaryUser> primaryUsers) {
+        List<String> friendsEmailList = new ArrayList<>();
+
+        for (PrimaryUser primaryUser : primaryUsers) {
+            friendsEmailList.add(primaryUser.getFriendUser().getEmail());
+        }
+
+        FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsEmailList);
+        getRecyclerView().setAdapter(adapter);
+
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java b/src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java
index d3d2fe9b9..dc6ef38f4 100644
--- a/src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/NavigationFragment.java
@@ -31,6 +31,7 @@
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
+
 import androidx.fragment.app.Fragment;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -54,6 +55,7 @@
 import org.amahi.anywhere.adapter.NavigationDrawerAdapter;
 import org.amahi.anywhere.bus.AppsSelectedEvent;
 import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendsSelectedEvent;
 import org.amahi.anywhere.bus.OfflineFilesSelectedEvent;
 import org.amahi.anywhere.bus.RecentFilesSelectedEvent;
 import org.amahi.anywhere.bus.ServerConnectedEvent;
@@ -355,6 +357,7 @@ private void setUpNavigationList() {
             showServers();
             hideOfflineLayout();
             hideRecentLayout();
+            hideFriendsLayout();
         }
 
     }
@@ -367,6 +370,10 @@ private void hideRecentLayout() {
         getRecentFilesLayout().setVisibility(View.GONE);
     }
 
+    private void hideFriendsLayout() {
+        getFriendsLayout().setVisibility(View.GONE);
+    }
+
     private void setUpNavigationAdapter() {
         //Setting the layout of a vertical list dynamically.
 
@@ -394,6 +401,10 @@ private LinearLayout getRecentFilesLayout() {
         return getView().findViewById(R.id.recent_files_layout);
     }
 
+    private LinearLayout getFriendsLayout() {
+        return getView().findViewById(R.id.friends_layout);
+    }
+
     private LinearLayout getLinearLayoutSelectedServer() {
         return getView().findViewById(R.id.server_select_LinearLayout);
     }
@@ -418,6 +429,8 @@ private void setUpNavigationListener() {
         getOfflineFilesLayout().setOnClickListener(view -> showOfflineFiles());
 
         getRecentFilesLayout().setOnClickListener(view -> showRecentFiles());
+
+        getFriendsLayout().setOnClickListener(view -> showFriends());
     }
 
     private void selectedServerListener(int position) {
@@ -492,6 +505,7 @@ private void setUpServerSelectListener() {
                 showServers();
                 hideOfflineLayout();
                 hideRecentLayout();
+                hideFriendsLayout();
             }
         });
     }
@@ -505,6 +519,7 @@ private void showNavigationItems() {
 
         getOfflineFilesLayout().setVisibility(View.VISIBLE);
         getRecentFilesLayout().setVisibility(View.VISIBLE);
+        getFriendsLayout().setVisibility(View.VISIBLE);
     }
 
     @Subscribe
@@ -613,6 +628,10 @@ private void showRecentFiles() {
         BusProvider.getBus().post(new RecentFilesSelectedEvent());
     }
 
+    private void showFriends() {
+        BusProvider.getBus().post(new FriendsSelectedEvent());
+    }
+
     @Subscribe
     public void onServerConnectionChanged(ServerConnectionChangedEvent event) {
         areServersVisible = false;
diff --git a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
index 937c789f8..50b14133b 100644
--- a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
+++ b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
@@ -19,6 +19,9 @@
 
 package org.amahi.anywhere.server.api;
 
+import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.PrimaryUser;
 import org.amahi.anywhere.server.model.ServerApp;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
@@ -29,6 +32,7 @@
 import okhttp3.MultipartBody;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
+import retrofit2.http.Body;
 import retrofit2.http.DELETE;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
@@ -74,4 +78,17 @@ Call<ServerFileMetadata> getFileMetadata(
     @GET("/apps")
     Call<List<ServerApp>> getApps(
         @Header("Session") String session);
+
+    @GET("/frnd/users")
+    Call<List<PrimaryUser>> getFriendUsers(
+        @Header("Session") String session);
+
+    @POST("/frnd/request")
+    Call<NewFriendRequest> addFriendUser(
+        @Header("Session") String session,
+        @Body NewFriendRequest friendRequest);
+
+    @GET("/frnd/requests")
+    Call<List<FriendRequest>> getFriendRequests(
+        @Header("Session") String session);
 }
diff --git a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
index b5dd13282..bd11c0108 100644
--- a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
+++ b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
@@ -38,11 +38,15 @@
 import org.amahi.anywhere.server.ApiConnection;
 import org.amahi.anywhere.server.api.ProxyApi;
 import org.amahi.anywhere.server.api.ServerApi;
+import org.amahi.anywhere.server.model.NewFriendRequest;
 import org.amahi.anywhere.server.model.Server;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
 import org.amahi.anywhere.server.model.ServerRoute;
 import org.amahi.anywhere.server.model.ServerShare;
+import org.amahi.anywhere.server.response.AddFriendUserResponse;
+import org.amahi.anywhere.server.response.FriendRequestsResponse;
+import org.amahi.anywhere.server.response.FriendUsersResponse;
 import org.amahi.anywhere.server.response.ServerAppsResponse;
 import org.amahi.anywhere.server.response.ServerFileDeleteResponse;
 import org.amahi.anywhere.server.response.ServerFileUploadResponse;
@@ -327,4 +331,16 @@ public void getFileMetadata(ServerShare share, ServerFile file, Callback<ServerF
     public void getApps() {
         serverApi.getApps(server.getSession()).enqueue(new ServerAppsResponse());
     }
+
+    public void getFriendUsers() {
+        serverApi.getFriendUsers(server.getSession()).enqueue(new FriendUsersResponse());
+    }
+
+    public void addFriendUser(NewFriendRequest friendRequest) {
+        serverApi.addFriendUser(server.getSession(), friendRequest).enqueue(new AddFriendUserResponse());
+    }
+
+    public void getFriendRequests() {
+        serverApi.getFriendRequests(server.getSession()).enqueue(new FriendRequestsResponse());
+    }
 }
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
new file mode 100644
index 000000000..896e195a1
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
@@ -0,0 +1,65 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+
+public class FriendRequest {
+
+    @SerializedName("id")
+    private int id;
+
+    @SerializedName("created_at")
+    private Date createdAt;
+
+    @SerializedName("status")
+    private int status;
+
+    @SerializedName("amahi_user")
+    private FriendUser friendUser;
+
+    @SerializedName("last_requested_at")
+    private String lastRequestedAt;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public FriendUser getFriendUser() {
+        return friendUser;
+    }
+
+    public void setFriendUser(FriendUser friendUser) {
+        this.friendUser = friendUser;
+    }
+
+    public String getLastRequestedAt() {
+        return lastRequestedAt;
+    }
+
+    public void setLastRequestedAt(String lastRequestedAt) {
+        this.lastRequestedAt = lastRequestedAt;
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
new file mode 100644
index 000000000..e60c593e7
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
@@ -0,0 +1,42 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+
+public class FriendUser {
+    @SerializedName("id")
+    private int id;
+
+    @SerializedName("created_at")
+    private Date createdDate;
+
+    @SerializedName("email")
+    private String email;
+
+
+    public int getId() {
+        return id;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
new file mode 100644
index 000000000..d786be142
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
@@ -0,0 +1,27 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class NewFriendRequest {
+    @SerializedName("email")
+    private String email;
+
+    @SerializedName("pin")
+    private int pin;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public int getPin() {
+        return pin;
+    }
+
+    public void setPin(int pin) {
+        this.pin = pin;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java b/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
new file mode 100644
index 000000000..70e7a70f2
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
@@ -0,0 +1,29 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.Date;
+
+public class PrimaryUser {
+    @SerializedName("id")
+    private int id;
+
+    @SerializedName("created_at")
+    private Date createdDate;
+
+    @SerializedName("amahi_user")
+    private FriendUser friendUser;
+
+    public int getId() {
+        return id;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public FriendUser getFriendUser() {
+        return friendUser;
+    }
+}
+
diff --git a/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
new file mode 100644
index 000000000..75967bdc2
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
@@ -0,0 +1,29 @@
+package org.amahi.anywhere.server.response;
+
+
+
+import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.server.model.NewFriendRequest;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class AddFriendUserResponse implements Callback<NewFriendRequest> {
+    @Override
+    public void onResponse(Call<NewFriendRequest> call, Response<NewFriendRequest> response) {
+        if (response.isSuccessful()) {
+            BusProvider.getBus().post(new AddFriendUserCompletedEvent(true));
+        } else
+            this.onFailure(call, new HttpException(response));
+
+    }
+
+    @Override
+    public void onFailure(Call<NewFriendRequest> call, Throwable t) {
+        BusProvider.getBus().post(new AddFriendUserCompletedEvent(false));
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
new file mode 100644
index 000000000..74b993dec
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
@@ -0,0 +1,35 @@
+package org.amahi.anywhere.server.response;
+
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendRequestsLoadFailedEvent;
+import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
+import org.amahi.anywhere.server.model.FriendRequest;
+
+import java.util.Collections;
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class FriendRequestsResponse implements Callback<List<FriendRequest>> {
+    @Override
+    public void onResponse(Call<List<FriendRequest>> call, Response<List<FriendRequest>> response) {
+        if (response.isSuccessful()) {
+            List<FriendRequest> friendRequests = response.body();
+            if (friendRequests == null) {
+                friendRequests = Collections.emptyList();
+            }
+            BusProvider.getBus().post(new FriendRequestsLoadedEvent(friendRequests));
+        } else
+            this.onFailure(call, new HttpException(response));
+
+    }
+
+    @Override
+    public void onFailure(Call<List<FriendRequest>> call, Throwable t) {
+        BusProvider.getBus().post(new FriendRequestsLoadFailedEvent());
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
new file mode 100644
index 000000000..c2d39c915
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
@@ -0,0 +1,40 @@
+package org.amahi.anywhere.server.response;
+
+import com.squareup.otto.Bus;
+
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendUsersLoadFailedEvent;
+import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
+import org.amahi.anywhere.bus.ServerFilesLoadedEvent;
+import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.server.model.PrimaryUser;
+
+import java.util.Collections;
+import java.util.List;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+
+public class FriendUsersResponse implements Callback<List<PrimaryUser>> {
+    @Override
+    public void onResponse(Call<List<PrimaryUser>> call, Response<List<PrimaryUser>> response) {
+        if (response.isSuccessful()) {
+            List<PrimaryUser> primaryUsers = response.body();
+            if (primaryUsers == null) {
+                primaryUsers = Collections.emptyList();
+            }
+            BusProvider.getBus().post(new FriendUsersLoadedEvent(primaryUsers));
+        } else
+            this.onFailure(call, new HttpException(response));
+
+    }
+
+    @Override
+    public void onFailure(Call<List<PrimaryUser>> call, Throwable t) {
+        BusProvider.getBus().post(new FriendUsersLoadFailedEvent());
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/util/Intents.java b/src/main/java/org/amahi/anywhere/util/Intents.java
index 92b45abaa..b2abb6e18 100644
--- a/src/main/java/org/amahi/anywhere/util/Intents.java
+++ b/src/main/java/org/amahi/anywhere/util/Intents.java
@@ -27,9 +27,11 @@
 import android.net.Uri;
 import android.os.Parcelable;
 import android.provider.MediaStore;
+
 import androidx.annotation.NonNull;
 
 import org.amahi.anywhere.R;
+import org.amahi.anywhere.activity.FriendsActivity;
 import org.amahi.anywhere.activity.IntroductionActivity;
 import org.amahi.anywhere.activity.OfflineFilesActivity;
 import org.amahi.anywhere.activity.RecentFilesActivity;
@@ -117,6 +119,10 @@ public Intent buildRecentFilesActivity() {
             return new Intent(context, RecentFilesActivity.class);
         }
 
+        public Intent buildFriendsActivity() {
+            return new Intent(context, FriendsActivity.class);
+        }
+
         public Intent buildServerTvFilesActivity(ServerShare share, ServerFile file) {
             Intent intent = new Intent(context, ServerFileTvActivity.class);
             intent.putExtra(Extras.SERVER_FILE, file);
diff --git a/src/main/res/layout/activity_friends.xml b/src/main/res/layout/activity_friends.xml
new file mode 100644
index 000000000..7833a70eb
--- /dev/null
+++ b/src/main/res/layout/activity_friends.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    tools:context=".activity.FriendsActivity"
+    android:orientation="vertical">
+
+    <com.google.android.material.tabs.TabLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/tablayout_friends" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/pager_friends"/>
+
+</LinearLayout>
diff --git a/src/main/res/layout/fragment_friend_requests.xml b/src/main/res/layout/fragment_friend_requests.xml
new file mode 100644
index 000000000..be6077f4b
--- /dev/null
+++ b/src/main/res/layout/fragment_friend_requests.xml
@@ -0,0 +1,54 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".fragment.FriendRequestsFragment">
+
+    <androidx.cardview.widget.CardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/card_add_fr"
+        android:layout_margin="8dp"
+        android:padding="8dp"
+        app:cardCornerRadius="4dp">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/email_text_layout"
+                android:layout_margin="8dp"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:hint="Registered email of friend">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/text_email"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:inputType="textEmailAddress"/>
+            </com.google.android.material.textfield.TextInputLayout>
+            <Button
+                android:id="@+id/btn_add_fr"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Add Friend"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:layout_below="@+id/email_text_layout"
+                android:background="@color/accent"
+                android:textColor="@android:color/white"/>
+        </RelativeLayout>
+    </androidx.cardview.widget.CardView>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/list_friend_requests"
+        android:layout_below="@+id/card_add_fr"
+        android:layout_margin="8dp"/>
+
+</RelativeLayout>
diff --git a/src/main/res/layout/fragment_friends.xml b/src/main/res/layout/fragment_friends.xml
new file mode 100644
index 000000000..626116caa
--- /dev/null
+++ b/src/main/res/layout/fragment_friends.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+    tools:context=".fragment.FriendsFragment">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/list_friends"/>
+
+</FrameLayout>
diff --git a/src/main/res/layout/fragment_navigation.xml b/src/main/res/layout/fragment_navigation.xml
index edf107c4c..f9e2a5a15 100644
--- a/src/main/res/layout/fragment_navigation.xml
+++ b/src/main/res/layout/fragment_navigation.xml
@@ -151,6 +151,29 @@
                     android:textStyle="bold" />
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/friends_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginTop="16dp">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="32dp"
+                    android:layout_marginStart="16dp"
+                    android:src="@drawable/ic_recent_files_24dp"
+                    tools:ignore="contentDescription" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Friends"
+                    android:textSize="@dimen/text_small"
+                    android:textStyle="bold" />
+            </LinearLayout>
+
         </LinearLayout>
 
     </ViewAnimator>
diff --git a/src/main/res/layout/friend_requests_list_item.xml b/src/main/res/layout/friend_requests_list_item.xml
new file mode 100644
index 000000000..dae5c2a0f
--- /dev/null
+++ b/src/main/res/layout/friend_requests_list_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/text_friend_request_email"
+        android:padding="8dp"
+        android:textSize="16sp"
+        android:textColor="@color/primary_text"/>
+
+</LinearLayout>
diff --git a/src/main/res/layout/friends_list_item.xml b/src/main/res/layout/friends_list_item.xml
new file mode 100644
index 000000000..e58ec1d09
--- /dev/null
+++ b/src/main/res/layout/friends_list_item.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/text_friend_email"
+        android:padding="8dp"
+        android:textSize="16sp"
+        android:textColor="@color/primary_text"/>
+
+</LinearLayout>

From 4c32a9ab6c4f115797c42023ee755c140d0de3a9 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Thu, 18 Jul 2019 00:24:28 +0530
Subject: [PATCH 10/16] shows request status, adding new friend from floating
 button

---
 src/main/AndroidManifest.xml                  |   3 +-
 .../java/org/amahi/anywhere/AmahiModule.java  |   4 +-
 .../anywhere/activity/FriendsActivity.java    |  74 ++++++++++++-
 .../adapter/FriendRequestsListAdapter.java    |  42 +++++++-
 .../anywhere/adapter/FriendsListAdapter.java  |  18 +++-
 .../bus/AddFriendUserCompletedEvent.java      |   2 +-
 .../fragment/AlertDialogFragment.java         | 102 +++++++++++++++++-
 .../fragment/FriendRequestsFragment.java      |  42 +++-----
 .../anywhere/fragment/FriendsFragment.java    |  26 +++--
 .../anywhere/server/model/FriendRequest.java  |   6 +-
 .../anywhere/server/model/FriendUser.java     |   6 +-
 .../res/drawable/friend_status_background.xml |  10 ++
 src/main/res/drawable/ic_add_friend.xml       |   5 +
 src/main/res/layout/activity_friends.xml      |  38 ++++---
 src/main/res/layout/dialog_add_friend.xml     |  18 ++++
 .../res/layout/fragment_friend_requests.xml   |  43 +-------
 .../res/layout/friend_requests_list_item.xml  |  50 +++++++--
 src/main/res/layout/friends_list_item.xml     |  44 ++++++--
 src/main/res/values-v21/themes.xml            |   8 ++
 src/main/res/values/colors.xml                |   6 ++
 src/main/res/values/strings.xml               |   6 +-
 src/main/res/values/themes.xml                |  13 +++
 22 files changed, 436 insertions(+), 130 deletions(-)
 create mode 100644 src/main/res/drawable/friend_status_background.xml
 create mode 100644 src/main/res/drawable/ic_add_friend.xml
 create mode 100644 src/main/res/layout/dialog_add_friend.xml

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 7e8fff864..5d15189e6 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -223,7 +223,8 @@
 
         <activity android:name=".activity.OfflineFilesActivity" />
         <activity android:name=".activity.RecentFilesActivity"></activity>
-        <activity android:name=".activity.FriendsActivity"></activity>
+        <activity android:name=".activity.FriendsActivity"
+            android:theme="@style/Theme.Amahi.Friends"></activity>
     </application>
 
 </manifest>
diff --git a/src/main/java/org/amahi/anywhere/AmahiModule.java b/src/main/java/org/amahi/anywhere/AmahiModule.java
index feb4effb4..33a68928a 100644
--- a/src/main/java/org/amahi/anywhere/AmahiModule.java
+++ b/src/main/java/org/amahi/anywhere/AmahiModule.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 
 import org.amahi.anywhere.activity.AuthenticationActivity;
+import org.amahi.anywhere.activity.FriendsActivity;
 import org.amahi.anywhere.activity.NativeVideoActivity;
 import org.amahi.anywhere.activity.NavigationActivity;
 import org.amahi.anywhere.activity.OfflineFilesActivity;
@@ -111,7 +112,8 @@
         TvPlaybackAudioFragment.class,
         AudioMetadataRetrievingTask.class,
         FriendsFragment.class,
-        FriendRequestsFragment.class
+        FriendRequestsFragment.class,
+        FriendsActivity.class
     }
 )
 class AmahiModule {
diff --git a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
index aba165bbb..fffe343fb 100644
--- a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
+++ b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
@@ -6,18 +6,33 @@
 
 import android.os.Bundle;
 import android.view.MenuItem;
+import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
+import com.squareup.otto.Subscribe;
 
+import org.amahi.anywhere.AmahiApplication;
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsPagerAdapter;
+import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.fragment.AlertDialogFragment;
 import org.amahi.anywhere.fragment.FriendRequestsFragment;
 import org.amahi.anywhere.fragment.FriendsFragment;
+import org.amahi.anywhere.server.client.ServerClient;
+import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.util.Fragments;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class FriendsActivity extends AppCompatActivity {
+import javax.inject.Inject;
+
+public class FriendsActivity extends AppCompatActivity
+    implements AlertDialogFragment.AddFriendDialogCallback {
+
+    @Inject
+    ServerClient serverClient;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -26,10 +41,18 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setUpHomeNavigation();
 
+        setUpInjections();
+
         setUpPager();
 
         getTabLayout().setupWithViewPager(getPager());
 
+        setUpAddFriendFAB();
+
+    }
+
+    private void setUpInjections() {
+        AmahiApplication.from(this).inject(this);
     }
 
     private void setUpHomeNavigation() {
@@ -48,6 +71,22 @@ private void setUpPager() {
         getPager().setAdapter(adapter);
     }
 
+    private void setUpAddFriendFAB() {
+        FloatingActionButton fab = findViewById(R.id.fab_add_friend);
+
+        fab.setOnClickListener(v -> showAddFriendDialog());
+    }
+
+    private void showAddFriendDialog() {
+        AlertDialogFragment addFriendDialog = new AlertDialogFragment();
+        Bundle bundle = new Bundle();
+        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.ADD_FRIEND_DIALOG);
+        addFriendDialog.setArguments(bundle);
+        addFriendDialog.show(getSupportFragmentManager(), "add_friend_dialog");
+
+    }
+
+
     @Override
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch (menuItem.getItemId()) {
@@ -89,4 +128,37 @@ private TabLayout getTabLayout() {
     }
 
 
+    @Override
+    public void dialogPositiveButtonOnClick(String email) {
+        if (serverClient.isConnected()) {
+            addFriendRequest(email);
+        }
+        //TODO: connect server if not connected
+    }
+
+    @Override
+    public void dialogNegativeButtonOnClick() {
+
+    }
+
+    private void addFriendRequest(String email) {
+
+        if (email != null) {
+            NewFriendRequest newFriendRequest = new NewFriendRequest();
+            newFriendRequest.setEmail(email);
+            serverClient.addFriendUser(newFriendRequest);
+        }
+
+    }
+
+
+    @Subscribe
+    private void onAddFriendUser(AddFriendUserCompletedEvent event) {
+        if (event.isSuccessful()) {
+            Toast.makeText(this, "friend request success", Toast.LENGTH_LONG).show();
+        } else {
+            Toast.makeText(this, "friend request failed", Toast.LENGTH_LONG).show();
+        }
+
+    }
 }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
index abbb74279..cd1d6554a 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -1,6 +1,7 @@
 package org.amahi.anywhere.adapter;
 
 import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,16 +11,17 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.amahi.anywhere.R;
+import org.amahi.anywhere.server.model.FriendRequest;
 
 import java.util.List;
 
 public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
-    private List<String> friendRequestsEmailList;
+    private List<FriendRequest> friendRequestsList;
     private Context context;
 
-    public FriendRequestsListAdapter(Context context, List<String> friendRequestsEmailList) {
+    public FriendRequestsListAdapter(Context context, List<FriendRequest> friendRequestsList) {
         this.context = context;
-        this.friendRequestsEmailList = friendRequestsEmailList;
+        this.friendRequestsList = friendRequestsList;
 
     }
 
@@ -31,21 +33,51 @@ public FriendRequestsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent
 
     @Override
     public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int position) {
-        holder.friendEmailText.setText(friendRequestsEmailList.get(position));
+        holder.friendEmailText.setText(friendRequestsList.get(position).getFriendUser().getEmail());
+        int status = friendRequestsList.get(position).getStatus();
+
+        //set status text and color based on status value
+        String statusText = "Active";
+        int colorResourceId = R.color.status_active;
+        switch (status) {
+            case 0:
+                statusText = "Active";
+                colorResourceId = R.color.status_active;
+                break;
+            case 1:
+                statusText = "Expired";
+                colorResourceId = R.color.status_expired;
+                break;
+            case 2:
+                statusText = "Accepted";
+                colorResourceId = R.color.status_accepted;
+                break;
+            case 3:
+                statusText = "Rejected";
+                colorResourceId = R.color.status_rejected;
+                break;
+
+        }
+        holder.friendRequestStatus.setText(statusText);
+        GradientDrawable drawable = (GradientDrawable) holder.friendRequestStatus.getBackground();
+        drawable.setColor(context.getResources().getColor(colorResourceId));
+        holder.friendRequestStatus.setBackground(drawable);
 
     }
 
     @Override
     public int getItemCount() {
-        return friendRequestsEmailList.size();
+        return friendRequestsList.size();
     }
 
     class FriendRequestsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
+        TextView friendRequestStatus;
 
         FriendRequestsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_request_email);
+            friendRequestStatus = itemView.findViewById(R.id.text_friend_request_status);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
index fa9ee82cd..e0e7400d0 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -10,16 +10,17 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.amahi.anywhere.R;
+import org.amahi.anywhere.server.model.FriendUser;
 
 import java.util.List;
 
 public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
-    private List<String> friendsEmailList;
+    private List<FriendUser> friendsList;
     private Context context;
 
-    public FriendsListAdapter(Context context, List<String> friendsEmailList) {
+    public FriendsListAdapter(Context context, List<FriendUser> friendsList) {
         this.context = context;
-        this.friendsEmailList = friendsEmailList;
+        this.friendsList = friendsList;
 
     }
 
@@ -31,20 +32,27 @@ public FriendsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int v
 
     @Override
     public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position) {
-        holder.friendEmailText.setText(friendsEmailList.get(position));
+        holder.friendEmailText.setText(friendsList.get(position).getEmail());
+        StringBuilder builder = new StringBuilder();
+        builder.append("Friends since ");
+        builder.append(friendsList.get(position).getCreatedDate());
+        holder.createdAt.setText(builder);
 
     }
 
     @Override
     public int getItemCount() {
-        return friendsEmailList.size();
+        return friendsList.size();
     }
 
     class FriendsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
+        TextView createdAt;
+
         FriendsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_email);
+            createdAt = itemView.findViewById(R.id.text_friend_created_at);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
index c4577e3eb..61a49f097 100644
--- a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
@@ -1,6 +1,6 @@
 package org.amahi.anywhere.bus;
 
-public class AddFriendUserCompletedEvent {
+public class AddFriendUserCompletedEvent implements BusEvent {
     public boolean isSuccessful;
 
     public boolean isSuccessful() {
diff --git a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
index c67c26360..78b8fe1a3 100644
--- a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
@@ -1,13 +1,23 @@
 package org.amahi.anywhere.fragment;
 
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 
 import android.app.AlertDialog;
+
 import androidx.fragment.app.DialogFragment;
+
 import android.util.Log;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.android.material.textfield.TextInputEditText;
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.util.Fragments;
@@ -18,8 +28,10 @@ public class AlertDialogFragment extends DialogFragment implements DialogInterfa
     File file;
     private int dialogType = -1;
     AlertDialog.Builder builder;
+    private TextInputEditText textFriendEmail;
     public static final int DELETE_FILE_DIALOG = 0;
     public static final int DUPLICATE_FILE_DIALOG = 1;
+    public static final int ADD_FRIEND_DIALOG = 2;
 
 
     @NonNull
@@ -40,9 +52,19 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             case DUPLICATE_FILE_DIALOG:
                 buildDuplicateDialog();
                 break;
+
+            case ADD_FRIEND_DIALOG:
+                buildAddFriendDialog();
+                break;
         }
 
-        return builder.create();
+        Dialog dialog = builder.create();
+
+        if (dialogType == ADD_FRIEND_DIALOG) {
+            addFriendButtonClickListener(dialog);
+        }
+
+        return dialog;
     }
 
     private void buildDeleteDialog() {
@@ -60,6 +82,57 @@ private void buildDuplicateDialog() {
             .setNegativeButton(getString(R.string.button_no), this);
     }
 
+    private void buildAddFriendDialog() {
+        View v = getActivity().getLayoutInflater().inflate(R.layout.dialog_add_friend, null);
+        textFriendEmail = v.findViewById(R.id.text_email);
+
+        builder.setTitle(getString(R.string.title_add_new_friend))
+            .setMessage(getString(R.string.message_add_new_friend))
+            .setPositiveButton(getString(R.string.text_button_add_friend), this)
+            .setNegativeButton(getString(R.string.text_cancel), this);
+        builder.setView(v);
+    }
+
+    private void addFriendButtonClickListener(Dialog dialog) {
+        dialog.setOnShowListener(dialogInterface -> {
+
+            setCursorAndShowKeyboard(textFriendEmail);
+
+            Button positiveButton = ((AlertDialog) dialogInterface).getButton(DialogInterface.BUTTON_POSITIVE);
+            positiveButton.setOnClickListener(v -> {
+                AddFriendDialogCallback callback = getAddFriendCallback();
+                if (callback != null) {
+                    if (textFriendEmail.getText() != null && !textFriendEmail.getText().toString().equals("")) {
+                        dialogInterface.dismiss();
+                        callback.dialogPositiveButtonOnClick(textFriendEmail.getText().toString());
+                        hideKeyboard();
+                    } else {
+                        Toast.makeText(getContext(), R.string.message_empty_email_add_friend, Toast.LENGTH_LONG).show();
+                    }
+                }
+            });
+
+            Button negativeButton = ((AlertDialog) dialogInterface).getButton(DialogInterface.BUTTON_NEGATIVE);
+            negativeButton.setOnClickListener(v -> {
+                dialogInterface.dismiss();
+                hideKeyboard();
+            });
+        });
+    }
+
+    private void setCursorAndShowKeyboard(TextInputEditText editText) {
+        editText.setFocusable(true);
+        editText.requestFocus();
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+    }
+
+    private void hideKeyboard() {
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
+    }
+
+
     @Override
     public void onClick(DialogInterface dialog, int which) {
 
@@ -133,6 +206,25 @@ private DeleteFileDialogCallback getDeleteDialogCallback() {
         return callback;
     }
 
+    private AddFriendDialogCallback getAddFriendCallback() {
+        AddFriendDialogCallback callback;
+        if (getTargetFragment() != null) {
+            try {
+                callback = (AddFriendDialogCallback) getTargetFragment();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
+                throw e;
+            }
+        } else {
+            try {
+                callback = (AddFriendDialogCallback) getActivity();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
+                throw e;
+            }
+        }
+        return callback;
+    }
 
     public interface DuplicateFileDialogCallback {
 
@@ -147,6 +239,14 @@ public interface DeleteFileDialogCallback {
         void dialogPositiveButtonOnClick();
 
 
+        void dialogNegativeButtonOnClick();
+    }
+
+    public interface AddFriendDialogCallback {
+
+        void dialogPositiveButtonOnClick(String email);
+
+
         void dialogNegativeButtonOnClick();
     }
 
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index 6c5bdc301..2ed55b483 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -10,10 +10,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.Toast;
 
-import com.google.android.material.textfield.TextInputEditText;
 import com.squareup.otto.Subscribe;
 
 import org.amahi.anywhere.AmahiApplication;
@@ -23,7 +20,7 @@
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendRequest;
-import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.FriendUser;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,9 +51,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpFriendRequestsList();
 
-        Button btnAddFR = getView().findViewById(R.id.btn_add_fr);
 
-        btnAddFR.setOnClickListener(v -> addFriendRequest());
+        showFriendRequests();
     }
 
     private void setUpInjections() {
@@ -75,40 +71,32 @@ private void setUpFriendRequestsList() {
 
     @Subscribe
     private void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
-        showFriendRequests(event.getFriendRequests());
+        showFriendRequests();
     }
 
-    private void showFriendRequests(List<FriendRequest> friendRequests) {
-        List<String> friendRequestsEmailList = new ArrayList<>();
+    private void showFriendRequests() {
+        List<FriendRequest> friendRequestsList = new ArrayList<>();
 
-        for (FriendRequest friendRequest : friendRequests) {
-            friendRequestsEmailList.add(friendRequest.getFriendUser().getEmail());
-        }
-
-        FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsEmailList);
-        getRecyclerView().setAdapter(adapter);
-    }
+        //TODO: dummy data to be replaced with data from server
 
-    private void addFriendRequest() {
-        TextInputEditText etEmailFR = getView().findViewById(R.id.text_email);
-
-        if (etEmailFR != null && etEmailFR.getText() != null) {
-            NewFriendRequest newFriendRequest = new NewFriendRequest();
-            newFriendRequest.setEmail(etEmailFR.getText().toString());
-            serverClient.addFriendUser(newFriendRequest);
+        for (int i = 0; i <= 6; i++) {
+            FriendRequest friendRequest = new FriendRequest();
+            FriendUser friendUser = new FriendUser();
+            friendUser.setEmail("dummyuser@dummydomain.com");
+            friendRequest.setFriendUser(friendUser);
+            friendRequest.setStatus(i % 4);
+            friendRequestsList.add(friendRequest);
         }
 
+        FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsList);
+        getRecyclerView().setAdapter(adapter);
     }
 
     @Subscribe
     private void onAddFriendUser(AddFriendUserCompletedEvent event) {
         if (event.isSuccessful()) {
-            Toast.makeText(getContext(), "friend request success", Toast.LENGTH_LONG).show();
             setUpFriendRequestsList();
-        } else {
-            Toast.makeText(getContext(), "friend request failed", Toast.LENGTH_LONG).show();
         }
-
     }
 
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
index b1eaee4f7..469fb5291 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -18,9 +18,10 @@
 import org.amahi.anywhere.adapter.FriendsListAdapter;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.PrimaryUser;
+import org.amahi.anywhere.server.model.FriendUser;
 
 import java.util.ArrayList;
+
 import java.util.List;
 
 import javax.inject.Inject;
@@ -53,7 +54,8 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
 
-        setUpFriendsList();
+        //setUpFriendsList();
+        showFriendUsers();
     }
 
     private RecyclerView getRecyclerView() {
@@ -67,17 +69,27 @@ private void setUpFriendsList() {
 
     @Subscribe
     private void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
-        showFriendUsers(event.getPrimaryUsers());
+        //showFriendUsers(event.getPrimaryUsers());
     }
 
-    private void showFriendUsers(List<PrimaryUser> primaryUsers) {
-        List<String> friendsEmailList = new ArrayList<>();
+    private void showFriendUsers() {
+        List<FriendUser> friendsList = new ArrayList<>();
+
 
-        for (PrimaryUser primaryUser : primaryUsers) {
+        /*for (PrimaryUser primaryUser : primaryUsers) {
             friendsEmailList.add(primaryUser.getFriendUser().getEmail());
+        }*/
+
+        //TODO: dummy data to be replaced with data from server
+        for (int i = 0; i <= 5; i++) {
+            FriendUser friendUser = new FriendUser();
+            friendUser.setEmail("dummyuser@dummydomain.com");
+            friendUser.setCreatedDate("14-07-2019");
+            friendsList.add(friendUser);
         }
 
-        FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsEmailList);
+
+        FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsList);
         getRecyclerView().setAdapter(adapter);
 
     }
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
index 896e195a1..5389681a1 100644
--- a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
@@ -10,7 +10,7 @@ public class FriendRequest {
     private int id;
 
     @SerializedName("created_at")
-    private Date createdAt;
+    private String createdAt;
 
     @SerializedName("status")
     private int status;
@@ -29,11 +29,11 @@ public void setId(int id) {
         this.id = id;
     }
 
-    public Date getCreatedAt() {
+    public String getCreatedAt() {
         return createdAt;
     }
 
-    public void setCreatedAt(Date createdAt) {
+    public void setCreatedAt(String createdAt) {
         this.createdAt = createdAt;
     }
 
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
index e60c593e7..48517dfdf 100644
--- a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
@@ -9,7 +9,7 @@ public class FriendUser {
     private int id;
 
     @SerializedName("created_at")
-    private Date createdDate;
+    private String createdDate;
 
     @SerializedName("email")
     private String email;
@@ -19,7 +19,7 @@ public int getId() {
         return id;
     }
 
-    public Date getCreatedDate() {
+    public String getCreatedDate() {
         return createdDate;
     }
 
@@ -36,7 +36,7 @@ public void setEmail(String email) {
         this.email = email;
     }
 
-    public void setCreatedDate(Date createdDate) {
+    public void setCreatedDate(String createdDate) {
         this.createdDate = createdDate;
     }
 }
diff --git a/src/main/res/drawable/friend_status_background.xml b/src/main/res/drawable/friend_status_background.xml
new file mode 100644
index 000000000..49ba6fea1
--- /dev/null
+++ b/src/main/res/drawable/friend_status_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/status_active" />
+    <corners
+        android:radius="5dp"
+        android:topRightRadius="30dp"
+        android:topLeftRadius="30dp"
+        android:bottomLeftRadius="30dp"
+        android:bottomRightRadius="30dp" />
+</shape>
diff --git a/src/main/res/drawable/ic_add_friend.xml b/src/main/res/drawable/ic_add_friend.xml
new file mode 100644
index 000000000..c273ca40b
--- /dev/null
+++ b/src/main/res/drawable/ic_add_friend.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/src/main/res/layout/activity_friends.xml b/src/main/res/layout/activity_friends.xml
index 7833a70eb..2fd6c32d7 100644
--- a/src/main/res/layout/activity_friends.xml
+++ b/src/main/res/layout/activity_friends.xml
@@ -1,19 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
-    tools:context=".activity.FriendsActivity"
-    android:orientation="vertical">
-
-    <com.google.android.material.tabs.TabLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/tablayout_friends" />
-
-    <androidx.viewpager.widget.ViewPager
+    tools:context=".activity.FriendsActivity">
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/pager_friends"/>
+        android:orientation="vertical">
 
-</LinearLayout>
+        <com.google.android.material.tabs.TabLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/tablayout_friends"
+            android:background="@color/background_toolbar" />
+
+        <androidx.viewpager.widget.ViewPager
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/pager_friends"/>
+
+    </LinearLayout>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_add_friend"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginBottom="25dp"
+        android:layout_marginEnd="25dp"
+        android:src="@drawable/ic_add_friend"/>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/src/main/res/layout/dialog_add_friend.xml b/src/main/res/layout/dialog_add_friend.xml
new file mode 100644
index 000000000..d73a7b6f1
--- /dev/null
+++ b/src/main/res/layout/dialog_add_friend.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp">
+    <com.google.android.material.textfield.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/email_text_layout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:hint="Registered email of friend">
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/text_email"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textEmailAddress"/>
+    </com.google.android.material.textfield.TextInputLayout>
+</RelativeLayout>
diff --git a/src/main/res/layout/fragment_friend_requests.xml b/src/main/res/layout/fragment_friend_requests.xml
index be6077f4b..7ff8ef9db 100644
--- a/src/main/res/layout/fragment_friend_requests.xml
+++ b/src/main/res/layout/fragment_friend_requests.xml
@@ -3,52 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".fragment.FriendRequestsFragment">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/card_add_fr"
-        android:layout_margin="8dp"
-        android:padding="8dp"
-        app:cardCornerRadius="4dp">
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/email_text_layout"
-                android:layout_margin="8dp"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:hint="Registered email of friend">
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/text_email"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:inputType="textEmailAddress"/>
-            </com.google.android.material.textfield.TextInputLayout>
-            <Button
-                android:id="@+id/btn_add_fr"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Add Friend"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:layout_below="@+id/email_text_layout"
-                android:background="@color/accent"
-                android:textColor="@android:color/white"/>
-        </RelativeLayout>
-    </androidx.cardview.widget.CardView>
-
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/list_friend_requests"
-        android:layout_below="@+id/card_add_fr"
-        android:layout_margin="8dp"/>
+        android:id="@+id/list_friend_requests" />
 
 </RelativeLayout>
diff --git a/src/main/res/layout/friend_requests_list_item.xml b/src/main/res/layout/friend_requests_list_item.xml
index dae5c2a0f..74ff3f05e 100644
--- a/src/main/res/layout/friend_requests_list_item.xml
+++ b/src/main/res/layout/friend_requests_list_item.xml
@@ -1,14 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="4dp"
+    style="@style/Widget.MaterialComponents.CardView"
+    android:focusable="true"
+    android:clickable="true"
+    android:background="?android:attr/selectableItemBackground"
+    app:cardElevation="4dp"
+    android:layout_margin="4dp"
+    android:padding="8dp">
+    <LinearLayout
+        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/text_friend_request_email"
-        android:padding="8dp"
-        android:textSize="16sp"
-        android:textColor="@color/primary_text"/>
+        android:padding="8dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="3"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_friend_request_email"
+            android:padding="8dp"
+            android:textSize="16sp"
+            android:textColor="@color/primary_text" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:id="@+id/text_friend_request_status"
+            android:text="Accepted"
+            android:layout_gravity="center"
+            android:textSize="14sp"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:background="@drawable/friend_status_background" />
+
+    </LinearLayout>
 
-</LinearLayout>
+</androidx.cardview.widget.CardView>
diff --git a/src/main/res/layout/friends_list_item.xml b/src/main/res/layout/friends_list_item.xml
index e58ec1d09..b1fe3eeb8 100644
--- a/src/main/res/layout/friends_list_item.xml
+++ b/src/main/res/layout/friends_list_item.xml
@@ -1,14 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardCornerRadius="4dp"
+    style="@style/Widget.MaterialComponents.CardView"
+    android:focusable="true"
+    android:clickable="true"
+    android:background="?android:attr/selectableItemBackground"
+    android:orientation="horizontal"
+    app:cardElevation="4dp"
+    android:layout_margin="4dp"
+    android:padding="8dp">
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/text_friend_email"
-        android:padding="8dp"
-        android:textSize="16sp"
-        android:textColor="@color/primary_text"/>
+        android:padding="8dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_friend_email"
+            android:textSize="18sp"
+            android:textColor="@color/primary_text"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_friend_created_at"
+            android:text="Friends since 01-08-2018"
+            android:textSize="14sp"/>
+
+
 
-</LinearLayout>
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 68f84ae63..e0b24fe84 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -37,6 +37,14 @@
         <item name="android:elevation">8dp</item>
     </style>
 
+    <style name="Theme.Amahi.ActionBar.NoElevation" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:background">@color/background_toolbar</item>
+        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
+        <!--Adding Support for the Support Library-->
+        <item name="background">@color/background_toolbar</item>
+        <item name="displayOptions">showHome|homeAsUp|showTitle</item>
+    </style>
+
     <style name="Theme.Amahi.NoActionBar">
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index ebd234459..577dd01ed 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -46,4 +46,10 @@
     <color name="intro_4">#26a69a</color>
     <color name="intro_5">#ffab00</color>
     <color name="intro_6">#303f9f</color>
+
+    <!--Friend request status colors-->
+    <color name="status_active">#19B4F4</color>
+    <color name="status_accepted">#4CBB17</color>
+    <color name="status_rejected">#E60000</color>
+    <color name="status_expired">#fad201</color>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 486a0b32a..1d4a30835 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -188,7 +188,11 @@
 
     <string name="download_channel" translatable="false">File Download</string>
     <string name="download_channel_desc" translatable="false">Shows file download progress</string>
-
+    <string name="message_empty_email_add_friend">Email should not be empty</string>
+    <string name="title_add_new_friend">Add New Friend</string>
+    <string name="message_add_new_friend">Friend request will be sent to the provided email</string>
+    <string name="text_button_add_friend">Add Friend</string>
+    <string name="text_cancel">Cancel</string>
 
 
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 87bef4394..425acac57 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -71,6 +71,19 @@
         <item name="elevation">8dp</item>
     </style>
 
+    <style name="Theme.Amahi.Friends" parent="Theme.Amahi">
+        <item name="android:actionBarStyle">@style/Theme.Amahi.ActionBar.NoElevation</item>
+        <item name="actionBarStyle">@style/Theme.Amahi.ActionBar.NoElevation</item>
+    </style>
+
+    <style name="Theme.Amahi.ActionBar.NoElevation" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="android:background">@color/background_toolbar</item>
+        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
+        <!--Adding Support for the Support Library-->
+        <item name="background">@color/background_toolbar</item>
+        <item name="displayOptions">showHome|homeAsUp|showTitle</item>
+    </style>
+
     <style name="DrawerArrowStyle" parent="@style/Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">true</item>
         <item name="color">@color/primary_text</item>

From a5c879b8c1e7c9115b63c474c537029d3c2674a3 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 21 Jul 2019 00:44:45 +0530
Subject: [PATCH 11/16] adds delete friend user, delete and resend friend
 request options

---
 .../adapter/FriendRequestsListAdapter.java    |  28 ++++
 .../anywhere/adapter/FriendsListAdapter.java  |  28 ++++
 .../amahi/anywhere/bus/FriendDeleteEvent.java |   5 +
 .../bus/FriendRequestDeleteEvent.java         |   4 +
 .../bus/FriendRequestResendEvent.java         |   4 +
 .../fragment/AlertDialogFragment.java         | 114 +++++++++++++-
 .../fragment/FriendRequestsFragment.java      | 144 +++++++++++++++---
 .../FriendRequestsOptionsDialogFragment.java  |  44 ++++++
 .../anywhere/fragment/FriendsFragment.java    | 140 +++++++++++++++--
 .../FriendsOptionsDialogFragment.java         |  46 ++++++
 .../amahi/anywhere/server/api/ServerApi.java  |  10 ++
 .../anywhere/server/client/ServerClient.java  |   8 +
 .../org/amahi/anywhere/util/Fragments.java    |  14 ++
 .../util/FriendRequestsItemClickListener.java |  15 ++
 .../util/FriendsItemClickListener.java        |  16 ++
 src/main/res/drawable/ic_resend.xml           |   9 ++
 .../layout/friend_requests_bottom_sheet.xml   |  32 ++++
 .../res/layout/friend_requests_list_item.xml  |  12 +-
 src/main/res/layout/friends_bottom_sheet.xml  |  32 ++++
 src/main/res/layout/friends_list_item.xml     |  50 ++++--
 src/main/res/values/strings.xml               |   5 +
 21 files changed, 712 insertions(+), 48 deletions(-)
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
 create mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
 create mode 100644 src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
 create mode 100644 src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
 create mode 100644 src/main/res/drawable/ic_resend.xml
 create mode 100644 src/main/res/layout/friend_requests_bottom_sheet.xml
 create mode 100644 src/main/res/layout/friends_bottom_sheet.xml

diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
index cd1d6554a..cc866cc9b 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -5,6 +5,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -12,12 +13,15 @@
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
 import java.util.List;
 
 public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
     private List<FriendRequest> friendRequestsList;
     private Context context;
+    private FriendRequestsItemClickListener friendsItemClickListener;
+    private int selectedPosition = RecyclerView.NO_POSITION;
 
     public FriendRequestsListAdapter(Context context, List<FriendRequest> friendRequestsList) {
         this.context = context;
@@ -25,6 +29,23 @@ public FriendRequestsListAdapter(Context context, List<FriendRequest> friendRequ
 
     }
 
+    public void setOnClickListener(FriendRequestsItemClickListener listener) {
+        this.friendsItemClickListener = listener;
+    }
+
+    public int getSelectedPosition() {
+        return selectedPosition;
+    }
+
+    public void setSelectedPosition(int selectedPosition) {
+        this.selectedPosition = selectedPosition;
+    }
+
+    public void removeFriend(int position) {
+        this.friendRequestsList.remove(position);
+        notifyDataSetChanged();
+    }
+
     @NonNull
     @Override
     public FriendRequestsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -63,6 +84,11 @@ public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int p
         drawable.setColor(context.getResources().getColor(colorResourceId));
         holder.friendRequestStatus.setBackground(drawable);
 
+        holder.moreOptions.setOnClickListener(v -> {
+            friendsItemClickListener.onMoreOptionClick(holder.itemView, position);
+
+        });
+
     }
 
     @Override
@@ -73,11 +99,13 @@ public int getItemCount() {
     class FriendRequestsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
         TextView friendRequestStatus;
+        ImageView moreOptions;
 
         FriendRequestsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_request_email);
             friendRequestStatus = itemView.findViewById(R.id.text_friend_request_status);
+            moreOptions = itemView.findViewById(R.id.friend_requests_options);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
index e0e7400d0..21ca08e6d 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -4,6 +4,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -11,12 +12,15 @@
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.util.FriendsItemClickListener;
 
 import java.util.List;
 
 public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
     private List<FriendUser> friendsList;
     private Context context;
+    private FriendsItemClickListener friendsItemClickListener;
+    private int selectedPosition = RecyclerView.NO_POSITION;
 
     public FriendsListAdapter(Context context, List<FriendUser> friendsList) {
         this.context = context;
@@ -24,6 +28,23 @@ public FriendsListAdapter(Context context, List<FriendUser> friendsList) {
 
     }
 
+    public void setOnClickListener(FriendsItemClickListener listener) {
+        this.friendsItemClickListener = listener;
+    }
+
+    public int getSelectedPosition() {
+        return selectedPosition;
+    }
+
+    public void setSelectedPosition(int selectedPosition) {
+        this.selectedPosition = selectedPosition;
+    }
+
+    public void removeFriend(int position) {
+        this.friendsList.remove(position);
+        notifyDataSetChanged();
+    }
+
     @NonNull
     @Override
     public FriendsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -38,6 +59,11 @@ public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position
         builder.append(friendsList.get(position).getCreatedDate());
         holder.createdAt.setText(builder);
 
+        holder.moreOptions.setOnClickListener(v -> {
+            friendsItemClickListener.onMoreOptionClick(holder.itemView, position);
+
+        });
+
     }
 
     @Override
@@ -48,11 +74,13 @@ public int getItemCount() {
     class FriendsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
         TextView createdAt;
+        ImageView moreOptions;
 
         FriendsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_email);
             createdAt = itemView.findViewById(R.id.text_friend_created_at);
+            moreOptions = itemView.findViewById(R.id.friends_more_options);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
new file mode 100644
index 000000000..cb1ccbdab
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
@@ -0,0 +1,5 @@
+package org.amahi.anywhere.bus;
+
+public class FriendDeleteEvent {
+
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
new file mode 100644
index 000000000..8cf007ad8
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class FriendRequestDeleteEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
new file mode 100644
index 000000000..e5b8121ca
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class FreindRequestResendEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
index 78b8fe1a3..08eaf03a4 100644
--- a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
@@ -32,6 +32,8 @@ public class AlertDialogFragment extends DialogFragment implements DialogInterfa
     public static final int DELETE_FILE_DIALOG = 0;
     public static final int DUPLICATE_FILE_DIALOG = 1;
     public static final int ADD_FRIEND_DIALOG = 2;
+    public static final int DELETE_FRIEND_DIALOG = 3;
+    public static final int DELETE_FRIEND_REQUEST_DIALOG = 4;
 
 
     @NonNull
@@ -56,6 +58,12 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             case ADD_FRIEND_DIALOG:
                 buildAddFriendDialog();
                 break;
+            case DELETE_FRIEND_DIALOG:
+                buildDeleteFriendDialog();
+                break;
+
+            case DELETE_FRIEND_REQUEST_DIALOG:
+                buildDeleteFriendRequestDialog();
         }
 
         Dialog dialog = builder.create();
@@ -93,6 +101,20 @@ private void buildAddFriendDialog() {
         builder.setView(v);
     }
 
+    private void buildDeleteFriendDialog() {
+        builder.setTitle(R.string.title_delete_friend)
+            .setMessage(getString(R.string.message_delete_friend))
+            .setPositiveButton(R.string.text_delete, this)
+            .setNegativeButton(getString(R.string.text_cancel), this);
+    }
+
+    private void buildDeleteFriendRequestDialog() {
+        builder.setTitle(getString(R.string.title_delete_friend_request))
+            .setMessage(getString(R.string.message_delete_friend_request))
+            .setPositiveButton(R.string.text_delete, this)
+            .setNegativeButton(R.string.text_cancel, this);
+    }
+
     private void addFriendButtonClickListener(Dialog dialog) {
         dialog.setOnShowListener(dialogInterface -> {
 
@@ -123,13 +145,17 @@ private void addFriendButtonClickListener(Dialog dialog) {
     private void setCursorAndShowKeyboard(TextInputEditText editText) {
         editText.setFocusable(true);
         editText.requestFocus();
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        if (getActivity() != null) {
+            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        }
     }
 
     private void hideKeyboard() {
-        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
+        if (getActivity() != null) {
+            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
+        }
     }
 
 
@@ -152,6 +178,30 @@ public void onClick(DialogInterface dialog, int which) {
         } else if (dialogType == DELETE_FILE_DIALOG) {
             DeleteFileDialogCallback callback = getDeleteDialogCallback();
 
+            if (callback != null) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    dialog.dismiss();
+                    callback.dialogPositiveButtonOnClick();
+                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
+                    dialog.dismiss();
+                    callback.dialogNegativeButtonOnClick();
+                }
+            }
+        } else if (dialogType == DELETE_FRIEND_DIALOG) {
+            DeleteFriendDialogCallback callback = getDeleteFriendDialogCallback();
+
+            if (callback != null) {
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    dialog.dismiss();
+                    callback.dialogPositiveButtonOnClick();
+                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
+                    dialog.dismiss();
+                    callback.dialogNegativeButtonOnClick();
+                }
+            }
+        } else if (dialogType == DELETE_FRIEND_REQUEST_DIALOG) {
+            DeleteFriendRequestDialogCallback callback = getDeleteFriendRequestDialogCallback();
+
             if (callback != null) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
                     dialog.dismiss();
@@ -226,6 +276,46 @@ private AddFriendDialogCallback getAddFriendCallback() {
         return callback;
     }
 
+    private DeleteFriendDialogCallback getDeleteFriendDialogCallback() {
+        DeleteFriendDialogCallback callback;
+        if (getTargetFragment() != null) {
+            try {
+                callback = (DeleteFriendDialogCallback) getTargetFragment();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
+                throw e;
+            }
+        } else {
+            try {
+                callback = (DeleteFriendDialogCallback) getActivity();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
+                throw e;
+            }
+        }
+        return callback;
+    }
+
+    private DeleteFriendRequestDialogCallback getDeleteFriendRequestDialogCallback() {
+        DeleteFriendRequestDialogCallback callback;
+        if (getTargetFragment() != null) {
+            try {
+                callback = (DeleteFriendRequestDialogCallback) getTargetFragment();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
+                throw e;
+            }
+        } else {
+            try {
+                callback = (DeleteFriendRequestDialogCallback) getActivity();
+            } catch (ClassCastException e) {
+                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
+                throw e;
+            }
+        }
+        return callback;
+    }
+
     public interface DuplicateFileDialogCallback {
 
         void dialogPositiveButtonOnClick(File file);
@@ -247,6 +337,22 @@ public interface AddFriendDialogCallback {
         void dialogPositiveButtonOnClick(String email);
 
 
+        void dialogNegativeButtonOnClick();
+    }
+
+    public interface DeleteFriendDialogCallback {
+
+        void dialogPositiveButtonOnClick();
+
+
+        void dialogNegativeButtonOnClick();
+    }
+
+    public interface DeleteFriendRequestDialogCallback {
+
+        void dialogPositiveButtonOnClick();
+
+
         void dialogNegativeButtonOnClick();
     }
 
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index 2ed55b483..4f2131d59 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -1,7 +1,9 @@
 package org.amahi.anywhere.fragment;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -10,6 +12,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import com.squareup.otto.Subscribe;
 
@@ -17,10 +20,14 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendRequestsListAdapter;
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendRequest;
 import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.util.Fragments;
+import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,10 +37,15 @@
 /**
  * Friend Requests Fragment, shows list of friend requests.
  */
-public class FriendRequestsFragment extends Fragment {
+public class FriendRequestsFragment extends Fragment implements
+    FriendRequestsItemClickListener,
+    AlertDialogFragment.DeleteFriendRequestDialogCallback {
 
     @Inject
     ServerClient serverClient;
+    private ProgressDialog deleteProgressDialog;
+    List<FriendRequest> friendRequestsList;
+    private final static String SELECTED_ITEM = "selected_item";
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -47,12 +59,10 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpInjections();
 
-        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
-
-        setUpFriendRequestsList();
+        setUpFriendRequestsList(savedInstanceState);
 
+        setUpProgressDialog();
 
-        showFriendRequests();
     }
 
     private void setUpInjections() {
@@ -63,19 +73,27 @@ private RecyclerView getRecyclerView() {
         return getView().findViewById(R.id.list_friend_requests);
     }
 
-    private void setUpFriendRequestsList() {
-        if (serverClient.isConnected()) {
+    private void setUpFriendRequestsList(Bundle state) {
+        setUpItemsMenu();
+        /*if (serverClient.isConnected()) {
             serverClient.getFriendRequests();
-        }
+        }*/
+        setUpListAdapter(state);
+        setUpListActions();
+
+
     }
 
-    @Subscribe
-    private void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
-        showFriendRequests();
+    private void setUpItemsMenu() {
+        setHasOptionsMenu(true);
+    }
+
+    private void setUpListActions() {
+        getListAdapter().setOnClickListener(this);
     }
 
-    private void showFriendRequests() {
-        List<FriendRequest> friendRequestsList = new ArrayList<>();
+    private void setUpListAdapter(Bundle state) {
+        friendRequestsList = new ArrayList<>();
 
         //TODO: dummy data to be replaced with data from server
 
@@ -89,14 +107,106 @@ private void showFriendRequests() {
         }
 
         FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsList);
+        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
+
+        if (isStateValid(state)) {
+            getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
+        }
+    }
+
+    private FriendRequestsListAdapter getListAdapter() {
+        return (FriendRequestsListAdapter) getRecyclerView().getAdapter();
+    }
+
+    private boolean isStateValid(Bundle state) {
+        return (state != null) && state.containsKey(SELECTED_ITEM);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        BusProvider.getBus().register(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        BusProvider.getBus().unregister(this);
+    }
+
+
     @Subscribe
-    private void onAddFriendUser(AddFriendUserCompletedEvent event) {
-        if (event.isSuccessful()) {
-            setUpFriendRequestsList();
-        }
+    public void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
+        //setUpListAdapter();
     }
 
+    @Subscribe
+    public void onAddFriendUser(AddFriendUserCompletedEvent event) {
+        /*if (event.isSuccessful()) {
+            setUpListAdapter();
+        }*/
+    }
+
+    @Subscribe
+    public void onDeleteFriendRequest(FriendRequestDeleteEvent event) {
+        deleteFriendRequest();
+    }
+
+    private void deleteFriendRequest() {
+        AlertDialogFragment deleteFriendRequestDialog = new AlertDialogFragment();
+        Bundle bundle = new Bundle();
+        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.DELETE_FRIEND_REQUEST_DIALOG);
+        deleteFriendRequestDialog.setArguments(bundle);
+        deleteFriendRequestDialog.setTargetFragment(this, 2);
+        deleteFriendRequestDialog.show(getFragmentManager(), "delete_friend_request_dialog");
+    }
+
+    @Override
+    public void onItemClick(View view, int position) {
+
+    }
+
+    @Override
+    public void onMoreOptionClick(View view, int position) {
+        getListAdapter().setSelectedPosition(position);
+        Fragments.Builder.buildFriendRequestsOptionsDialogFragment()
+            .show(getChildFragmentManager(), "friend_requests_options_dialog");
+
+
+    }
+
+    private void setUpProgressDialog() {
+        deleteProgressDialog = new ProgressDialog(getContext());
+        deleteProgressDialog.setMessage(getString(R.string.message_delete_progress));
+        deleteProgressDialog.setIndeterminate(true);
+        deleteProgressDialog.setCancelable(false);
+    }
+
+
+    @Override
+    public void dialogPositiveButtonOnClick() {
+
+        int selectedPosition = getListAdapter().getSelectedPosition();
+        //show progress dialog and delete data from server
+        //deleteProgressDialog.show();
+        //serverClient.deleteFriendRequest(friendRequestsList.get(selectedPosition).getId());
+
+        getListAdapter().removeFriend(selectedPosition);
+        Toast.makeText(getContext(), "Friend Request deleted successfully", Toast.LENGTH_LONG).show();
+
+    }
+
+    @Override
+    public void dialogNegativeButtonOnClick() {
+
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(SELECTED_ITEM, getListAdapter().getSelectedPosition());
+    }
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
new file mode 100644
index 000000000..fdf016fee
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
@@ -0,0 +1,44 @@
+package org.amahi.anywhere.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
+
+public class FriendRequestsOptionsDialogFragment extends BottomSheetDialogFragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.friend_requests_bottom_sheet, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        setUpViews(view);
+    }
+
+    private void setUpViews(View view) {
+
+        LinearLayout deleteLayout = view.findViewById(R.id.friend_requests_delete_layout);
+
+        deleteLayout.setOnClickListener(v -> setUpDelete());
+    }
+
+    private void setUpDelete() {
+        BusProvider.getBus().post(new FriendRequestDeleteEvent());
+        dismiss();
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
index 469fb5291..595f1519f 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -1,5 +1,6 @@
 package org.amahi.anywhere.fragment;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -10,15 +11,20 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import com.squareup.otto.Subscribe;
 
 import org.amahi.anywhere.AmahiApplication;
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsListAdapter;
+import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
+import org.amahi.anywhere.bus.FriendDeleteEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.util.Fragments;
+import org.amahi.anywhere.util.FriendsItemClickListener;
 
 import java.util.ArrayList;
 
@@ -29,10 +35,15 @@
 /**
  * Friends Fragment, shows list of friended users.
  */
-public class FriendsFragment extends Fragment {
+public class FriendsFragment extends Fragment implements
+    FriendsItemClickListener,
+    AlertDialogFragment.DeleteFriendDialogCallback {
 
     @Inject
     ServerClient serverClient;
+    private ProgressDialog deleteProgressDialog;
+    private List<FriendUser> friendsList;
+    private final static String SELECTED_ITEM = "selected_item";
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -52,28 +63,45 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpInjections();
 
-        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
+        setUpFriendsList(savedInstanceState);
+
+        setUpProgressDialog();
 
         //setUpFriendsList();
-        showFriendUsers();
+
     }
 
     private RecyclerView getRecyclerView() {
         return (RecyclerView) getView().findViewById(R.id.list_friends);
     }
 
-    private void setUpFriendsList() {
-        serverClient.getFriendUsers();
+    private void setUpFriendsList(Bundle state) {
+        setUpItemsMenu();
+        //setup data from server
+        /*if (serverClient.isConnected()) {
+            serverClient.getFriendUsers();
+        }*/
+        setUpListAdapter(state);
+        setUpListActions();
+
 
     }
 
-    @Subscribe
-    private void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
-        //showFriendUsers(event.getPrimaryUsers());
+    private void setUpItemsMenu() {
+        setHasOptionsMenu(true);
     }
 
-    private void showFriendUsers() {
-        List<FriendUser> friendsList = new ArrayList<>();
+
+    private void setUpListActions() {
+        getListAdapter().setOnClickListener(this);
+    }
+
+    private FriendsListAdapter getListAdapter() {
+        return (FriendsListAdapter) getRecyclerView().getAdapter();
+    }
+
+    private void setUpListAdapter(Bundle state) {
+        friendsList = new ArrayList<>();
 
 
         /*for (PrimaryUser primaryUser : primaryUsers) {
@@ -85,14 +113,104 @@ private void showFriendUsers() {
             FriendUser friendUser = new FriendUser();
             friendUser.setEmail("dummyuser@dummydomain.com");
             friendUser.setCreatedDate("14-07-2019");
+            friendUser.setId(1234);
             friendsList.add(friendUser);
         }
 
-
         FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsList);
+        getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
 
+        if (isStateValid(state)) {
+            getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
+        }
+
+
+    }
+
+    private boolean isStateValid(Bundle state) {
+        return (state != null) && state.containsKey(SELECTED_ITEM);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        BusProvider.getBus().register(this);
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        BusProvider.getBus().unregister(this);
+    }
+
+    @Subscribe
+    public void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
+        //setUpListAdapter(event.getPrimaryUsers());
+    }
+
+    @Subscribe
+    public void onDeleteFriend(FriendDeleteEvent event) {
+        deleteFriend();
+
+    }
+
+    private void deleteFriend() {
+        AlertDialogFragment deleteFriendDialog = new AlertDialogFragment();
+        Bundle bundle = new Bundle();
+        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.DELETE_FRIEND_DIALOG);
+        deleteFriendDialog.setArguments(bundle);
+        deleteFriendDialog.setTargetFragment(this, 2);
+        deleteFriendDialog.show(getFragmentManager(), "delete_friend_dialog");
+    }
+
+
+    @Override
+    public void onItemClick(View view, int position) {
+
+    }
+
+    @Override
+    public void onMoreOptionClick(View view, int position) {
+        getListAdapter().setSelectedPosition(position);
+        Fragments.Builder.buildFriendsOptionsDialogFragment()
+            .show(getChildFragmentManager(), "friends_options_dialog");
+
+
+    }
+
+    private void setUpProgressDialog() {
+        deleteProgressDialog = new ProgressDialog(getContext());
+        deleteProgressDialog.setMessage(getString(R.string.message_delete_progress));
+        deleteProgressDialog.setIndeterminate(true);
+        deleteProgressDialog.setCancelable(false);
+    }
+
+    //delete friend confirmation dialog callback methods
+    @Override
+    public void dialogPositiveButtonOnClick() {
+        int selectedPosition = getListAdapter().getSelectedPosition();
+        //delete data from server and show progress dialog
+        //deleteProgressDialog.show();
+        //serverClient.deleteFriendUser(friendsList.get(selectedPosition).getId());
+
+        getListAdapter().removeFriend(selectedPosition);
+        Toast.makeText(getContext(), "Friend deleted successfully", Toast.LENGTH_LONG).show();
+
+    }
+
+    @Override
+    public void dialogNegativeButtonOnClick() {
+
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putInt(SELECTED_ITEM, getListAdapter().getSelectedPosition());
+    }
 
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
new file mode 100644
index 000000000..c3c7d4a72
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
@@ -0,0 +1,46 @@
+package org.amahi.anywhere.fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import org.amahi.anywhere.R;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.FriendDeleteEvent;
+
+public class FriendsOptionsDialogFragment extends BottomSheetDialogFragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.friends_bottom_sheet, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        setUpViews(view);
+    }
+
+    private void setUpViews(View view) {
+        LinearLayout deleteLayout = view.findViewById(R.id.friends_delete_layout);
+
+        deleteLayout.setOnClickListener(v -> setUpDelete());
+
+    }
+
+    private void setUpDelete() {
+        BusProvider.getBus().post(new FriendDeleteEvent());
+        dismiss();
+    }
+
+
+}
diff --git a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
index 50b14133b..c37a36006 100644
--- a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
+++ b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
@@ -91,4 +91,14 @@ Call<NewFriendRequest> addFriendUser(
     @GET("/frnd/requests")
     Call<List<FriendRequest>> getFriendRequests(
         @Header("Session") String session);
+
+    @DELETE("/frnd/user/")
+    Call<Void> deleteFriendUser(
+        @Header("Session") String session,
+        @Query("id") int id);
+
+    @DELETE("/frnd/request")
+    Call<VerifyError> deleteFriendRequest(
+        @Header("Session") String session,
+        @Query("id") int id);
 }
diff --git a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
index bd11c0108..e57cf7d3d 100644
--- a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
+++ b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
@@ -343,4 +343,12 @@ public void addFriendUser(NewFriendRequest friendRequest) {
     public void getFriendRequests() {
         serverApi.getFriendRequests(server.getSession()).enqueue(new FriendRequestsResponse());
     }
+
+    public void deleteFriendUser(int id) {
+        serverApi.deleteFriendUser(server.getSession(), id);
+    }
+
+    public void deleteFriendRequest(int id) {
+        serverApi.deleteFriendRequest(server.getSession(), id);
+    }
 }
diff --git a/src/main/java/org/amahi/anywhere/util/Fragments.java b/src/main/java/org/amahi/anywhere/util/Fragments.java
index 97d52d05e..70058a52b 100644
--- a/src/main/java/org/amahi/anywhere/util/Fragments.java
+++ b/src/main/java/org/amahi/anywhere/util/Fragments.java
@@ -21,13 +21,17 @@
 
 import android.content.Context;
 import android.os.Bundle;
+
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.appcompat.app.AppCompatActivity;
 
 import org.amahi.anywhere.fragment.AudioListFragment;
 import org.amahi.anywhere.fragment.FileOptionsDialogFragment;
+import org.amahi.anywhere.fragment.FriendRequestsOptionsDialogFragment;
+import org.amahi.anywhere.fragment.FriendsOptionsDialogFragment;
 import org.amahi.anywhere.fragment.NavigationFragment;
 import org.amahi.anywhere.fragment.ServerAppsFragment;
 import org.amahi.anywhere.fragment.ServerFileAudioFragment;
@@ -187,6 +191,16 @@ public static BottomSheetDialogFragment buildOfflineFileOptionsDialogFragment()
             return fragment;
         }
 
+        public static BottomSheetDialogFragment buildFriendsOptionsDialogFragment() {
+            BottomSheetDialogFragment fragment = new FriendsOptionsDialogFragment();
+            return fragment;
+        }
+
+        public static BottomSheetDialogFragment buildFriendRequestsOptionsDialogFragment() {
+            BottomSheetDialogFragment fragment = new FriendRequestsOptionsDialogFragment();
+            return fragment;
+        }
+
     }
 
     public static final class Operator {
diff --git a/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java b/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
new file mode 100644
index 000000000..0289bc7be
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
@@ -0,0 +1,15 @@
+package org.amahi.anywhere.util;
+
+import android.view.View;
+
+/**
+ * FriendRequestsItemClickListener interface.
+ * Handles onItemClick and onMoreOptionClick for FriendRequestsListAdapter
+ */
+
+public interface FriendRequestsItemClickListener {
+
+    void onItemClick(View view, int position);
+
+    void onMoreOptionClick(View view, int position);
+}
diff --git a/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java b/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
new file mode 100644
index 000000000..8273729c4
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
@@ -0,0 +1,16 @@
+package org.amahi.anywhere.util;
+
+import android.view.View;
+
+/**
+ * FriendsItemClickListener interface.
+ * Handles onItemClick and onMoreOptionClick for FriendsListAdapter
+ */
+
+public interface FriendsItemClickListener {
+
+    void onItemClick(View view, int position);
+
+    void onMoreOptionClick(View view, int position);
+
+}
diff --git a/src/main/res/drawable/ic_resend.xml b/src/main/res/drawable/ic_resend.xml
new file mode 100644
index 000000000..0ff0a64d7
--- /dev/null
+++ b/src/main/res/drawable/ic_resend.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
+</vector>
diff --git a/src/main/res/layout/friend_requests_bottom_sheet.xml b/src/main/res/layout/friend_requests_bottom_sheet.xml
new file mode 100644
index 000000000..c12a333cb
--- /dev/null
+++ b/src/main/res/layout/friend_requests_bottom_sheet.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/friend_requests_delete_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:src="@drawable/ic_delete"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/menu_delete"
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/src/main/res/layout/friend_requests_list_item.xml b/src/main/res/layout/friend_requests_list_item.xml
index 74ff3f05e..9d8526514 100644
--- a/src/main/res/layout/friend_requests_list_item.xml
+++ b/src/main/res/layout/friend_requests_list_item.xml
@@ -19,7 +19,7 @@
 
         <TextView
             android:layout_width="0dp"
-            android:layout_weight="3"
+            android:layout_weight="8"
             android:layout_height="wrap_content"
             android:id="@+id/text_friend_request_email"
             android:padding="8dp"
@@ -28,7 +28,7 @@
 
         <TextView
             android:layout_width="0dp"
-            android:layout_weight="1"
+            android:layout_weight="3"
             android:layout_height="wrap_content"
             android:padding="8dp"
             android:id="@+id/text_friend_request_status"
@@ -39,6 +39,14 @@
             android:textColor="@android:color/white"
             android:background="@drawable/friend_status_background" />
 
+        <ImageView
+            android:id="@+id/friend_requests_options"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/ic_more_vert"
+            android:layout_gravity="center" />
+
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>
diff --git a/src/main/res/layout/friends_bottom_sheet.xml b/src/main/res/layout/friends_bottom_sheet.xml
new file mode 100644
index 000000000..ae07db636
--- /dev/null
+++ b/src/main/res/layout/friends_bottom_sheet.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@android:color/white"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/friends_delete_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:src="@drawable/ic_delete"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/menu_delete"
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/src/main/res/layout/friends_list_item.xml b/src/main/res/layout/friends_list_item.xml
index b1fe3eeb8..5819ef0c2 100644
--- a/src/main/res/layout/friends_list_item.xml
+++ b/src/main/res/layout/friends_list_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView 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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -13,26 +14,47 @@
     android:layout_margin="4dp"
     android:padding="8dp">
     <LinearLayout
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
         android:padding="8dp">
-
-        <TextView
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_weight="8"
             android:layout_height="wrap_content"
-            android:id="@+id/text_friend_email"
-            android:textSize="18sp"
-            android:textColor="@color/primary_text"/>
+            android:orientation="vertical">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/text_friend_created_at"
-            android:text="Friends since 01-08-2018"
-            android:textSize="14sp"/>
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/text_friend_email"
+                android:textSize="18sp"
+                android:textColor="@color/primary_text"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/text_friend_created_at"
+                android:gravity="center_vertical"
+                android:paddingEnd="5dp"
+                android:paddingTop="5dp"
+                android:text="Friends since 01-08-2018"
+                android:textSize="14sp"/>
+
+        </LinearLayout>
 
 
 
+        <ImageView
+            android:id="@+id/friends_more_options"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/ic_more_vert"
+            tools:ignore="contentDescription" />
+
     </LinearLayout>
+
+
 </androidx.cardview.widget.CardView>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1d4a30835..c9a6df36f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -193,6 +193,11 @@
     <string name="message_add_new_friend">Friend request will be sent to the provided email</string>
     <string name="text_button_add_friend">Add Friend</string>
     <string name="text_cancel">Cancel</string>
+    <string name="title_delete_friend">Delete Friend</string>
+    <string name="message_delete_friend">The action cannot be undone</string>
+    <string name="text_delete">Delete</string>
+    <string name="title_delete_friend_request">Delete Friend Request</string>
+    <string name="message_delete_friend_request">This action cannot be undone</string>
 
 
 </resources>

From fa13dbbf4f3f089464b810ec5d55042dd423c276 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 21 Jul 2019 00:49:29 +0530
Subject: [PATCH 12/16] adds resend friend request option

---
 .../bus/FriendRequestResendEvent.java         |  2 +-
 .../fragment/FriendRequestsFragment.java      | 16 +++++++++++++
 .../FriendRequestsOptionsDialogFragment.java  |  9 ++++++++
 .../layout/friend_requests_bottom_sheet.xml   | 23 +++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
index e5b8121ca..f40fcdef3 100644
--- a/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
@@ -1,4 +1,4 @@
 package org.amahi.anywhere.bus;
 
-public class FreindRequestResendEvent {
+public class FriendRequestResendEvent {
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index 4f2131d59..e5692bb63 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -22,6 +22,7 @@
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
+import org.amahi.anywhere.bus.FriendRequestResendEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendRequest;
@@ -155,6 +156,11 @@ public void onDeleteFriendRequest(FriendRequestDeleteEvent event) {
         deleteFriendRequest();
     }
 
+    @Subscribe
+    public void onResendFriendRequest(FriendRequestResendEvent event) {
+        resendFriendRequest();
+    }
+
     private void deleteFriendRequest() {
         AlertDialogFragment deleteFriendRequestDialog = new AlertDialogFragment();
         Bundle bundle = new Bundle();
@@ -164,6 +170,16 @@ private void deleteFriendRequest() {
         deleteFriendRequestDialog.show(getFragmentManager(), "delete_friend_request_dialog");
     }
 
+    private void resendFriendRequest() {
+        int position = getListAdapter().getSelectedPosition();
+
+        friendRequestsList.get(position).setStatus(0);
+        //set other variables like lastRequestedAt
+        getListAdapter().notifyItemChanged(position);
+
+        Toast.makeText(getContext(), "Friend request resent successfully!", Toast.LENGTH_LONG).show();
+    }
+
     @Override
     public void onItemClick(View view, int position) {
 
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
index fdf016fee..31e5b6899 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
@@ -14,6 +14,7 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
+import org.amahi.anywhere.bus.FriendRequestResendEvent;
 
 public class FriendRequestsOptionsDialogFragment extends BottomSheetDialogFragment {
 
@@ -33,12 +34,20 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     private void setUpViews(View view) {
 
         LinearLayout deleteLayout = view.findViewById(R.id.friend_requests_delete_layout);
+        LinearLayout resendLayout = view.findViewById(R.id.friend_requests_resend_layout);
 
         deleteLayout.setOnClickListener(v -> setUpDelete());
+
+        resendLayout.setOnClickListener(v -> setUpResend());
     }
 
     private void setUpDelete() {
         BusProvider.getBus().post(new FriendRequestDeleteEvent());
         dismiss();
     }
+
+    private void setUpResend() {
+        BusProvider.getBus().post(new FriendRequestResendEvent());
+        dismiss();
+    }
 }
diff --git a/src/main/res/layout/friend_requests_bottom_sheet.xml b/src/main/res/layout/friend_requests_bottom_sheet.xml
index c12a333cb..e08b43d21 100644
--- a/src/main/res/layout/friend_requests_bottom_sheet.xml
+++ b/src/main/res/layout/friend_requests_bottom_sheet.xml
@@ -29,4 +29,27 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/friend_requests_resend_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:src="@drawable/ic_resend"
+            tools:ignore="contentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Resend"
+            android:textColor="@android:color/black"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
 </LinearLayout>

From 6b06282840bd7b61378c9ec4ffd568a09ed1e11c Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 28 Jul 2019 03:28:19 +0530
Subject: [PATCH 13/16] changes pojo files according to changed json format
 from test server

---
 .../anywhere/activity/FriendsActivity.java    |  45 +++++-
 .../adapter/FriendRequestsListAdapter.java    |   8 +-
 .../anywhere/adapter/FriendsListAdapter.java  |   8 +-
 .../bus/AddFriendUserCompletedEvent.java      |  20 ++-
 .../bus/AddFriendUserFailedEvent.java         |   4 +
 .../bus/DeleteFriendCompletedEvent.java       |  23 +++
 .../anywhere/bus/DeleteFriendFailedEvent.java |   4 +
 .../DeleteFriendRequestCompletedEvent.java    |  19 +++
 .../bus/DeleteFriendRequestFailedEvent.java   |   4 +
 .../bus/FriendRequestsLoadedEvent.java        |   8 +-
 .../anywhere/bus/FriendUsersLoadedEvent.java  |  16 +-
 .../anywhere/bus/ResendFriendFailedEvent.java |   4 +
 .../ResendFriendRequestCompletedEvent.java    |  23 +++
 .../fragment/FriendRequestsFragment.java      | 102 +++++++------
 .../anywhere/fragment/FriendsFragment.java    |  59 ++++----
 .../amahi/anywhere/server/api/ServerApi.java  |  47 +++---
 .../anywhere/server/client/ServerClient.java  |  35 +++--
 .../model/DeleteFriendRequestResponse.java    |  37 +++++
 .../server/model/DeleteFriendResponse.java    |  37 +++++
 .../anywhere/server/model/FriendRequest.java  |  65 --------
 .../server/model/FriendRequestItem.java       | 143 ++++++++++++++++++
 .../server/model/FriendRequestResponse.java   |  39 +++++
 .../anywhere/server/model/FriendUser.java     |  42 -----
 .../anywhere/server/model/FriendUserItem.java |  85 +++++++++++
 .../server/model/FriendUserResponse.java      |  39 +++++
 .../server/model/NewFriendRequest.java        |  54 +++++--
 .../model/NewFriendRequestResponse.java       |  49 ++++++
 .../server/model/PostFriendRequest.java       |  28 ++++
 .../anywhere/server/model/PrimaryUser.java    |  29 ----
 .../model/ResendFriendRequestResponse.java    |  37 +++++
 .../response/AddFriendUserResponse.java       |  26 ++--
 .../response/FriendRequestDeleteResponse.java |  29 ++++
 .../response/FriendRequestResendResponse.java |  32 ++++
 .../response/FriendRequestsResponse.java      |  18 +--
 .../response/FriendUserDeleteResponse.java    |  31 ++++
 .../server/response/FriendUsersResponse.java  |  25 +--
 src/main/res/drawable-notnight/ic_friends.xml |   9 ++
 src/main/res/drawable/ic_friends.xml          |  10 ++
 src/main/res/layout/fragment_navigation.xml   |   2 +-
 src/main/res/values/strings.xml               |   2 +
 40 files changed, 968 insertions(+), 329 deletions(-)
 create mode 100644 src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/DeleteFriendRequestResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/DeleteFriendResponse.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendRequestItem.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendRequestResponse.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendUser.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendUserItem.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/FriendUserResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/NewFriendRequestResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/PostFriendRequest.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/model/ResendFriendRequestResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
 create mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
 create mode 100644 src/main/res/drawable-notnight/ic_friends.xml
 create mode 100644 src/main/res/drawable/ic_friends.xml

diff --git a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
index fffe343fb..e0e0279bb 100644
--- a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
+++ b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
@@ -4,6 +4,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
+import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.widget.Toast;
@@ -16,11 +17,12 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsPagerAdapter;
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.fragment.AlertDialogFragment;
 import org.amahi.anywhere.fragment.FriendRequestsFragment;
 import org.amahi.anywhere.fragment.FriendsFragment;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.PostFriendRequest;
 import org.amahi.anywhere.util.Fragments;
 
 import java.util.ArrayList;
@@ -33,6 +35,7 @@ public class FriendsActivity extends AppCompatActivity
 
     @Inject
     ServerClient serverClient;
+    private ProgressDialog progressDialog;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -86,7 +89,6 @@ private void showAddFriendDialog() {
 
     }
 
-
     @Override
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch (menuItem.getItemId()) {
@@ -128,14 +130,40 @@ private TabLayout getTabLayout() {
     }
 
 
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        BusProvider.getBus().register(this);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        BusProvider.getBus().unregister(this);
+    }
+
+
+    //add friend dialog onclick
     @Override
     public void dialogPositiveButtonOnClick(String email) {
         if (serverClient.isConnected()) {
             addFriendRequest(email);
+            showProgressDialog(getString(R.string.message_add_friend_user));
         }
+
         //TODO: connect server if not connected
     }
 
+    private void showProgressDialog(String message) {
+        progressDialog = new ProgressDialog(this);
+        progressDialog.setMessage(message);
+        progressDialog.setIndeterminate(true);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+    }
+
     @Override
     public void dialogNegativeButtonOnClick() {
 
@@ -144,8 +172,10 @@ public void dialogNegativeButtonOnClick() {
     private void addFriendRequest(String email) {
 
         if (email != null) {
-            NewFriendRequest newFriendRequest = new NewFriendRequest();
+            PostFriendRequest newFriendRequest = new PostFriendRequest();
             newFriendRequest.setEmail(email);
+            //TODO: set proper pin
+            newFriendRequest.setPin(1234);
             serverClient.addFriendUser(newFriendRequest);
         }
 
@@ -153,12 +183,11 @@ private void addFriendRequest(String email) {
 
 
     @Subscribe
-    private void onAddFriendUser(AddFriendUserCompletedEvent event) {
-        if (event.isSuccessful()) {
-            Toast.makeText(this, "friend request success", Toast.LENGTH_LONG).show();
-        } else {
-            Toast.makeText(this, "friend request failed", Toast.LENGTH_LONG).show();
+    public void onAddFriendUser(AddFriendUserCompletedEvent event) {
+        if (progressDialog.isShowing()) {
+            progressDialog.dismiss();
         }
+        Toast.makeText(this, event.getMessage(), Toast.LENGTH_LONG).show();
 
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
index cc866cc9b..8aeb7ef6a 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -12,18 +12,18 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.amahi.anywhere.R;
-import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.server.model.FriendRequestItem;
 import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
 import java.util.List;
 
 public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
-    private List<FriendRequest> friendRequestsList;
+    private List<FriendRequestItem> friendRequestsList;
     private Context context;
     private FriendRequestsItemClickListener friendsItemClickListener;
     private int selectedPosition = RecyclerView.NO_POSITION;
 
-    public FriendRequestsListAdapter(Context context, List<FriendRequest> friendRequestsList) {
+    public FriendRequestsListAdapter(Context context, List<FriendRequestItem> friendRequestsList) {
         this.context = context;
         this.friendRequestsList = friendRequestsList;
 
@@ -54,7 +54,7 @@ public FriendRequestsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent
 
     @Override
     public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int position) {
-        holder.friendEmailText.setText(friendRequestsList.get(position).getFriendUser().getEmail());
+        holder.friendEmailText.setText(friendRequestsList.get(position).getEmail());
         int status = friendRequestsList.get(position).getStatus();
 
         //set status text and color based on status value
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
index 21ca08e6d..9c862dbb7 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -11,18 +11,18 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.amahi.anywhere.R;
-import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.server.model.FriendUserItem;
 import org.amahi.anywhere.util.FriendsItemClickListener;
 
 import java.util.List;
 
 public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
-    private List<FriendUser> friendsList;
+    private List<FriendUserItem> friendsList;
     private Context context;
     private FriendsItemClickListener friendsItemClickListener;
     private int selectedPosition = RecyclerView.NO_POSITION;
 
-    public FriendsListAdapter(Context context, List<FriendUser> friendsList) {
+    public FriendsListAdapter(Context context, List<FriendUserItem> friendsList) {
         this.context = context;
         this.friendsList = friendsList;
 
@@ -56,7 +56,7 @@ public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position
         holder.friendEmailText.setText(friendsList.get(position).getEmail());
         StringBuilder builder = new StringBuilder();
         builder.append("Friends since ");
-        builder.append(friendsList.get(position).getCreatedDate());
+        builder.append(friendsList.get(position).getCreatedAt());
         holder.createdAt.setText(builder);
 
         holder.moreOptions.setOnClickListener(v -> {
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
index 61a49f097..246595b15 100644
--- a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
@@ -1,14 +1,24 @@
 package org.amahi.anywhere.bus;
 
 public class AddFriendUserCompletedEvent implements BusEvent {
-    public boolean isSuccessful;
+    private String message;
+    private Boolean success;
 
-    public boolean isSuccessful() {
-        return isSuccessful;
+    public AddFriendUserCompletedEvent(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
     }
 
-    public AddFriendUserCompletedEvent(boolean isSuccessful) {
-        this.isSuccessful = isSuccessful;
+    public Boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
     }
 
 
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
new file mode 100644
index 000000000..15cb56965
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class AddFriendUserFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
new file mode 100644
index 000000000..d783a78f6
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
@@ -0,0 +1,23 @@
+package org.amahi.anywhere.bus;
+
+public class DeleteFriendCompletedEvent implements BusEvent {
+    private String message;
+    private Boolean success;
+
+    public DeleteFriendCompletedEvent(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
+    }
+
+    public Boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
new file mode 100644
index 000000000..7b8f2e948
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class DeleteFriendFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
new file mode 100644
index 000000000..bb209a11e
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
@@ -0,0 +1,19 @@
+package org.amahi.anywhere.bus;
+
+public class DeleteFriendRequestCompletedEvent implements BusEvent {
+    private Boolean success;
+    private String message;
+
+    public DeleteFriendRequestCompletedEvent(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
+    }
+
+    public Boolean isSuccess() {
+        return success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
new file mode 100644
index 000000000..fcf860e5f
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class DeleteFriendRequestFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
index a81cf6736..2c585e7b5 100644
--- a/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/FriendRequestsLoadedEvent.java
@@ -1,18 +1,18 @@
 package org.amahi.anywhere.bus;
 
 
-import org.amahi.anywhere.server.model.FriendRequest;
+import org.amahi.anywhere.server.model.FriendRequestItem;
 
 import java.util.List;
 
 public class FriendRequestsLoadedEvent implements BusEvent {
-    private final List<FriendRequest> friendRequests;
+    private final List<FriendRequestItem> friendRequests;
 
-    public FriendRequestsLoadedEvent(List<FriendRequest> friendRequests) {
+    public FriendRequestsLoadedEvent(List<FriendRequestItem> friendRequests) {
         this.friendRequests = friendRequests;
     }
 
-    public List<FriendRequest> getFriendRequests() {
+    public List<FriendRequestItem> getFriendRequests() {
         return friendRequests;
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
index e21ce0c78..69210e354 100644
--- a/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
+++ b/src/main/java/org/amahi/anywhere/bus/FriendUsersLoadedEvent.java
@@ -1,17 +1,21 @@
 package org.amahi.anywhere.bus;
 
-import org.amahi.anywhere.server.model.PrimaryUser;
+import android.util.Log;
+
+import org.amahi.anywhere.server.model.FriendUserItem;
 
 import java.util.List;
 
 public class FriendUsersLoadedEvent implements BusEvent {
-    private final List<PrimaryUser> primaryUsers;
+    private final List<FriendUserItem> friendUsers;
+
+    public FriendUsersLoadedEvent(List<FriendUserItem> friendUsers) {
+        this.friendUsers = friendUsers;
 
-    public FriendUsersLoadedEvent(List<PrimaryUser> primaryUsers) {
-        this.primaryUsers = primaryUsers;
     }
 
-    public List<PrimaryUser> getPrimaryUsers() {
-        return primaryUsers;
+    public List<FriendUserItem> getFriendUsers() {
+        Log.d("entered", "getLEFriendUsrs:");
+        return friendUsers;
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
new file mode 100644
index 000000000..b2ff3bcff
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
@@ -0,0 +1,4 @@
+package org.amahi.anywhere.bus;
+
+public class ResendFriendFailedEvent implements BusEvent {
+}
diff --git a/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
new file mode 100644
index 000000000..a0a74db15
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
@@ -0,0 +1,23 @@
+package org.amahi.anywhere.bus;
+
+public class ResendFriendRequestCompletedEvent {
+    private String message;
+    private Boolean success;
+
+    public ResendFriendRequestCompletedEvent(Boolean success, String message) {
+        this.success = success;
+        this.message = message;
+    }
+
+    public Boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index e5692bb63..f497837c4 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -21,12 +21,13 @@
 import org.amahi.anywhere.adapter.FriendRequestsListAdapter;
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
 import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.DeleteFriendRequestCompletedEvent;
 import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
 import org.amahi.anywhere.bus.FriendRequestResendEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
+import org.amahi.anywhere.bus.ResendFriendRequestCompletedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.FriendRequest;
-import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.server.model.FriendRequestItem;
 import org.amahi.anywhere.util.Fragments;
 import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
@@ -44,8 +45,8 @@ public class FriendRequestsFragment extends Fragment implements
 
     @Inject
     ServerClient serverClient;
-    private ProgressDialog deleteProgressDialog;
-    List<FriendRequest> friendRequestsList;
+    private ProgressDialog progressDialog;
+    private List<FriendRequestItem> friendRequestsList = new ArrayList<>();
     private final static String SELECTED_ITEM = "selected_item";
 
     @Override
@@ -62,8 +63,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpFriendRequestsList(savedInstanceState);
 
-        setUpProgressDialog();
-
     }
 
     private void setUpInjections() {
@@ -76,11 +75,11 @@ private RecyclerView getRecyclerView() {
 
     private void setUpFriendRequestsList(Bundle state) {
         setUpItemsMenu();
-        /*if (serverClient.isConnected()) {
+        if (serverClient.isConnected()) {
             serverClient.getFriendRequests();
-        }*/
-        setUpListAdapter(state);
-        setUpListActions();
+        }
+        setUpListAdapter();
+        setUpSelectedItem(state);
 
 
     }
@@ -93,24 +92,15 @@ private void setUpListActions() {
         getListAdapter().setOnClickListener(this);
     }
 
-    private void setUpListAdapter(Bundle state) {
-        friendRequestsList = new ArrayList<>();
-
-        //TODO: dummy data to be replaced with data from server
-
-        for (int i = 0; i <= 6; i++) {
-            FriendRequest friendRequest = new FriendRequest();
-            FriendUser friendUser = new FriendUser();
-            friendUser.setEmail("dummyuser@dummydomain.com");
-            friendRequest.setFriendUser(friendUser);
-            friendRequest.setStatus(i % 4);
-            friendRequestsList.add(friendRequest);
-        }
+    private void setUpListAdapter() {
 
         FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsList);
         getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
+        setUpListActions();
+    }
 
+    private void setUpSelectedItem(Bundle state) {
         if (isStateValid(state)) {
             getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
         }
@@ -141,14 +131,15 @@ public void onPause() {
 
     @Subscribe
     public void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
-        //setUpListAdapter();
+        friendRequestsList = event.getFriendRequests();
+        setUpListAdapter();
     }
 
     @Subscribe
     public void onAddFriendUser(AddFriendUserCompletedEvent event) {
-        /*if (event.isSuccessful()) {
-            setUpListAdapter();
-        }*/
+        if (event.isSuccess()) {
+            getListAdapter().notifyDataSetChanged();
+        }
     }
 
     @Subscribe
@@ -161,6 +152,33 @@ public void onResendFriendRequest(FriendRequestResendEvent event) {
         resendFriendRequest();
     }
 
+    @Subscribe
+    public void onDeleteFriendRequestCompleted(DeleteFriendRequestCompletedEvent event) {
+        if (event.isSuccess()) {
+            getListAdapter().removeFriend(getListAdapter().getSelectedPosition());
+        }
+        if(progressDialog.isShowing()) {
+            progressDialog.dismiss();
+        }
+        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
+    }
+
+    @Subscribe
+    public void onResendFriendRequestCompleted(ResendFriendRequestCompletedEvent event) {
+        if(event.isSuccess()) {
+            int position = getListAdapter().getSelectedPosition();
+
+            friendRequestsList.get(position).setStatus(0);
+            //set other variables like lastRequestedAt
+            getListAdapter().notifyItemChanged(position);
+        }
+        if(progressDialog.isShowing()) {
+            progressDialog.dismiss();
+        }
+
+        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
+    }
+
     private void deleteFriendRequest() {
         AlertDialogFragment deleteFriendRequestDialog = new AlertDialogFragment();
         Bundle bundle = new Bundle();
@@ -172,12 +190,8 @@ private void deleteFriendRequest() {
 
     private void resendFriendRequest() {
         int position = getListAdapter().getSelectedPosition();
-
-        friendRequestsList.get(position).setStatus(0);
-        //set other variables like lastRequestedAt
-        getListAdapter().notifyItemChanged(position);
-
-        Toast.makeText(getContext(), "Friend request resent successfully!", Toast.LENGTH_LONG).show();
+        showProgressDialog(getString(R.string.message_resend_progress));
+        serverClient.resendFriendRequest(friendRequestsList.get(position).getId());
     }
 
     @Override
@@ -194,25 +208,21 @@ public void onMoreOptionClick(View view, int position) {
 
     }
 
-    private void setUpProgressDialog() {
-        deleteProgressDialog = new ProgressDialog(getContext());
-        deleteProgressDialog.setMessage(getString(R.string.message_delete_progress));
-        deleteProgressDialog.setIndeterminate(true);
-        deleteProgressDialog.setCancelable(false);
+    private void showProgressDialog(String message) {
+        progressDialog = new ProgressDialog(getContext());
+        progressDialog.setMessage(message);
+        progressDialog.setIndeterminate(true);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
     }
 
 
+    //delete friend request dialog listeners
     @Override
     public void dialogPositiveButtonOnClick() {
-
         int selectedPosition = getListAdapter().getSelectedPosition();
-        //show progress dialog and delete data from server
-        //deleteProgressDialog.show();
-        //serverClient.deleteFriendRequest(friendRequestsList.get(selectedPosition).getId());
-
-        getListAdapter().removeFriend(selectedPosition);
-        Toast.makeText(getContext(), "Friend Request deleted successfully", Toast.LENGTH_LONG).show();
-
+        showProgressDialog(getString(R.string.message_delete_progress));
+        serverClient.deleteFriendRequest(friendRequestsList.get(selectedPosition).getId());
     }
 
     @Override
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
index 595f1519f..52edd69fa 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -19,10 +19,11 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsListAdapter;
 import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.DeleteFriendCompletedEvent;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
 import org.amahi.anywhere.bus.FriendDeleteEvent;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.FriendUser;
+import org.amahi.anywhere.server.model.FriendUserItem;
 import org.amahi.anywhere.util.Fragments;
 import org.amahi.anywhere.util.FriendsItemClickListener;
 
@@ -42,7 +43,7 @@ public class FriendsFragment extends Fragment implements
     @Inject
     ServerClient serverClient;
     private ProgressDialog deleteProgressDialog;
-    private List<FriendUser> friendsList;
+    private List<FriendUserItem> friendsList = new ArrayList<>();
     private final static String SELECTED_ITEM = "selected_item";
 
     @Override
@@ -67,7 +68,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpProgressDialog();
 
-        //setUpFriendsList();
 
     }
 
@@ -77,12 +77,11 @@ private RecyclerView getRecyclerView() {
 
     private void setUpFriendsList(Bundle state) {
         setUpItemsMenu();
-        //setup data from server
-        /*if (serverClient.isConnected()) {
+        if (serverClient.isConnected()) {
             serverClient.getFriendUsers();
-        }*/
-        setUpListAdapter(state);
-        setUpListActions();
+        }
+        setUpListAdapter();
+        setUpSelectedItem(state);
 
 
     }
@@ -100,32 +99,20 @@ private FriendsListAdapter getListAdapter() {
         return (FriendsListAdapter) getRecyclerView().getAdapter();
     }
 
-    private void setUpListAdapter(Bundle state) {
-        friendsList = new ArrayList<>();
-
 
-        /*for (PrimaryUser primaryUser : primaryUsers) {
-            friendsEmailList.add(primaryUser.getFriendUser().getEmail());
-        }*/
-
-        //TODO: dummy data to be replaced with data from server
-        for (int i = 0; i <= 5; i++) {
-            FriendUser friendUser = new FriendUser();
-            friendUser.setEmail("dummyuser@dummydomain.com");
-            friendUser.setCreatedDate("14-07-2019");
-            friendUser.setId(1234);
-            friendsList.add(friendUser);
-        }
+    private void setUpListAdapter() {
 
         FriendsListAdapter adapter = new FriendsListAdapter(getContext(), friendsList);
         getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
 
+        setUpListActions();
+    }
+
+    private void setUpSelectedItem(Bundle state) {
         if (isStateValid(state)) {
             getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
         }
-
-
     }
 
     private boolean isStateValid(Bundle state) {
@@ -148,7 +135,8 @@ public void onPause() {
 
     @Subscribe
     public void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
-        //setUpListAdapter(event.getPrimaryUsers());
+        friendsList = event.getFriendUsers();
+        setUpListAdapter();
     }
 
     @Subscribe
@@ -157,6 +145,18 @@ public void onDeleteFriend(FriendDeleteEvent event) {
 
     }
 
+    @Subscribe
+    public void onDeleteFriendCompleted(DeleteFriendCompletedEvent event) {
+
+        if (event.isSuccess()) {
+            getListAdapter().removeFriend(getListAdapter().getSelectedPosition());
+        }
+        if (deleteProgressDialog.isShowing()) {
+            deleteProgressDialog.dismiss();
+        }
+        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
+    }
+
     private void deleteFriend() {
         AlertDialogFragment deleteFriendDialog = new AlertDialogFragment();
         Bundle bundle = new Bundle();
@@ -193,11 +193,8 @@ private void setUpProgressDialog() {
     public void dialogPositiveButtonOnClick() {
         int selectedPosition = getListAdapter().getSelectedPosition();
         //delete data from server and show progress dialog
-        //deleteProgressDialog.show();
-        //serverClient.deleteFriendUser(friendsList.get(selectedPosition).getId());
-
-        getListAdapter().removeFriend(selectedPosition);
-        Toast.makeText(getContext(), "Friend deleted successfully", Toast.LENGTH_LONG).show();
+        deleteProgressDialog.show();
+        serverClient.deleteFriendUser(friendsList.get(selectedPosition).getId());
 
     }
 
diff --git a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
index c37a36006..81f90f743 100644
--- a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
+++ b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
@@ -19,9 +19,13 @@
 
 package org.amahi.anywhere.server.api;
 
-import org.amahi.anywhere.server.model.FriendRequest;
-import org.amahi.anywhere.server.model.NewFriendRequest;
-import org.amahi.anywhere.server.model.PrimaryUser;
+import org.amahi.anywhere.server.model.DeleteFriendRequestResponse;
+import org.amahi.anywhere.server.model.DeleteFriendResponse;
+import org.amahi.anywhere.server.model.FriendRequestResponse;
+import org.amahi.anywhere.server.model.FriendUserResponse;
+import org.amahi.anywhere.server.model.NewFriendRequestResponse;
+import org.amahi.anywhere.server.model.PostFriendRequest;
+import org.amahi.anywhere.server.model.ResendFriendRequestResponse;
 import org.amahi.anywhere.server.model.ServerApp;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
@@ -38,7 +42,9 @@
 import retrofit2.http.Header;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
+import retrofit2.http.PUT;
 import retrofit2.http.Part;
+import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 /**
@@ -80,25 +86,30 @@ Call<List<ServerApp>> getApps(
         @Header("Session") String session);
 
     @GET("/frnd/users")
-    Call<List<PrimaryUser>> getFriendUsers(
-        @Header("Session") String session);
+    Call<FriendUserResponse> getFriendUsers(
+        @Header("api-key") String apiKey);
 
     @POST("/frnd/request")
-    Call<NewFriendRequest> addFriendUser(
-        @Header("Session") String session,
-        @Body NewFriendRequest friendRequest);
+    Call<NewFriendRequestResponse> addFriendUser(
+        @Header("api-key") String apiKey,
+        @Body PostFriendRequest friendRequest);
 
     @GET("/frnd/requests")
-    Call<List<FriendRequest>> getFriendRequests(
-        @Header("Session") String session);
+    Call<FriendRequestResponse> getFriendRequests(
+        @Header("api-key") String apiKey);
 
-    @DELETE("/frnd/user/")
-    Call<Void> deleteFriendUser(
-        @Header("Session") String session,
-        @Query("id") int id);
+    @DELETE("/frnd/user/{id}")
+    Call<DeleteFriendResponse> deleteFriendUser(
+        @Header("api-key") String apiKey,
+        @Path("id") int id);
 
-    @DELETE("/frnd/request")
-    Call<VerifyError> deleteFriendRequest(
-        @Header("Session") String session,
-        @Query("id") int id);
+    @DELETE("/frnd/request/{id}")
+    Call<DeleteFriendRequestResponse> deleteFriendRequest(
+        @Header("api-key") String apiKey,
+        @Path("id") int id);
+
+    @PUT("/frnd/request/{id}/resend")
+    Call<ResendFriendRequestResponse> resendFriendRequest(
+        @Header("api-key") String key,
+        @Path("id") int id);
 }
diff --git a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
index e57cf7d3d..dd2a120d5 100644
--- a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
+++ b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
@@ -38,14 +38,17 @@
 import org.amahi.anywhere.server.ApiConnection;
 import org.amahi.anywhere.server.api.ProxyApi;
 import org.amahi.anywhere.server.api.ServerApi;
-import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.PostFriendRequest;
 import org.amahi.anywhere.server.model.Server;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
 import org.amahi.anywhere.server.model.ServerRoute;
 import org.amahi.anywhere.server.model.ServerShare;
 import org.amahi.anywhere.server.response.AddFriendUserResponse;
+import org.amahi.anywhere.server.response.FriendRequestDeleteResponse;
+import org.amahi.anywhere.server.response.FriendRequestResendResponse;
 import org.amahi.anywhere.server.response.FriendRequestsResponse;
+import org.amahi.anywhere.server.response.FriendUserDeleteResponse;
 import org.amahi.anywhere.server.response.FriendUsersResponse;
 import org.amahi.anywhere.server.response.ServerAppsResponse;
 import org.amahi.anywhere.server.response.ServerFileDeleteResponse;
@@ -89,6 +92,9 @@ public class ServerClient {
     private String serverAddress;
     private ApiConnection serverConnection;
 
+    private static final String BASE_URL = "https://friending-testing.herokuapp.com";
+    private static final String apiKey = "abcdef";
+
     private int network;
 
     @Inject
@@ -133,7 +139,7 @@ private boolean isServerRouteLoaded() {
     }
 
     private void startServerConnectionDetection() {
-        this.serverAddress = serverRoute.getLocalAddress();
+        this.serverAddress = BASE_URL;
         this.serverApi = buildServerApi();
 
         ServerConnectionDetectingTask.execute(serverRoute);
@@ -145,7 +151,8 @@ private ServerApi buildServerApi() {
 
     @Subscribe
     public void onServerConnectionDetected(ServerConnectionDetectedEvent event) {
-        this.serverAddress = event.getServerAddress();
+        this.serverAddress = BASE_URL;
+        //this.serverAddress = event.getServerAddress();
         this.serverApi = buildServerApi();
 
         finishServerConnectionDetection();
@@ -224,7 +231,8 @@ public void connectLocal() {
         if (!isServerRouteLoaded()) {
             return;
         }
-        this.serverAddress = serverRoute.getLocalAddress();
+        this.serverAddress = BASE_URL;
+        //this.serverAddress = serverRoute.getLocalAddress();
         this.serverApi = buildServerApi();
         finishServerConnectionDetection();
     }
@@ -234,7 +242,8 @@ public void connectRemote() {
         if (!isServerRouteLoaded()) {
             return;
         }
-        this.serverAddress = serverRoute.getRemoteAddress();
+        this.serverAddress = BASE_URL;
+        //this.serverAddress = serverRoute.getRemoteAddress();
         this.serverApi = buildServerApi();
         finishServerConnectionDetection();
     }
@@ -333,22 +342,26 @@ public void getApps() {
     }
 
     public void getFriendUsers() {
-        serverApi.getFriendUsers(server.getSession()).enqueue(new FriendUsersResponse());
+        serverApi.getFriendUsers(apiKey).enqueue(new FriendUsersResponse());
     }
 
-    public void addFriendUser(NewFriendRequest friendRequest) {
-        serverApi.addFriendUser(server.getSession(), friendRequest).enqueue(new AddFriendUserResponse());
+    public void addFriendUser(PostFriendRequest friendRequest) {
+        serverApi.addFriendUser(apiKey, friendRequest).enqueue(new AddFriendUserResponse());
     }
 
     public void getFriendRequests() {
-        serverApi.getFriendRequests(server.getSession()).enqueue(new FriendRequestsResponse());
+        serverApi.getFriendRequests(apiKey).enqueue(new FriendRequestsResponse());
     }
 
     public void deleteFriendUser(int id) {
-        serverApi.deleteFriendUser(server.getSession(), id);
+        serverApi.deleteFriendUser(apiKey, id).enqueue(new FriendUserDeleteResponse());
     }
 
     public void deleteFriendRequest(int id) {
-        serverApi.deleteFriendRequest(server.getSession(), id);
+        serverApi.deleteFriendRequest(apiKey, id).enqueue(new FriendRequestDeleteResponse());
+    }
+
+    public void resendFriendRequest(int id) {
+        serverApi.resendFriendRequest(apiKey, id).enqueue(new FriendRequestResendResponse());
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/server/model/DeleteFriendRequestResponse.java b/src/main/java/org/amahi/anywhere/server/model/DeleteFriendRequestResponse.java
new file mode 100644
index 000000000..29bda1132
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/DeleteFriendRequestResponse.java
@@ -0,0 +1,37 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class DeleteFriendRequestResponse{
+
+    @SerializedName("message")
+	private String message;
+
+    @SerializedName("success")
+	private boolean success;
+
+	public void setMessage(String message){
+		this.message = message;
+	}
+
+	public String getMessage(){
+		return message;
+	}
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"DeleteFriendRequestResponse{" + 
+			"“message” = '" + message + '\'' + 
+			",“success” = '" + success + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/DeleteFriendResponse.java b/src/main/java/org/amahi/anywhere/server/model/DeleteFriendResponse.java
new file mode 100644
index 000000000..e37369b42
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/DeleteFriendResponse.java
@@ -0,0 +1,37 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class DeleteFriendResponse{
+
+    @SerializedName("message")
+	private String message;
+
+    @SerializedName("success")
+	private boolean success;
+
+	public void setMessage(String message){
+		this.message = message;
+	}
+
+	public String getMessage(){
+		return message;
+	}
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	@Override
+ 	public String toString(){
+		return
+			"DeleteFriendResponse{" +
+			"“message” = '" + message + '\'' +
+			",“success” = '" + success + '\'' +
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
deleted file mode 100644
index 5389681a1..000000000
--- a/src/main/java/org/amahi/anywhere/server/model/FriendRequest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.amahi.anywhere.server.model;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.Date;
-
-public class FriendRequest {
-
-    @SerializedName("id")
-    private int id;
-
-    @SerializedName("created_at")
-    private String createdAt;
-
-    @SerializedName("status")
-    private int status;
-
-    @SerializedName("amahi_user")
-    private FriendUser friendUser;
-
-    @SerializedName("last_requested_at")
-    private String lastRequestedAt;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(String createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public FriendUser getFriendUser() {
-        return friendUser;
-    }
-
-    public void setFriendUser(FriendUser friendUser) {
-        this.friendUser = friendUser;
-    }
-
-    public String getLastRequestedAt() {
-        return lastRequestedAt;
-    }
-
-    public void setLastRequestedAt(String lastRequestedAt) {
-        this.lastRequestedAt = lastRequestedAt;
-    }
-
-
-}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequestItem.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequestItem.java
new file mode 100644
index 000000000..582a8b227
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendRequestItem.java
@@ -0,0 +1,143 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class FriendRequestItem{
+
+    @SerializedName("amahi_user_id")
+	private int amahiUserId;
+
+    @SerializedName("pin")
+	private String pin;
+
+    @SerializedName("last_requested_at")
+	private String lastRequestedAt;
+
+    @SerializedName("updated_at")
+	private String updatedAt;
+
+    @SerializedName("system_id")
+	private int systemId;
+
+    @SerializedName("created_at")
+	private String createdAt;
+
+    @SerializedName("id")
+	private int id;
+
+    @SerializedName("invite_token")
+	private String inviteToken;
+
+    @SerializedName("email")
+	private String email;
+
+    @SerializedName("status_txt")
+	private String statusTxt;
+	private int status;
+
+	public void setAmahiUserId(int amahiUserId){
+		this.amahiUserId = amahiUserId;
+	}
+
+	public int getAmahiUserId(){
+		return amahiUserId;
+	}
+
+	public void setPin(String pin){
+		this.pin = pin;
+	}
+
+	public String getPin(){
+		return pin;
+	}
+
+	public void setLastRequestedAt(String lastRequestedAt){
+		this.lastRequestedAt = lastRequestedAt;
+	}
+
+	public String getLastRequestedAt(){
+		return lastRequestedAt;
+	}
+
+	public void setUpdatedAt(String updatedAt){
+		this.updatedAt = updatedAt;
+	}
+
+	public String getUpdatedAt(){
+		return updatedAt;
+	}
+
+	public void setSystemId(int systemId){
+		this.systemId = systemId;
+	}
+
+	public int getSystemId(){
+		return systemId;
+	}
+
+	public void setCreatedAt(String createdAt){
+		this.createdAt = createdAt;
+	}
+
+	public String getCreatedAt(){
+		return createdAt;
+	}
+
+	public void setId(int id){
+		this.id = id;
+	}
+
+	public int getId(){
+		return id;
+	}
+
+	public void setInviteToken(String inviteToken){
+		this.inviteToken = inviteToken;
+	}
+
+	public String getInviteToken(){
+		return inviteToken;
+	}
+
+	public void setEmail(String email){
+		this.email = email;
+	}
+
+	public String getEmail(){
+		return email;
+	}
+
+	public void setStatusTxt(String statusTxt){
+		this.statusTxt = statusTxt;
+	}
+
+	public String getStatusTxt(){
+		return statusTxt;
+	}
+
+	public void setStatus(int status){
+		this.status = status;
+	}
+
+	public int getStatus(){
+		return status;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"FriendRequestItem{" + 
+			"amahi_user_id = '" + amahiUserId + '\'' + 
+			",pin = '" + pin + '\'' + 
+			",last_requested_at = '" + lastRequestedAt + '\'' + 
+			",updated_at = '" + updatedAt + '\'' + 
+			",system_id = '" + systemId + '\'' + 
+			",created_at = '" + createdAt + '\'' + 
+			",id = '" + id + '\'' + 
+			",invite_token = '" + inviteToken + '\'' + 
+			",email = '" + email + '\'' + 
+			",status_txt = '" + statusTxt + '\'' + 
+			",status = '" + status + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendRequestResponse.java b/src/main/java/org/amahi/anywhere/server/model/FriendRequestResponse.java
new file mode 100644
index 000000000..3ae780c48
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendRequestResponse.java
@@ -0,0 +1,39 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class FriendRequestResponse{
+
+    @SerializedName("success")
+	private boolean success;
+
+    @SerializedName("data")
+	private List<FriendRequestItem> friendRequests;
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	public void setFriendRequests(List<FriendRequestItem> friendRequests){
+		this.friendRequests = friendRequests;
+	}
+
+	public List<FriendRequestItem> getFriendRequests(){
+		return friendRequests;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"FriendRequestResponse{" + 
+			"success = '" + success + '\'' + 
+			",friend_request = '" + friendRequests + '\'' +
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java b/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
deleted file mode 100644
index 48517dfdf..000000000
--- a/src/main/java/org/amahi/anywhere/server/model/FriendUser.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.amahi.anywhere.server.model;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.Date;
-
-public class FriendUser {
-    @SerializedName("id")
-    private int id;
-
-    @SerializedName("created_at")
-    private String createdDate;
-
-    @SerializedName("email")
-    private String email;
-
-
-    public int getId() {
-        return id;
-    }
-
-    public String getCreatedDate() {
-        return createdDate;
-    }
-
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public void setCreatedDate(String createdDate) {
-        this.createdDate = createdDate;
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUserItem.java b/src/main/java/org/amahi/anywhere/server/model/FriendUserItem.java
new file mode 100644
index 000000000..95b03a687
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendUserItem.java
@@ -0,0 +1,85 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class FriendUserItem{
+
+    @SerializedName("amahi_user_id")
+	private int amahiUserId;
+
+    @SerializedName("updated_at")
+	private String updatedAt;
+
+    @SerializedName("system_id")
+	private int systemId;
+
+    @SerializedName("created_at")
+	private String createdAt;
+
+    @SerializedName("id")
+	private int id;
+
+    @SerializedName("email")
+	private String email;
+
+	public void setAmahiUserId(int amahiUserId){
+		this.amahiUserId = amahiUserId;
+	}
+
+	public int getAmahiUserId(){
+		return amahiUserId;
+	}
+
+	public void setUpdatedAt(String updatedAt){
+		this.updatedAt = updatedAt;
+	}
+
+	public String getUpdatedAt(){
+		return updatedAt;
+	}
+
+	public void setSystemId(int systemId){
+		this.systemId = systemId;
+	}
+
+	public int getSystemId(){
+		return systemId;
+	}
+
+	public void setCreatedAt(String createdAt){
+		this.createdAt = createdAt;
+	}
+
+	public String getCreatedAt(){
+		return createdAt;
+	}
+
+	public void setId(int id){
+		this.id = id;
+	}
+
+	public int getId(){
+		return id;
+	}
+
+	public void setEmail(String email){
+		this.email = email;
+	}
+
+	public String getEmail(){
+		return email;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"FriendUserItem{" + 
+			"amahi_user_id = '" + amahiUserId + '\'' + 
+			",updated_at = '" + updatedAt + '\'' + 
+			",system_id = '" + systemId + '\'' + 
+			",created_at = '" + createdAt + '\'' + 
+			",id = '" + id + '\'' + 
+			",email = '" + email + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/FriendUserResponse.java b/src/main/java/org/amahi/anywhere/server/model/FriendUserResponse.java
new file mode 100644
index 000000000..7d3f53e4d
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/FriendUserResponse.java
@@ -0,0 +1,39 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class FriendUserResponse{
+
+    @SerializedName("data")
+	private List<FriendUserItem> friendUsers;
+
+    @SerializedName("success")
+	private boolean success;
+
+	public void setFriendUsers(List<FriendUserItem> friendUsers){
+		this.friendUsers = friendUsers;
+	}
+
+	public List<FriendUserItem> getFriendUsers(){
+		return friendUsers;
+	}
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	@Override
+ 	public String toString(){
+		return
+			"FriendUserResponse{" +
+			"friend_user = '" + friendUsers + '\'' +
+			",success = '" + success + '\'' +
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
index d786be142..fab3c6a04 100644
--- a/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
+++ b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequest.java
@@ -2,26 +2,48 @@
 
 import com.google.gson.annotations.SerializedName;
 
-public class NewFriendRequest {
+public class NewFriendRequest{
+
+    @SerializedName("id")
+	private String id;
+
+    @SerializedName("status_txt")
+	private String statusTxt;
+
     @SerializedName("email")
-    private String email;
+	private String email;
+
+	public void setId(String id){
+		this.id = id;
+	}
+
+	public String getId(){
+		return id;
+	}
 
-    @SerializedName("pin")
-    private int pin;
+	public void setStatusTxt(String statusTxt){
+		this.statusTxt = statusTxt;
+	}
 
-    public String getEmail() {
-        return email;
-    }
+	public String getStatusTxt(){
+		return statusTxt;
+	}
 
-    public void setEmail(String email) {
-        this.email = email;
-    }
+	public void setEmail(String email){
+		this.email = email;
+	}
 
-    public int getPin() {
-        return pin;
-    }
+	public String getEmail(){
+		return email;
+	}
 
-    public void setPin(int pin) {
-        this.pin = pin;
-    }
+	@Override
+ 	public String toString(){
+		return 
+			"NewFriendRequest{" + 
+			"id = '" + id + '\'' + 
+			",status_txt = '" + statusTxt + '\'' + 
+			",email = '" + email + '\'' + 
+			"}";
+		}
 }
diff --git a/src/main/java/org/amahi/anywhere/server/model/NewFriendRequestResponse.java b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequestResponse.java
new file mode 100644
index 000000000..01ba8df12
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/NewFriendRequestResponse.java
@@ -0,0 +1,49 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class NewFriendRequestResponse{
+
+    @SerializedName("success")
+	private boolean success;
+
+    @SerializedName("message")
+	private String message;
+
+    @SerializedName("request")
+	private NewFriendRequest newFriendRequest;
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	public void setMessage(String message){
+		this.message = message;
+	}
+
+	public String getMessage(){
+		return message;
+	}
+
+	public void setNewFriendRequest(NewFriendRequest newFriendRequest){
+		this.newFriendRequest = newFriendRequest;
+	}
+
+	public NewFriendRequest getNewFriendRequest(){
+		return newFriendRequest;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"NewFriendRequestResponse{" + 
+			"success = '" + success + '\'' + 
+			",message = '" + message + '\'' + 
+			",“new_friend_request” = '" + newFriendRequest + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/PostFriendRequest.java b/src/main/java/org/amahi/anywhere/server/model/PostFriendRequest.java
new file mode 100644
index 000000000..b504fbdb0
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/PostFriendRequest.java
@@ -0,0 +1,28 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class PostFriendRequest {
+
+    @SerializedName("email")
+    private String email;
+
+    @SerializedName("pin")
+    private int pin;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public int getPin() {
+        return pin;
+    }
+
+    public void setPin(int pin) {
+        this.pin = pin;
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java b/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
deleted file mode 100644
index 70e7a70f2..000000000
--- a/src/main/java/org/amahi/anywhere/server/model/PrimaryUser.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.amahi.anywhere.server.model;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.Date;
-
-public class PrimaryUser {
-    @SerializedName("id")
-    private int id;
-
-    @SerializedName("created_at")
-    private Date createdDate;
-
-    @SerializedName("amahi_user")
-    private FriendUser friendUser;
-
-    public int getId() {
-        return id;
-    }
-
-    public Date getCreatedDate() {
-        return createdDate;
-    }
-
-    public FriendUser getFriendUser() {
-        return friendUser;
-    }
-}
-
diff --git a/src/main/java/org/amahi/anywhere/server/model/ResendFriendRequestResponse.java b/src/main/java/org/amahi/anywhere/server/model/ResendFriendRequestResponse.java
new file mode 100644
index 000000000..809d168cc
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/model/ResendFriendRequestResponse.java
@@ -0,0 +1,37 @@
+package org.amahi.anywhere.server.model;
+
+import com.google.gson.annotations.SerializedName;
+
+public class ResendFriendRequestResponse{
+
+    @SerializedName("message")
+	private String message;
+
+    @SerializedName("success")
+	private boolean success;
+
+	public void setMessage(String message){
+		this.message = message;
+	}
+
+	public String getMessage(){
+		return message;
+	}
+
+	public void setSuccess(boolean success){
+		this.success = success;
+	}
+
+	public boolean isSuccess(){
+		return success;
+	}
+
+	@Override
+ 	public String toString(){
+		return 
+			"ResendFriendRequestResponse{" + 
+			"“message” = '" + message + '\'' + 
+			",“success” = '" + success + '\'' + 
+			"}";
+		}
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
index 75967bdc2..15beae268 100644
--- a/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
+++ b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
@@ -1,29 +1,35 @@
 package org.amahi.anywhere.server.response;
 
 
-
 import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
+import org.amahi.anywhere.bus.AddFriendUserFailedEvent;
 import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.server.model.NewFriendRequest;
+import org.amahi.anywhere.server.model.NewFriendRequestResponse;
 
 import retrofit2.Call;
 import retrofit2.Callback;
-import retrofit2.HttpException;
 import retrofit2.Response;
 
-public class AddFriendUserResponse implements Callback<NewFriendRequest> {
+public class AddFriendUserResponse implements Callback<NewFriendRequestResponse> {
     @Override
-    public void onResponse(Call<NewFriendRequest> call, Response<NewFriendRequest> response) {
+    public void onResponse(Call<NewFriendRequestResponse> call, Response<NewFriendRequestResponse> response) {
         if (response.isSuccessful()) {
-            BusProvider.getBus().post(new AddFriendUserCompletedEvent(true));
-        } else
-            this.onFailure(call, new HttpException(response));
+            NewFriendRequestResponse requestResponse = response.body();
+            if (requestResponse.isSuccess()) {
+                BusProvider.getBus().post(new AddFriendUserCompletedEvent(requestResponse.isSuccess(), requestResponse.getMessage()));
+            } else {
+                BusProvider.getBus().post(new AddFriendUserFailedEvent());
+            }
+        } else {
+            BusProvider.getBus().post(new AddFriendUserFailedEvent());
+        }
+
 
     }
 
     @Override
-    public void onFailure(Call<NewFriendRequest> call, Throwable t) {
-        BusProvider.getBus().post(new AddFriendUserCompletedEvent(false));
+    public void onFailure(Call<NewFriendRequestResponse> call, Throwable t) {
+        BusProvider.getBus().post(new AddFriendUserFailedEvent());
 
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
new file mode 100644
index 000000000..57dd476ad
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
@@ -0,0 +1,29 @@
+package org.amahi.anywhere.server.response;
+
+import org.amahi.anywhere.bus.BusEvent;
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.DeleteFriendRequestCompletedEvent;
+import org.amahi.anywhere.bus.DeleteFriendRequestFailedEvent;
+import org.amahi.anywhere.server.model.DeleteFriendRequestResponse;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class FriendRequestDeleteResponse implements Callback<DeleteFriendRequestResponse> {
+    @Override
+    public void onResponse(Call<DeleteFriendRequestResponse> call, Response<DeleteFriendRequestResponse> response) {
+        if (response.isSuccessful()) {
+            DeleteFriendRequestResponse deleteFriendRequestResponse = response.body();
+            BusProvider.getBus().post(new DeleteFriendRequestCompletedEvent(deleteFriendRequestResponse.isSuccess(), deleteFriendRequestResponse.getMessage()));
+        } else {
+            this.onFailure(call, new HttpException(response));
+        }
+    }
+
+    @Override
+    public void onFailure(Call<DeleteFriendRequestResponse> call, Throwable t) {
+        BusProvider.getBus().post(new DeleteFriendRequestFailedEvent());
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
new file mode 100644
index 000000000..9e3734d97
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
@@ -0,0 +1,32 @@
+package org.amahi.anywhere.server.response;
+
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.ResendFriendFailedEvent;
+import org.amahi.anywhere.bus.ResendFriendRequestCompletedEvent;
+import org.amahi.anywhere.server.model.ResendFriendRequestResponse;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class FriendRequestResendResponse implements Callback<ResendFriendRequestResponse> {
+    @Override
+    public void onResponse(Call<ResendFriendRequestResponse> call, Response<ResendFriendRequestResponse> response) {
+
+        if (response.isSuccessful()) {
+            ResendFriendRequestResponse resendFriendRequestResponse = response.body();
+            BusProvider.getBus().post(new ResendFriendRequestCompletedEvent(resendFriendRequestResponse.isSuccess(),
+                resendFriendRequestResponse.getMessage()));
+        } else {
+            this.onFailure(call, new HttpException(response));
+        }
+
+    }
+
+    @Override
+    public void onFailure(Call<ResendFriendRequestResponse> call, Throwable t) {
+        BusProvider.getBus().post(new ResendFriendFailedEvent());
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
index 74b993dec..413f1fef9 100644
--- a/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendRequestsResponse.java
@@ -3,32 +3,26 @@
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendRequestsLoadFailedEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
-import org.amahi.anywhere.server.model.FriendRequest;
-
-import java.util.Collections;
-import java.util.List;
+import org.amahi.anywhere.server.model.FriendRequestResponse;
 
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.HttpException;
 import retrofit2.Response;
 
-public class FriendRequestsResponse implements Callback<List<FriendRequest>> {
+public class FriendRequestsResponse implements Callback<FriendRequestResponse> {
     @Override
-    public void onResponse(Call<List<FriendRequest>> call, Response<List<FriendRequest>> response) {
+    public void onResponse(Call<FriendRequestResponse> call, Response<FriendRequestResponse> response) {
         if (response.isSuccessful()) {
-            List<FriendRequest> friendRequests = response.body();
-            if (friendRequests == null) {
-                friendRequests = Collections.emptyList();
-            }
-            BusProvider.getBus().post(new FriendRequestsLoadedEvent(friendRequests));
+            FriendRequestResponse friendRequestResponse = response.body();
+            BusProvider.getBus().post(new FriendRequestsLoadedEvent(friendRequestResponse.getFriendRequests()));
         } else
             this.onFailure(call, new HttpException(response));
 
     }
 
     @Override
-    public void onFailure(Call<List<FriendRequest>> call, Throwable t) {
+    public void onFailure(Call<FriendRequestResponse> call, Throwable t) {
         BusProvider.getBus().post(new FriendRequestsLoadFailedEvent());
 
     }
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
new file mode 100644
index 000000000..83e39a67e
--- /dev/null
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
@@ -0,0 +1,31 @@
+package org.amahi.anywhere.server.response;
+
+import org.amahi.anywhere.bus.BusProvider;
+import org.amahi.anywhere.bus.DeleteFriendFailedEvent;
+import org.amahi.anywhere.bus.DeleteFriendCompletedEvent;
+import org.amahi.anywhere.server.model.DeleteFriendResponse;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.HttpException;
+import retrofit2.Response;
+
+public class FriendUserDeleteResponse implements Callback<DeleteFriendResponse> {
+    @Override
+    public void onResponse(Call<DeleteFriendResponse> call, Response<DeleteFriendResponse> response) {
+        DeleteFriendResponse deleteFriendResponse = response.body();
+        if (response.isSuccessful()) {
+            BusProvider.getBus().post(new DeleteFriendCompletedEvent(deleteFriendResponse.isSuccess(), deleteFriendResponse.getMessage()));
+
+        } else {
+            this.onFailure(call, new HttpException(response));
+        }
+
+    }
+
+    @Override
+    public void onFailure(Call<DeleteFriendResponse> call, Throwable t) {
+        BusProvider.getBus().post(new DeleteFriendFailedEvent());
+
+    }
+}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
index c2d39c915..7d80d6202 100644
--- a/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
+++ b/src/main/java/org/amahi/anywhere/server/response/FriendUsersResponse.java
@@ -1,16 +1,10 @@
 package org.amahi.anywhere.server.response;
 
-import com.squareup.otto.Bus;
 
 import org.amahi.anywhere.bus.BusProvider;
 import org.amahi.anywhere.bus.FriendUsersLoadFailedEvent;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
-import org.amahi.anywhere.bus.ServerFilesLoadedEvent;
-import org.amahi.anywhere.server.model.FriendUser;
-import org.amahi.anywhere.server.model.PrimaryUser;
-
-import java.util.Collections;
-import java.util.List;
+import org.amahi.anywhere.server.model.FriendUserResponse;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -18,23 +12,20 @@
 import retrofit2.Response;
 
 
-public class FriendUsersResponse implements Callback<List<PrimaryUser>> {
+public class FriendUsersResponse implements Callback<FriendUserResponse> {
     @Override
-    public void onResponse(Call<List<PrimaryUser>> call, Response<List<PrimaryUser>> response) {
+    public void onResponse(Call<FriendUserResponse> call, Response<FriendUserResponse> response) {
         if (response.isSuccessful()) {
-            List<PrimaryUser> primaryUsers = response.body();
-            if (primaryUsers == null) {
-                primaryUsers = Collections.emptyList();
-            }
-            BusProvider.getBus().post(new FriendUsersLoadedEvent(primaryUsers));
-        } else
+            FriendUserResponse friendUserResponse = response.body();
+            BusProvider.getBus().post(new FriendUsersLoadedEvent(friendUserResponse.getFriendUsers()));
+        } else {
             this.onFailure(call, new HttpException(response));
+        }
 
     }
 
     @Override
-    public void onFailure(Call<List<PrimaryUser>> call, Throwable t) {
+    public void onFailure(Call<FriendUserResponse> call, Throwable t) {
         BusProvider.getBus().post(new FriendUsersLoadFailedEvent());
-
     }
 }
diff --git a/src/main/res/drawable-notnight/ic_friends.xml b/src/main/res/drawable-notnight/ic_friends.xml
new file mode 100644
index 000000000..087a5904b
--- /dev/null
+++ b/src/main/res/drawable-notnight/ic_friends.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/src/main/res/drawable/ic_friends.xml b/src/main/res/drawable/ic_friends.xml
new file mode 100644
index 000000000..e9c32676b
--- /dev/null
+++ b/src/main/res/drawable/ic_friends.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:tint="#FFFFFF"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+</vector>
diff --git a/src/main/res/layout/fragment_navigation.xml b/src/main/res/layout/fragment_navigation.xml
index f9e2a5a15..0052faa59 100644
--- a/src/main/res/layout/fragment_navigation.xml
+++ b/src/main/res/layout/fragment_navigation.xml
@@ -163,7 +163,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="32dp"
                     android:layout_marginStart="16dp"
-                    android:src="@drawable/ic_recent_files_24dp"
+                    android:src="@drawable/ic_friends"
                     tools:ignore="contentDescription" />
 
                 <TextView
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c9a6df36f..f659328ea 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -198,6 +198,8 @@
     <string name="text_delete">Delete</string>
     <string name="title_delete_friend_request">Delete Friend Request</string>
     <string name="message_delete_friend_request">This action cannot be undone</string>
+    <string name="message_resend_progress">Resending friend request</string>
+    <string name="message_add_friend_user">Sending friend request</string>
 
 
 </resources>

From 8ec8461c9de3ca5093844339b040b1408c69377b Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 28 Jul 2019 18:14:23 +0530
Subject: [PATCH 14/16] updates friend requests list after adding new friend
 request

---
 .../org/amahi/anywhere/fragment/FriendRequestsFragment.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index f497837c4..dc35d70f6 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -138,7 +138,7 @@ public void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
     @Subscribe
     public void onAddFriendUser(AddFriendUserCompletedEvent event) {
         if (event.isSuccess()) {
-            getListAdapter().notifyDataSetChanged();
+            serverClient.getFriendRequests();
         }
     }
 

From 35dc1669942d86c3bb23bde6d8cf9b907b8e2375 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Sun, 28 Jul 2019 19:59:57 +0530
Subject: [PATCH 15/16] fixes failed travis build

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index bb4eb1c6d..edd221c68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ before_install:
 
 jdk:
  - oraclejdk8
+ - oraclejdk9
+ - oraclejdk11
 
 sudo: required
 android:

From c712a8e429c634a25fc5fc019d1cf7ddf1ba2f89 Mon Sep 17 00:00:00 2001
From: Balaji R <balajiramavathu12@gmail.com>
Date: Fri, 9 Aug 2019 22:03:57 +0530
Subject: [PATCH 16/16] removes adding,deleting,resending friend users,requests

---
 .../anywhere/activity/FriendsActivity.java    |  74 +------
 .../adapter/FriendRequestsListAdapter.java    |  28 ---
 .../anywhere/adapter/FriendsListAdapter.java  |  28 ---
 .../bus/AddFriendUserCompletedEvent.java      |  25 ---
 .../bus/AddFriendUserFailedEvent.java         |   4 -
 .../bus/DeleteFriendCompletedEvent.java       |  23 --
 .../anywhere/bus/DeleteFriendFailedEvent.java |   4 -
 .../DeleteFriendRequestCompletedEvent.java    |  19 --
 .../bus/DeleteFriendRequestFailedEvent.java   |   4 -
 .../amahi/anywhere/bus/FriendDeleteEvent.java |   5 -
 .../bus/FriendRequestDeleteEvent.java         |   4 -
 .../bus/FriendRequestResendEvent.java         |   4 -
 .../anywhere/bus/ResendFriendFailedEvent.java |   4 -
 .../ResendFriendRequestCompletedEvent.java    |  23 --
 .../fragment/AlertDialogFragment.java         | 202 +-----------------
 .../fragment/FriendRequestsFragment.java      | 134 +-----------
 .../FriendRequestsOptionsDialogFragment.java  |  53 -----
 .../anywhere/fragment/FriendsFragment.java    | 107 +---------
 .../FriendsOptionsDialogFragment.java         |  46 ----
 .../amahi/anywhere/server/api/ServerApi.java  |  26 ---
 .../anywhere/server/client/ServerClient.java  |  21 --
 .../response/AddFriendUserResponse.java       |  35 ---
 .../response/FriendRequestDeleteResponse.java |  29 ---
 .../response/FriendRequestResendResponse.java |  32 ---
 .../response/FriendUserDeleteResponse.java    |  31 ---
 .../org/amahi/anywhere/util/Fragments.java    |  11 -
 .../util/FriendRequestsItemClickListener.java |  15 --
 .../util/FriendsItemClickListener.java        |  16 --
 src/main/res/layout/activity_friends.xml      |   8 -
 .../layout/friend_requests_bottom_sheet.xml   |  55 -----
 .../res/layout/friend_requests_list_item.xml  |  12 +-
 src/main/res/layout/friends_bottom_sheet.xml  |  32 ---
 src/main/res/layout/friends_list_item.xml     |  51 ++---
 33 files changed, 22 insertions(+), 1143 deletions(-)
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
 delete mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
 delete mode 100644 src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
 delete mode 100644 src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
 delete mode 100644 src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
 delete mode 100644 src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
 delete mode 100644 src/main/res/layout/friend_requests_bottom_sheet.xml
 delete mode 100644 src/main/res/layout/friends_bottom_sheet.xml

diff --git a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
index e0e0279bb..16730dfd9 100644
--- a/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
+++ b/src/main/java/org/amahi/anywhere/activity/FriendsActivity.java
@@ -4,38 +4,28 @@
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
-import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.view.MenuItem;
-import android.widget.Toast;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
-import com.squareup.otto.Subscribe;
 
 import org.amahi.anywhere.AmahiApplication;
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsPagerAdapter;
-import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
 import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.fragment.AlertDialogFragment;
 import org.amahi.anywhere.fragment.FriendRequestsFragment;
 import org.amahi.anywhere.fragment.FriendsFragment;
 import org.amahi.anywhere.server.client.ServerClient;
-import org.amahi.anywhere.server.model.PostFriendRequest;
-import org.amahi.anywhere.util.Fragments;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
-public class FriendsActivity extends AppCompatActivity
-    implements AlertDialogFragment.AddFriendDialogCallback {
+public class FriendsActivity extends AppCompatActivity {
 
     @Inject
     ServerClient serverClient;
-    private ProgressDialog progressDialog;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -50,7 +40,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         getTabLayout().setupWithViewPager(getPager());
 
-        setUpAddFriendFAB();
 
     }
 
@@ -74,21 +63,6 @@ private void setUpPager() {
         getPager().setAdapter(adapter);
     }
 
-    private void setUpAddFriendFAB() {
-        FloatingActionButton fab = findViewById(R.id.fab_add_friend);
-
-        fab.setOnClickListener(v -> showAddFriendDialog());
-    }
-
-    private void showAddFriendDialog() {
-        AlertDialogFragment addFriendDialog = new AlertDialogFragment();
-        Bundle bundle = new Bundle();
-        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.ADD_FRIEND_DIALOG);
-        addFriendDialog.setArguments(bundle);
-        addFriendDialog.show(getSupportFragmentManager(), "add_friend_dialog");
-
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch (menuItem.getItemId()) {
@@ -144,50 +118,4 @@ public void onPause() {
         BusProvider.getBus().unregister(this);
     }
 
-
-    //add friend dialog onclick
-    @Override
-    public void dialogPositiveButtonOnClick(String email) {
-        if (serverClient.isConnected()) {
-            addFriendRequest(email);
-            showProgressDialog(getString(R.string.message_add_friend_user));
-        }
-
-        //TODO: connect server if not connected
-    }
-
-    private void showProgressDialog(String message) {
-        progressDialog = new ProgressDialog(this);
-        progressDialog.setMessage(message);
-        progressDialog.setIndeterminate(true);
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-    }
-
-    @Override
-    public void dialogNegativeButtonOnClick() {
-
-    }
-
-    private void addFriendRequest(String email) {
-
-        if (email != null) {
-            PostFriendRequest newFriendRequest = new PostFriendRequest();
-            newFriendRequest.setEmail(email);
-            //TODO: set proper pin
-            newFriendRequest.setPin(1234);
-            serverClient.addFriendUser(newFriendRequest);
-        }
-
-    }
-
-
-    @Subscribe
-    public void onAddFriendUser(AddFriendUserCompletedEvent event) {
-        if (progressDialog.isShowing()) {
-            progressDialog.dismiss();
-        }
-        Toast.makeText(this, event.getMessage(), Toast.LENGTH_LONG).show();
-
-    }
 }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
index 8aeb7ef6a..c244351a2 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendRequestsListAdapter.java
@@ -5,7 +5,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -13,15 +12,12 @@
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.server.model.FriendRequestItem;
-import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
 import java.util.List;
 
 public class FriendRequestsListAdapter extends RecyclerView.Adapter<FriendRequestsListAdapter.FriendRequestsListViewHolder> {
     private List<FriendRequestItem> friendRequestsList;
     private Context context;
-    private FriendRequestsItemClickListener friendsItemClickListener;
-    private int selectedPosition = RecyclerView.NO_POSITION;
 
     public FriendRequestsListAdapter(Context context, List<FriendRequestItem> friendRequestsList) {
         this.context = context;
@@ -29,22 +25,6 @@ public FriendRequestsListAdapter(Context context, List<FriendRequestItem> friend
 
     }
 
-    public void setOnClickListener(FriendRequestsItemClickListener listener) {
-        this.friendsItemClickListener = listener;
-    }
-
-    public int getSelectedPosition() {
-        return selectedPosition;
-    }
-
-    public void setSelectedPosition(int selectedPosition) {
-        this.selectedPosition = selectedPosition;
-    }
-
-    public void removeFriend(int position) {
-        this.friendRequestsList.remove(position);
-        notifyDataSetChanged();
-    }
 
     @NonNull
     @Override
@@ -84,11 +64,6 @@ public void onBindViewHolder(@NonNull FriendRequestsListViewHolder holder, int p
         drawable.setColor(context.getResources().getColor(colorResourceId));
         holder.friendRequestStatus.setBackground(drawable);
 
-        holder.moreOptions.setOnClickListener(v -> {
-            friendsItemClickListener.onMoreOptionClick(holder.itemView, position);
-
-        });
-
     }
 
     @Override
@@ -99,14 +74,11 @@ public int getItemCount() {
     class FriendRequestsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
         TextView friendRequestStatus;
-        ImageView moreOptions;
 
         FriendRequestsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_request_email);
             friendRequestStatus = itemView.findViewById(R.id.text_friend_request_status);
-            moreOptions = itemView.findViewById(R.id.friend_requests_options);
-
         }
     }
 }
diff --git a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
index 9c862dbb7..3fc1a0352 100644
--- a/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
+++ b/src/main/java/org/amahi/anywhere/adapter/FriendsListAdapter.java
@@ -4,7 +4,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -12,15 +11,12 @@
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.server.model.FriendUserItem;
-import org.amahi.anywhere.util.FriendsItemClickListener;
 
 import java.util.List;
 
 public class FriendsListAdapter extends RecyclerView.Adapter<FriendsListAdapter.FriendsListViewHolder> {
     private List<FriendUserItem> friendsList;
     private Context context;
-    private FriendsItemClickListener friendsItemClickListener;
-    private int selectedPosition = RecyclerView.NO_POSITION;
 
     public FriendsListAdapter(Context context, List<FriendUserItem> friendsList) {
         this.context = context;
@@ -28,23 +24,6 @@ public FriendsListAdapter(Context context, List<FriendUserItem> friendsList) {
 
     }
 
-    public void setOnClickListener(FriendsItemClickListener listener) {
-        this.friendsItemClickListener = listener;
-    }
-
-    public int getSelectedPosition() {
-        return selectedPosition;
-    }
-
-    public void setSelectedPosition(int selectedPosition) {
-        this.selectedPosition = selectedPosition;
-    }
-
-    public void removeFriend(int position) {
-        this.friendsList.remove(position);
-        notifyDataSetChanged();
-    }
-
     @NonNull
     @Override
     public FriendsListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -59,11 +38,6 @@ public void onBindViewHolder(@NonNull FriendsListViewHolder holder, int position
         builder.append(friendsList.get(position).getCreatedAt());
         holder.createdAt.setText(builder);
 
-        holder.moreOptions.setOnClickListener(v -> {
-            friendsItemClickListener.onMoreOptionClick(holder.itemView, position);
-
-        });
-
     }
 
     @Override
@@ -74,13 +48,11 @@ public int getItemCount() {
     class FriendsListViewHolder extends RecyclerView.ViewHolder {
         TextView friendEmailText;
         TextView createdAt;
-        ImageView moreOptions;
 
         FriendsListViewHolder(View itemView) {
             super(itemView);
             friendEmailText = itemView.findViewById(R.id.text_friend_email);
             createdAt = itemView.findViewById(R.id.text_friend_created_at);
-            moreOptions = itemView.findViewById(R.id.friends_more_options);
 
         }
     }
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
deleted file mode 100644
index 246595b15..000000000
--- a/src/main/java/org/amahi/anywhere/bus/AddFriendUserCompletedEvent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class AddFriendUserCompletedEvent implements BusEvent {
-    private String message;
-    private Boolean success;
-
-    public AddFriendUserCompletedEvent(Boolean success, String message) {
-        this.success = success;
-        this.message = message;
-    }
-
-    public Boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
deleted file mode 100644
index 15cb56965..000000000
--- a/src/main/java/org/amahi/anywhere/bus/AddFriendUserFailedEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class AddFriendUserFailedEvent implements BusEvent {
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
deleted file mode 100644
index d783a78f6..000000000
--- a/src/main/java/org/amahi/anywhere/bus/DeleteFriendCompletedEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class DeleteFriendCompletedEvent implements BusEvent {
-    private String message;
-    private Boolean success;
-
-    public DeleteFriendCompletedEvent(Boolean success, String message) {
-        this.success = success;
-        this.message = message;
-    }
-
-    public Boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
deleted file mode 100644
index 7b8f2e948..000000000
--- a/src/main/java/org/amahi/anywhere/bus/DeleteFriendFailedEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class DeleteFriendFailedEvent implements BusEvent {
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
deleted file mode 100644
index bb209a11e..000000000
--- a/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestCompletedEvent.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class DeleteFriendRequestCompletedEvent implements BusEvent {
-    private Boolean success;
-    private String message;
-
-    public DeleteFriendRequestCompletedEvent(Boolean success, String message) {
-        this.success = success;
-        this.message = message;
-    }
-
-    public Boolean isSuccess() {
-        return success;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
deleted file mode 100644
index fcf860e5f..000000000
--- a/src/main/java/org/amahi/anywhere/bus/DeleteFriendRequestFailedEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class DeleteFriendRequestFailedEvent implements BusEvent {
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
deleted file mode 100644
index cb1ccbdab..000000000
--- a/src/main/java/org/amahi/anywhere/bus/FriendDeleteEvent.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class FriendDeleteEvent {
-
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
deleted file mode 100644
index 8cf007ad8..000000000
--- a/src/main/java/org/amahi/anywhere/bus/FriendRequestDeleteEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class FriendRequestDeleteEvent {
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java b/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
deleted file mode 100644
index f40fcdef3..000000000
--- a/src/main/java/org/amahi/anywhere/bus/FriendRequestResendEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class FriendRequestResendEvent {
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java b/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
deleted file mode 100644
index b2ff3bcff..000000000
--- a/src/main/java/org/amahi/anywhere/bus/ResendFriendFailedEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class ResendFriendFailedEvent implements BusEvent {
-}
diff --git a/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java b/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
deleted file mode 100644
index a0a74db15..000000000
--- a/src/main/java/org/amahi/anywhere/bus/ResendFriendRequestCompletedEvent.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.amahi.anywhere.bus;
-
-public class ResendFriendRequestCompletedEvent {
-    private String message;
-    private Boolean success;
-
-    public ResendFriendRequestCompletedEvent(Boolean success, String message) {
-        this.success = success;
-        this.message = message;
-    }
-
-    public Boolean isSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
index 08eaf03a4..5212ff670 100644
--- a/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/AlertDialogFragment.java
@@ -1,7 +1,6 @@
 package org.amahi.anywhere.fragment;
 
 import android.app.Dialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
@@ -12,12 +11,6 @@
 import androidx.fragment.app.DialogFragment;
 
 import android.util.Log;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.Toast;
-
-import com.google.android.material.textfield.TextInputEditText;
 
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.util.Fragments;
@@ -28,12 +21,8 @@ public class AlertDialogFragment extends DialogFragment implements DialogInterfa
     File file;
     private int dialogType = -1;
     AlertDialog.Builder builder;
-    private TextInputEditText textFriendEmail;
     public static final int DELETE_FILE_DIALOG = 0;
     public static final int DUPLICATE_FILE_DIALOG = 1;
-    public static final int ADD_FRIEND_DIALOG = 2;
-    public static final int DELETE_FRIEND_DIALOG = 3;
-    public static final int DELETE_FRIEND_REQUEST_DIALOG = 4;
 
 
     @NonNull
@@ -55,24 +44,9 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                 buildDuplicateDialog();
                 break;
 
-            case ADD_FRIEND_DIALOG:
-                buildAddFriendDialog();
-                break;
-            case DELETE_FRIEND_DIALOG:
-                buildDeleteFriendDialog();
-                break;
-
-            case DELETE_FRIEND_REQUEST_DIALOG:
-                buildDeleteFriendRequestDialog();
-        }
-
-        Dialog dialog = builder.create();
-
-        if (dialogType == ADD_FRIEND_DIALOG) {
-            addFriendButtonClickListener(dialog);
         }
 
-        return dialog;
+        return builder.create();
     }
 
     private void buildDeleteDialog() {
@@ -90,73 +64,6 @@ private void buildDuplicateDialog() {
             .setNegativeButton(getString(R.string.button_no), this);
     }
 
-    private void buildAddFriendDialog() {
-        View v = getActivity().getLayoutInflater().inflate(R.layout.dialog_add_friend, null);
-        textFriendEmail = v.findViewById(R.id.text_email);
-
-        builder.setTitle(getString(R.string.title_add_new_friend))
-            .setMessage(getString(R.string.message_add_new_friend))
-            .setPositiveButton(getString(R.string.text_button_add_friend), this)
-            .setNegativeButton(getString(R.string.text_cancel), this);
-        builder.setView(v);
-    }
-
-    private void buildDeleteFriendDialog() {
-        builder.setTitle(R.string.title_delete_friend)
-            .setMessage(getString(R.string.message_delete_friend))
-            .setPositiveButton(R.string.text_delete, this)
-            .setNegativeButton(getString(R.string.text_cancel), this);
-    }
-
-    private void buildDeleteFriendRequestDialog() {
-        builder.setTitle(getString(R.string.title_delete_friend_request))
-            .setMessage(getString(R.string.message_delete_friend_request))
-            .setPositiveButton(R.string.text_delete, this)
-            .setNegativeButton(R.string.text_cancel, this);
-    }
-
-    private void addFriendButtonClickListener(Dialog dialog) {
-        dialog.setOnShowListener(dialogInterface -> {
-
-            setCursorAndShowKeyboard(textFriendEmail);
-
-            Button positiveButton = ((AlertDialog) dialogInterface).getButton(DialogInterface.BUTTON_POSITIVE);
-            positiveButton.setOnClickListener(v -> {
-                AddFriendDialogCallback callback = getAddFriendCallback();
-                if (callback != null) {
-                    if (textFriendEmail.getText() != null && !textFriendEmail.getText().toString().equals("")) {
-                        dialogInterface.dismiss();
-                        callback.dialogPositiveButtonOnClick(textFriendEmail.getText().toString());
-                        hideKeyboard();
-                    } else {
-                        Toast.makeText(getContext(), R.string.message_empty_email_add_friend, Toast.LENGTH_LONG).show();
-                    }
-                }
-            });
-
-            Button negativeButton = ((AlertDialog) dialogInterface).getButton(DialogInterface.BUTTON_NEGATIVE);
-            negativeButton.setOnClickListener(v -> {
-                dialogInterface.dismiss();
-                hideKeyboard();
-            });
-        });
-    }
-
-    private void setCursorAndShowKeyboard(TextInputEditText editText) {
-        editText.setFocusable(true);
-        editText.requestFocus();
-        if (getActivity() != null) {
-            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
-        }
-    }
-
-    private void hideKeyboard() {
-        if (getActivity() != null) {
-            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0);
-        }
-    }
 
 
     @Override
@@ -178,30 +85,6 @@ public void onClick(DialogInterface dialog, int which) {
         } else if (dialogType == DELETE_FILE_DIALOG) {
             DeleteFileDialogCallback callback = getDeleteDialogCallback();
 
-            if (callback != null) {
-                if (which == DialogInterface.BUTTON_POSITIVE) {
-                    dialog.dismiss();
-                    callback.dialogPositiveButtonOnClick();
-                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
-                    dialog.dismiss();
-                    callback.dialogNegativeButtonOnClick();
-                }
-            }
-        } else if (dialogType == DELETE_FRIEND_DIALOG) {
-            DeleteFriendDialogCallback callback = getDeleteFriendDialogCallback();
-
-            if (callback != null) {
-                if (which == DialogInterface.BUTTON_POSITIVE) {
-                    dialog.dismiss();
-                    callback.dialogPositiveButtonOnClick();
-                } else if (which == DialogInterface.BUTTON_NEGATIVE) {
-                    dialog.dismiss();
-                    callback.dialogNegativeButtonOnClick();
-                }
-            }
-        } else if (dialogType == DELETE_FRIEND_REQUEST_DIALOG) {
-            DeleteFriendRequestDialogCallback callback = getDeleteFriendRequestDialogCallback();
-
             if (callback != null) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
                     dialog.dismiss();
@@ -256,65 +139,6 @@ private DeleteFileDialogCallback getDeleteDialogCallback() {
         return callback;
     }
 
-    private AddFriendDialogCallback getAddFriendCallback() {
-        AddFriendDialogCallback callback;
-        if (getTargetFragment() != null) {
-            try {
-                callback = (AddFriendDialogCallback) getTargetFragment();
-            } catch (ClassCastException e) {
-                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
-                throw e;
-            }
-        } else {
-            try {
-                callback = (AddFriendDialogCallback) getActivity();
-            } catch (ClassCastException e) {
-                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
-                throw e;
-            }
-        }
-        return callback;
-    }
-
-    private DeleteFriendDialogCallback getDeleteFriendDialogCallback() {
-        DeleteFriendDialogCallback callback;
-        if (getTargetFragment() != null) {
-            try {
-                callback = (DeleteFriendDialogCallback) getTargetFragment();
-            } catch (ClassCastException e) {
-                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
-                throw e;
-            }
-        } else {
-            try {
-                callback = (DeleteFriendDialogCallback) getActivity();
-            } catch (ClassCastException e) {
-                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
-                throw e;
-            }
-        }
-        return callback;
-    }
-
-    private DeleteFriendRequestDialogCallback getDeleteFriendRequestDialogCallback() {
-        DeleteFriendRequestDialogCallback callback;
-        if (getTargetFragment() != null) {
-            try {
-                callback = (DeleteFriendRequestDialogCallback) getTargetFragment();
-            } catch (ClassCastException e) {
-                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by target fragment!", e);
-                throw e;
-            }
-        } else {
-            try {
-                callback = (DeleteFriendRequestDialogCallback) getActivity();
-            } catch (ClassCastException e) {
-                Log.e(this.getClass().getSimpleName(), "Callback of this class must be implemented by the activity!", e);
-                throw e;
-            }
-        }
-        return callback;
-    }
 
     public interface DuplicateFileDialogCallback {
 
@@ -329,30 +153,6 @@ public interface DeleteFileDialogCallback {
         void dialogPositiveButtonOnClick();
 
 
-        void dialogNegativeButtonOnClick();
-    }
-
-    public interface AddFriendDialogCallback {
-
-        void dialogPositiveButtonOnClick(String email);
-
-
-        void dialogNegativeButtonOnClick();
-    }
-
-    public interface DeleteFriendDialogCallback {
-
-        void dialogPositiveButtonOnClick();
-
-
-        void dialogNegativeButtonOnClick();
-    }
-
-    public interface DeleteFriendRequestDialogCallback {
-
-        void dialogPositiveButtonOnClick();
-
-
         void dialogNegativeButtonOnClick();
     }
 
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
index dc35d70f6..0f37ecbd7 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsFragment.java
@@ -1,9 +1,7 @@
 package org.amahi.anywhere.fragment;
 
-import android.app.ProgressDialog;
 import android.os.Bundle;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -12,24 +10,16 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 import com.squareup.otto.Subscribe;
 
 import org.amahi.anywhere.AmahiApplication;
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendRequestsListAdapter;
-import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
 import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.bus.DeleteFriendRequestCompletedEvent;
-import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
-import org.amahi.anywhere.bus.FriendRequestResendEvent;
 import org.amahi.anywhere.bus.FriendRequestsLoadedEvent;
-import org.amahi.anywhere.bus.ResendFriendRequestCompletedEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendRequestItem;
-import org.amahi.anywhere.util.Fragments;
-import org.amahi.anywhere.util.FriendRequestsItemClickListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,15 +29,11 @@
 /**
  * Friend Requests Fragment, shows list of friend requests.
  */
-public class FriendRequestsFragment extends Fragment implements
-    FriendRequestsItemClickListener,
-    AlertDialogFragment.DeleteFriendRequestDialogCallback {
+public class FriendRequestsFragment extends Fragment {
 
     @Inject
     ServerClient serverClient;
-    private ProgressDialog progressDialog;
     private List<FriendRequestItem> friendRequestsList = new ArrayList<>();
-    private final static String SELECTED_ITEM = "selected_item";
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -74,45 +60,27 @@ private RecyclerView getRecyclerView() {
     }
 
     private void setUpFriendRequestsList(Bundle state) {
-        setUpItemsMenu();
         if (serverClient.isConnected()) {
             serverClient.getFriendRequests();
         }
         setUpListAdapter();
-        setUpSelectedItem(state);
 
 
     }
 
-    private void setUpItemsMenu() {
-        setHasOptionsMenu(true);
-    }
 
-    private void setUpListActions() {
-        getListAdapter().setOnClickListener(this);
-    }
 
     private void setUpListAdapter() {
 
         FriendRequestsListAdapter adapter = new FriendRequestsListAdapter(getContext(), friendRequestsList);
         getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
-        setUpListActions();
-    }
-
-    private void setUpSelectedItem(Bundle state) {
-        if (isStateValid(state)) {
-            getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
-        }
     }
 
     private FriendRequestsListAdapter getListAdapter() {
         return (FriendRequestsListAdapter) getRecyclerView().getAdapter();
     }
 
-    private boolean isStateValid(Bundle state) {
-        return (state != null) && state.containsKey(SELECTED_ITEM);
-    }
 
     @Override
     public void onResume() {
@@ -135,104 +103,4 @@ public void onFriendRequestsLoaded(FriendRequestsLoadedEvent event) {
         setUpListAdapter();
     }
 
-    @Subscribe
-    public void onAddFriendUser(AddFriendUserCompletedEvent event) {
-        if (event.isSuccess()) {
-            serverClient.getFriendRequests();
-        }
-    }
-
-    @Subscribe
-    public void onDeleteFriendRequest(FriendRequestDeleteEvent event) {
-        deleteFriendRequest();
-    }
-
-    @Subscribe
-    public void onResendFriendRequest(FriendRequestResendEvent event) {
-        resendFriendRequest();
-    }
-
-    @Subscribe
-    public void onDeleteFriendRequestCompleted(DeleteFriendRequestCompletedEvent event) {
-        if (event.isSuccess()) {
-            getListAdapter().removeFriend(getListAdapter().getSelectedPosition());
-        }
-        if(progressDialog.isShowing()) {
-            progressDialog.dismiss();
-        }
-        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
-    }
-
-    @Subscribe
-    public void onResendFriendRequestCompleted(ResendFriendRequestCompletedEvent event) {
-        if(event.isSuccess()) {
-            int position = getListAdapter().getSelectedPosition();
-
-            friendRequestsList.get(position).setStatus(0);
-            //set other variables like lastRequestedAt
-            getListAdapter().notifyItemChanged(position);
-        }
-        if(progressDialog.isShowing()) {
-            progressDialog.dismiss();
-        }
-
-        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
-    }
-
-    private void deleteFriendRequest() {
-        AlertDialogFragment deleteFriendRequestDialog = new AlertDialogFragment();
-        Bundle bundle = new Bundle();
-        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.DELETE_FRIEND_REQUEST_DIALOG);
-        deleteFriendRequestDialog.setArguments(bundle);
-        deleteFriendRequestDialog.setTargetFragment(this, 2);
-        deleteFriendRequestDialog.show(getFragmentManager(), "delete_friend_request_dialog");
-    }
-
-    private void resendFriendRequest() {
-        int position = getListAdapter().getSelectedPosition();
-        showProgressDialog(getString(R.string.message_resend_progress));
-        serverClient.resendFriendRequest(friendRequestsList.get(position).getId());
-    }
-
-    @Override
-    public void onItemClick(View view, int position) {
-
-    }
-
-    @Override
-    public void onMoreOptionClick(View view, int position) {
-        getListAdapter().setSelectedPosition(position);
-        Fragments.Builder.buildFriendRequestsOptionsDialogFragment()
-            .show(getChildFragmentManager(), "friend_requests_options_dialog");
-
-
-    }
-
-    private void showProgressDialog(String message) {
-        progressDialog = new ProgressDialog(getContext());
-        progressDialog.setMessage(message);
-        progressDialog.setIndeterminate(true);
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-    }
-
-
-    //delete friend request dialog listeners
-    @Override
-    public void dialogPositiveButtonOnClick() {
-        int selectedPosition = getListAdapter().getSelectedPosition();
-        showProgressDialog(getString(R.string.message_delete_progress));
-        serverClient.deleteFriendRequest(friendRequestsList.get(selectedPosition).getId());
-    }
-
-    @Override
-    public void dialogNegativeButtonOnClick() {
-
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(SELECTED_ITEM, getListAdapter().getSelectedPosition());
-    }
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
deleted file mode 100644
index 31e5b6899..000000000
--- a/src/main/java/org/amahi/anywhere/fragment/FriendRequestsOptionsDialogFragment.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.amahi.anywhere.fragment;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-
-import org.amahi.anywhere.R;
-import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.bus.FriendRequestDeleteEvent;
-import org.amahi.anywhere.bus.FriendRequestResendEvent;
-
-public class FriendRequestsOptionsDialogFragment extends BottomSheetDialogFragment {
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.friend_requests_bottom_sheet, container, false);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        setUpViews(view);
-    }
-
-    private void setUpViews(View view) {
-
-        LinearLayout deleteLayout = view.findViewById(R.id.friend_requests_delete_layout);
-        LinearLayout resendLayout = view.findViewById(R.id.friend_requests_resend_layout);
-
-        deleteLayout.setOnClickListener(v -> setUpDelete());
-
-        resendLayout.setOnClickListener(v -> setUpResend());
-    }
-
-    private void setUpDelete() {
-        BusProvider.getBus().post(new FriendRequestDeleteEvent());
-        dismiss();
-    }
-
-    private void setUpResend() {
-        BusProvider.getBus().post(new FriendRequestResendEvent());
-        dismiss();
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
index 52edd69fa..5da358b36 100644
--- a/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
+++ b/src/main/java/org/amahi/anywhere/fragment/FriendsFragment.java
@@ -1,6 +1,5 @@
 package org.amahi.anywhere.fragment;
 
-import android.app.ProgressDialog;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -11,7 +10,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 import com.squareup.otto.Subscribe;
 
@@ -19,13 +17,9 @@
 import org.amahi.anywhere.R;
 import org.amahi.anywhere.adapter.FriendsListAdapter;
 import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.bus.DeleteFriendCompletedEvent;
 import org.amahi.anywhere.bus.FriendUsersLoadedEvent;
-import org.amahi.anywhere.bus.FriendDeleteEvent;
 import org.amahi.anywhere.server.client.ServerClient;
 import org.amahi.anywhere.server.model.FriendUserItem;
-import org.amahi.anywhere.util.Fragments;
-import org.amahi.anywhere.util.FriendsItemClickListener;
 
 import java.util.ArrayList;
 
@@ -36,15 +30,11 @@
 /**
  * Friends Fragment, shows list of friended users.
  */
-public class FriendsFragment extends Fragment implements
-    FriendsItemClickListener,
-    AlertDialogFragment.DeleteFriendDialogCallback {
+public class FriendsFragment extends Fragment{
 
     @Inject
     ServerClient serverClient;
-    private ProgressDialog deleteProgressDialog;
     private List<FriendUserItem> friendsList = new ArrayList<>();
-    private final static String SELECTED_ITEM = "selected_item";
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -66,8 +56,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         setUpFriendsList(savedInstanceState);
 
-        setUpProgressDialog();
-
 
     }
 
@@ -76,24 +64,14 @@ private RecyclerView getRecyclerView() {
     }
 
     private void setUpFriendsList(Bundle state) {
-        setUpItemsMenu();
         if (serverClient.isConnected()) {
             serverClient.getFriendUsers();
         }
         setUpListAdapter();
-        setUpSelectedItem(state);
-
-
     }
 
-    private void setUpItemsMenu() {
-        setHasOptionsMenu(true);
-    }
 
 
-    private void setUpListActions() {
-        getListAdapter().setOnClickListener(this);
-    }
 
     private FriendsListAdapter getListAdapter() {
         return (FriendsListAdapter) getRecyclerView().getAdapter();
@@ -106,17 +84,6 @@ private void setUpListAdapter() {
         getRecyclerView().setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false));
         getRecyclerView().setAdapter(adapter);
 
-        setUpListActions();
-    }
-
-    private void setUpSelectedItem(Bundle state) {
-        if (isStateValid(state)) {
-            getListAdapter().setSelectedPosition(state.getInt(SELECTED_ITEM));
-        }
-    }
-
-    private boolean isStateValid(Bundle state) {
-        return (state != null) && state.containsKey(SELECTED_ITEM);
     }
 
     @Override
@@ -138,76 +105,4 @@ public void onFriendUsersLoaded(FriendUsersLoadedEvent event) {
         friendsList = event.getFriendUsers();
         setUpListAdapter();
     }
-
-    @Subscribe
-    public void onDeleteFriend(FriendDeleteEvent event) {
-        deleteFriend();
-
-    }
-
-    @Subscribe
-    public void onDeleteFriendCompleted(DeleteFriendCompletedEvent event) {
-
-        if (event.isSuccess()) {
-            getListAdapter().removeFriend(getListAdapter().getSelectedPosition());
-        }
-        if (deleteProgressDialog.isShowing()) {
-            deleteProgressDialog.dismiss();
-        }
-        Toast.makeText(getContext(), event.getMessage(), Toast.LENGTH_LONG).show();
-    }
-
-    private void deleteFriend() {
-        AlertDialogFragment deleteFriendDialog = new AlertDialogFragment();
-        Bundle bundle = new Bundle();
-        bundle.putInt(Fragments.Arguments.DIALOG_TYPE, AlertDialogFragment.DELETE_FRIEND_DIALOG);
-        deleteFriendDialog.setArguments(bundle);
-        deleteFriendDialog.setTargetFragment(this, 2);
-        deleteFriendDialog.show(getFragmentManager(), "delete_friend_dialog");
-    }
-
-
-    @Override
-    public void onItemClick(View view, int position) {
-
-    }
-
-    @Override
-    public void onMoreOptionClick(View view, int position) {
-        getListAdapter().setSelectedPosition(position);
-        Fragments.Builder.buildFriendsOptionsDialogFragment()
-            .show(getChildFragmentManager(), "friends_options_dialog");
-
-
-    }
-
-    private void setUpProgressDialog() {
-        deleteProgressDialog = new ProgressDialog(getContext());
-        deleteProgressDialog.setMessage(getString(R.string.message_delete_progress));
-        deleteProgressDialog.setIndeterminate(true);
-        deleteProgressDialog.setCancelable(false);
-    }
-
-    //delete friend confirmation dialog callback methods
-    @Override
-    public void dialogPositiveButtonOnClick() {
-        int selectedPosition = getListAdapter().getSelectedPosition();
-        //delete data from server and show progress dialog
-        deleteProgressDialog.show();
-        serverClient.deleteFriendUser(friendsList.get(selectedPosition).getId());
-
-    }
-
-    @Override
-    public void dialogNegativeButtonOnClick() {
-
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-
-        outState.putInt(SELECTED_ITEM, getListAdapter().getSelectedPosition());
-    }
-
 }
diff --git a/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java b/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
deleted file mode 100644
index c3c7d4a72..000000000
--- a/src/main/java/org/amahi/anywhere/fragment/FriendsOptionsDialogFragment.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.amahi.anywhere.fragment;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
-
-import org.amahi.anywhere.R;
-import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.bus.FriendDeleteEvent;
-
-public class FriendsOptionsDialogFragment extends BottomSheetDialogFragment {
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.friends_bottom_sheet, container, false);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        setUpViews(view);
-    }
-
-    private void setUpViews(View view) {
-        LinearLayout deleteLayout = view.findViewById(R.id.friends_delete_layout);
-
-        deleteLayout.setOnClickListener(v -> setUpDelete());
-
-    }
-
-    private void setUpDelete() {
-        BusProvider.getBus().post(new FriendDeleteEvent());
-        dismiss();
-    }
-
-
-}
diff --git a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
index 81f90f743..677817e2b 100644
--- a/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
+++ b/src/main/java/org/amahi/anywhere/server/api/ServerApi.java
@@ -19,13 +19,8 @@
 
 package org.amahi.anywhere.server.api;
 
-import org.amahi.anywhere.server.model.DeleteFriendRequestResponse;
-import org.amahi.anywhere.server.model.DeleteFriendResponse;
 import org.amahi.anywhere.server.model.FriendRequestResponse;
 import org.amahi.anywhere.server.model.FriendUserResponse;
-import org.amahi.anywhere.server.model.NewFriendRequestResponse;
-import org.amahi.anywhere.server.model.PostFriendRequest;
-import org.amahi.anywhere.server.model.ResendFriendRequestResponse;
 import org.amahi.anywhere.server.model.ServerApp;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
@@ -36,15 +31,12 @@
 import okhttp3.MultipartBody;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
-import retrofit2.http.Body;
 import retrofit2.http.DELETE;
 import retrofit2.http.GET;
 import retrofit2.http.Header;
 import retrofit2.http.Multipart;
 import retrofit2.http.POST;
-import retrofit2.http.PUT;
 import retrofit2.http.Part;
-import retrofit2.http.Path;
 import retrofit2.http.Query;
 
 /**
@@ -89,27 +81,9 @@ Call<List<ServerApp>> getApps(
     Call<FriendUserResponse> getFriendUsers(
         @Header("api-key") String apiKey);
 
-    @POST("/frnd/request")
-    Call<NewFriendRequestResponse> addFriendUser(
-        @Header("api-key") String apiKey,
-        @Body PostFriendRequest friendRequest);
 
     @GET("/frnd/requests")
     Call<FriendRequestResponse> getFriendRequests(
         @Header("api-key") String apiKey);
 
-    @DELETE("/frnd/user/{id}")
-    Call<DeleteFriendResponse> deleteFriendUser(
-        @Header("api-key") String apiKey,
-        @Path("id") int id);
-
-    @DELETE("/frnd/request/{id}")
-    Call<DeleteFriendRequestResponse> deleteFriendRequest(
-        @Header("api-key") String apiKey,
-        @Path("id") int id);
-
-    @PUT("/frnd/request/{id}/resend")
-    Call<ResendFriendRequestResponse> resendFriendRequest(
-        @Header("api-key") String key,
-        @Path("id") int id);
 }
diff --git a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
index dd2a120d5..0c20df7f1 100644
--- a/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
+++ b/src/main/java/org/amahi/anywhere/server/client/ServerClient.java
@@ -38,17 +38,12 @@
 import org.amahi.anywhere.server.ApiConnection;
 import org.amahi.anywhere.server.api.ProxyApi;
 import org.amahi.anywhere.server.api.ServerApi;
-import org.amahi.anywhere.server.model.PostFriendRequest;
 import org.amahi.anywhere.server.model.Server;
 import org.amahi.anywhere.server.model.ServerFile;
 import org.amahi.anywhere.server.model.ServerFileMetadata;
 import org.amahi.anywhere.server.model.ServerRoute;
 import org.amahi.anywhere.server.model.ServerShare;
-import org.amahi.anywhere.server.response.AddFriendUserResponse;
-import org.amahi.anywhere.server.response.FriendRequestDeleteResponse;
-import org.amahi.anywhere.server.response.FriendRequestResendResponse;
 import org.amahi.anywhere.server.response.FriendRequestsResponse;
-import org.amahi.anywhere.server.response.FriendUserDeleteResponse;
 import org.amahi.anywhere.server.response.FriendUsersResponse;
 import org.amahi.anywhere.server.response.ServerAppsResponse;
 import org.amahi.anywhere.server.response.ServerFileDeleteResponse;
@@ -345,23 +340,7 @@ public void getFriendUsers() {
         serverApi.getFriendUsers(apiKey).enqueue(new FriendUsersResponse());
     }
 
-    public void addFriendUser(PostFriendRequest friendRequest) {
-        serverApi.addFriendUser(apiKey, friendRequest).enqueue(new AddFriendUserResponse());
-    }
-
     public void getFriendRequests() {
         serverApi.getFriendRequests(apiKey).enqueue(new FriendRequestsResponse());
     }
-
-    public void deleteFriendUser(int id) {
-        serverApi.deleteFriendUser(apiKey, id).enqueue(new FriendUserDeleteResponse());
-    }
-
-    public void deleteFriendRequest(int id) {
-        serverApi.deleteFriendRequest(apiKey, id).enqueue(new FriendRequestDeleteResponse());
-    }
-
-    public void resendFriendRequest(int id) {
-        serverApi.resendFriendRequest(apiKey, id).enqueue(new FriendRequestResendResponse());
-    }
 }
diff --git a/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java b/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
deleted file mode 100644
index 15beae268..000000000
--- a/src/main/java/org/amahi/anywhere/server/response/AddFriendUserResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.amahi.anywhere.server.response;
-
-
-import org.amahi.anywhere.bus.AddFriendUserCompletedEvent;
-import org.amahi.anywhere.bus.AddFriendUserFailedEvent;
-import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.server.model.NewFriendRequestResponse;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-public class AddFriendUserResponse implements Callback<NewFriendRequestResponse> {
-    @Override
-    public void onResponse(Call<NewFriendRequestResponse> call, Response<NewFriendRequestResponse> response) {
-        if (response.isSuccessful()) {
-            NewFriendRequestResponse requestResponse = response.body();
-            if (requestResponse.isSuccess()) {
-                BusProvider.getBus().post(new AddFriendUserCompletedEvent(requestResponse.isSuccess(), requestResponse.getMessage()));
-            } else {
-                BusProvider.getBus().post(new AddFriendUserFailedEvent());
-            }
-        } else {
-            BusProvider.getBus().post(new AddFriendUserFailedEvent());
-        }
-
-
-    }
-
-    @Override
-    public void onFailure(Call<NewFriendRequestResponse> call, Throwable t) {
-        BusProvider.getBus().post(new AddFriendUserFailedEvent());
-
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
deleted file mode 100644
index 57dd476ad..000000000
--- a/src/main/java/org/amahi/anywhere/server/response/FriendRequestDeleteResponse.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.amahi.anywhere.server.response;
-
-import org.amahi.anywhere.bus.BusEvent;
-import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.bus.DeleteFriendRequestCompletedEvent;
-import org.amahi.anywhere.bus.DeleteFriendRequestFailedEvent;
-import org.amahi.anywhere.server.model.DeleteFriendRequestResponse;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.HttpException;
-import retrofit2.Response;
-
-public class FriendRequestDeleteResponse implements Callback<DeleteFriendRequestResponse> {
-    @Override
-    public void onResponse(Call<DeleteFriendRequestResponse> call, Response<DeleteFriendRequestResponse> response) {
-        if (response.isSuccessful()) {
-            DeleteFriendRequestResponse deleteFriendRequestResponse = response.body();
-            BusProvider.getBus().post(new DeleteFriendRequestCompletedEvent(deleteFriendRequestResponse.isSuccess(), deleteFriendRequestResponse.getMessage()));
-        } else {
-            this.onFailure(call, new HttpException(response));
-        }
-    }
-
-    @Override
-    public void onFailure(Call<DeleteFriendRequestResponse> call, Throwable t) {
-        BusProvider.getBus().post(new DeleteFriendRequestFailedEvent());
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
deleted file mode 100644
index 9e3734d97..000000000
--- a/src/main/java/org/amahi/anywhere/server/response/FriendRequestResendResponse.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.amahi.anywhere.server.response;
-
-import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.bus.ResendFriendFailedEvent;
-import org.amahi.anywhere.bus.ResendFriendRequestCompletedEvent;
-import org.amahi.anywhere.server.model.ResendFriendRequestResponse;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.HttpException;
-import retrofit2.Response;
-
-public class FriendRequestResendResponse implements Callback<ResendFriendRequestResponse> {
-    @Override
-    public void onResponse(Call<ResendFriendRequestResponse> call, Response<ResendFriendRequestResponse> response) {
-
-        if (response.isSuccessful()) {
-            ResendFriendRequestResponse resendFriendRequestResponse = response.body();
-            BusProvider.getBus().post(new ResendFriendRequestCompletedEvent(resendFriendRequestResponse.isSuccess(),
-                resendFriendRequestResponse.getMessage()));
-        } else {
-            this.onFailure(call, new HttpException(response));
-        }
-
-    }
-
-    @Override
-    public void onFailure(Call<ResendFriendRequestResponse> call, Throwable t) {
-        BusProvider.getBus().post(new ResendFriendFailedEvent());
-
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java b/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
deleted file mode 100644
index 83e39a67e..000000000
--- a/src/main/java/org/amahi/anywhere/server/response/FriendUserDeleteResponse.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.amahi.anywhere.server.response;
-
-import org.amahi.anywhere.bus.BusProvider;
-import org.amahi.anywhere.bus.DeleteFriendFailedEvent;
-import org.amahi.anywhere.bus.DeleteFriendCompletedEvent;
-import org.amahi.anywhere.server.model.DeleteFriendResponse;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.HttpException;
-import retrofit2.Response;
-
-public class FriendUserDeleteResponse implements Callback<DeleteFriendResponse> {
-    @Override
-    public void onResponse(Call<DeleteFriendResponse> call, Response<DeleteFriendResponse> response) {
-        DeleteFriendResponse deleteFriendResponse = response.body();
-        if (response.isSuccessful()) {
-            BusProvider.getBus().post(new DeleteFriendCompletedEvent(deleteFriendResponse.isSuccess(), deleteFriendResponse.getMessage()));
-
-        } else {
-            this.onFailure(call, new HttpException(response));
-        }
-
-    }
-
-    @Override
-    public void onFailure(Call<DeleteFriendResponse> call, Throwable t) {
-        BusProvider.getBus().post(new DeleteFriendFailedEvent());
-
-    }
-}
diff --git a/src/main/java/org/amahi/anywhere/util/Fragments.java b/src/main/java/org/amahi/anywhere/util/Fragments.java
index 70058a52b..fa38f9f1f 100644
--- a/src/main/java/org/amahi/anywhere/util/Fragments.java
+++ b/src/main/java/org/amahi/anywhere/util/Fragments.java
@@ -30,8 +30,6 @@
 
 import org.amahi.anywhere.fragment.AudioListFragment;
 import org.amahi.anywhere.fragment.FileOptionsDialogFragment;
-import org.amahi.anywhere.fragment.FriendRequestsOptionsDialogFragment;
-import org.amahi.anywhere.fragment.FriendsOptionsDialogFragment;
 import org.amahi.anywhere.fragment.NavigationFragment;
 import org.amahi.anywhere.fragment.ServerAppsFragment;
 import org.amahi.anywhere.fragment.ServerFileAudioFragment;
@@ -191,15 +189,6 @@ public static BottomSheetDialogFragment buildOfflineFileOptionsDialogFragment()
             return fragment;
         }
 
-        public static BottomSheetDialogFragment buildFriendsOptionsDialogFragment() {
-            BottomSheetDialogFragment fragment = new FriendsOptionsDialogFragment();
-            return fragment;
-        }
-
-        public static BottomSheetDialogFragment buildFriendRequestsOptionsDialogFragment() {
-            BottomSheetDialogFragment fragment = new FriendRequestsOptionsDialogFragment();
-            return fragment;
-        }
 
     }
 
diff --git a/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java b/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
deleted file mode 100644
index 0289bc7be..000000000
--- a/src/main/java/org/amahi/anywhere/util/FriendRequestsItemClickListener.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.amahi.anywhere.util;
-
-import android.view.View;
-
-/**
- * FriendRequestsItemClickListener interface.
- * Handles onItemClick and onMoreOptionClick for FriendRequestsListAdapter
- */
-
-public interface FriendRequestsItemClickListener {
-
-    void onItemClick(View view, int position);
-
-    void onMoreOptionClick(View view, int position);
-}
diff --git a/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java b/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
deleted file mode 100644
index 8273729c4..000000000
--- a/src/main/java/org/amahi/anywhere/util/FriendsItemClickListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.amahi.anywhere.util;
-
-import android.view.View;
-
-/**
- * FriendsItemClickListener interface.
- * Handles onItemClick and onMoreOptionClick for FriendsListAdapter
- */
-
-public interface FriendsItemClickListener {
-
-    void onItemClick(View view, int position);
-
-    void onMoreOptionClick(View view, int position);
-
-}
diff --git a/src/main/res/layout/activity_friends.xml b/src/main/res/layout/activity_friends.xml
index 2fd6c32d7..e2c2ae16c 100644
--- a/src/main/res/layout/activity_friends.xml
+++ b/src/main/res/layout/activity_friends.xml
@@ -22,12 +22,4 @@
 
     </LinearLayout>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab_add_friend"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginBottom="25dp"
-        android:layout_marginEnd="25dp"
-        android:src="@drawable/ic_add_friend"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/src/main/res/layout/friend_requests_bottom_sheet.xml b/src/main/res/layout/friend_requests_bottom_sheet.xml
deleted file mode 100644
index e08b43d21..000000000
--- a/src/main/res/layout/friend_requests_bottom_sheet.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@android:color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/friend_requests_delete_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="32dp"
-            android:src="@drawable/ic_delete"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/menu_delete"
-            android:textColor="@android:color/black"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/friend_requests_resend_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="32dp"
-            android:src="@drawable/ic_resend"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Resend"
-            android:textColor="@android:color/black"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/src/main/res/layout/friend_requests_list_item.xml b/src/main/res/layout/friend_requests_list_item.xml
index 9d8526514..74ff3f05e 100644
--- a/src/main/res/layout/friend_requests_list_item.xml
+++ b/src/main/res/layout/friend_requests_list_item.xml
@@ -19,7 +19,7 @@
 
         <TextView
             android:layout_width="0dp"
-            android:layout_weight="8"
+            android:layout_weight="3"
             android:layout_height="wrap_content"
             android:id="@+id/text_friend_request_email"
             android:padding="8dp"
@@ -28,7 +28,7 @@
 
         <TextView
             android:layout_width="0dp"
-            android:layout_weight="3"
+            android:layout_weight="1"
             android:layout_height="wrap_content"
             android:padding="8dp"
             android:id="@+id/text_friend_request_status"
@@ -39,14 +39,6 @@
             android:textColor="@android:color/white"
             android:background="@drawable/friend_status_background" />
 
-        <ImageView
-            android:id="@+id/friend_requests_options"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:src="@drawable/ic_more_vert"
-            android:layout_gravity="center" />
-
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>
diff --git a/src/main/res/layout/friends_bottom_sheet.xml b/src/main/res/layout/friends_bottom_sheet.xml
deleted file mode 100644
index ae07db636..000000000
--- a/src/main/res/layout/friends_bottom_sheet.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:background="@android:color/white"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/friends_delete_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="32dp"
-            android:src="@drawable/ic_delete"
-            tools:ignore="contentDescription" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/menu_delete"
-            android:textColor="@android:color/black"
-            android:textSize="16sp" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/src/main/res/layout/friends_list_item.xml b/src/main/res/layout/friends_list_item.xml
index 5819ef0c2..b15c262f5 100644
--- a/src/main/res/layout/friends_list_item.xml
+++ b/src/main/res/layout/friends_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView 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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -15,44 +14,26 @@
     android:padding="8dp">
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:padding="8dp">
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="8"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/text_friend_email"
-                android:textSize="18sp"
-                android:textColor="@color/primary_text"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:id="@+id/text_friend_created_at"
-                android:gravity="center_vertical"
-                android:paddingEnd="5dp"
-                android:paddingTop="5dp"
-                android:text="Friends since 01-08-2018"
-                android:textSize="14sp"/>
-
-        </LinearLayout>
-
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/text_friend_email"
+            android:textSize="18sp"
+            android:textColor="@color/primary_text"/>
 
-        <ImageView
-            android:id="@+id/friends_more_options"
-            android:layout_width="0dp"
+        <TextView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:src="@drawable/ic_more_vert"
-            tools:ignore="contentDescription" />
+            android:id="@+id/text_friend_created_at"
+            android:gravity="center_vertical"
+            android:paddingEnd="5dp"
+            android:paddingTop="5dp"
+            android:text="Friends since 01-08-2018"
+            android:textSize="14sp"/>
 
     </LinearLayout>