Remove AppDatabase

app/src/main/java/app/insti/data/AppDatabase.java

-package app.insti.data;
-
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
-import android.arch.persistence.room.TypeConverters;
-import android.content.Context;
-
-@Database(entities = {Event.class, Body.class, Venue.class, User.class, Role.class, PlacementBlogPost.class, TrainingBlogPost.class, HostelMessMenu.class, NewsArticle.class}, version = 2, exportSchema = false)
-@TypeConverters({Converters.class})
-public abstract class AppDatabase extends RoomDatabase {
-
-    private static AppDatabase INSTANCE;
-
-    public static AppDatabase getAppDatabase(Context context) {
-        if (INSTANCE == null) {
-            INSTANCE =
-                    Room.databaseBuilder(context.getApplicationContext(), AppDatabase.class, "database")
-                            // allow queries on the main thread.
-                            // Don't do this on a real app! See PersistenceBasicSample for an example.
-                            // .allowMainThreadQueries()
-                            .fallbackToDestructiveMigration()
-                            .build();
-        }
-        return INSTANCE;
-    }
-
-    public static void destroyInstance() {
-        INSTANCE = null;
-    }
-
-    public abstract DbDao dbDao();
-}

app/src/main/java/app/insti/fragment/BodyFragment.java

@@ -45,8 +45,6 @@ import app.insti.adapter.BodyAdapter;
 import app.insti.adapter.FeedAdapter;
 import app.insti.adapter.UserAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.ServiceGenerator;
-import app.insti.data.AppDatabase;
 import app.insti.data.Body;
 import app.insti.data.Event;
 import app.insti.data.Role;
@@ -67,7 +65,6 @@ public class BodyFragment extends BackHandledFragment {
 
 
     String TAG = "BodyFragment";
-    private AppDatabase appDatabase;
     // TODO: Rename and change types of parameters
     private Body min_body;
     private SwipeRefreshLayout bodySwipeRefreshLayout;
@@ -133,13 +130,11 @@ public class BodyFragment extends BackHandledFragment {
 
         /* Initialize */
         bodyDisplayed = false;
-        appDatabase = AppDatabase.getAppDatabase(getContext());
         body = min_body;
         displayBody();
 
         /* Check if full body was passed */
         if (min_body.getBodyDescription() == null) {
-            new getDbBody().execute(min_body.getBodyID());
             updateBody();
         }
 
@@ -164,8 +159,6 @@ public class BodyFragment extends BackHandledFragment {
                 if (response.isSuccessful()) {
                     Body bodyResponse = response.body();
 
-                    new updateDbBody().execute(bodyResponse);
-
                     if (!bodyDisplayed) {
                         body = bodyResponse;
                         displayBody();
@@ -242,7 +235,6 @@ public class BodyFragment extends BackHandledFragment {
                     public void onResponse(Call<Void> call, Response<Void> response) {
                         if (response.isSuccessful()) {
                             body.setBodyUserFollows(!body.getBodyUserFollows());
-                            new updateDbBody().execute(body);
                             followButton.setBackgroundColor(getResources().getColor(body.getBodyUserFollows() ? R.color.colorAccent : R.color.colorWhite));
                         }
                     }
@@ -544,31 +536,4 @@ public class BodyFragment extends BackHandledFragment {
         startScaleFinal = startScale;
         zoomMode = true;
     }
-
-    private class updateDbBody extends AsyncTask<Body, Void, Integer> {
-        @Override
-        protected Integer doInBackground(Body... body) {
-            if (appDatabase.dbDao().getBody(body[0].getBodyID()).length > 0) {
-                appDatabase.dbDao().updateBody(body[0]);
-            } else {
-                appDatabase.dbDao().insertBody(body[0]);
-            }
-            return 1;
-        }
-    }
-
-    private class getDbBody extends AsyncTask<String, Void, Body[]> {
-        @Override
-        protected Body[] doInBackground(String... id) {
-            return appDatabase.dbDao().getBody(min_body.getBodyID());
-        }
-
-        @Override
-        protected void onPostExecute(Body[] result) {
-            if (result.length > 0 && !bodyDisplayed) {
-                body = result[0];
-                displayBody();
-            }
-        }
-    }
 }

app/src/main/java/app/insti/fragment/EventFragment.java

@@ -49,8 +49,6 @@ import app.insti.ShareURLMaker;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.BodyAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.ServiceGenerator;
-import app.insti.data.AppDatabase;
 import app.insti.data.Body;
 import app.insti.data.Event;
 import app.insti.data.Venue;
@@ -71,7 +69,6 @@ public class EventFragment extends BackHandledFragment {
     ImageButton shareEventButton;
     RecyclerView bodyRecyclerView;
     String TAG = "EventFragment";
-    private AppDatabase appDatabase;
 
     // Hold a reference to the current animator,
     // so that it can be canceled mid-way.
@@ -135,9 +132,6 @@ public class EventFragment extends BackHandledFragment {
     public void onStart() {
         super.onStart();
 
-        /* Initialize */
-        appDatabase = AppDatabase.getAppDatabase(getContext());
-
         Bundle bundle = getArguments();
         String eventJson = bundle.getString(Constants.EVENT_JSON);
         Log.d(TAG, "onStart: " + eventJson);
@@ -329,7 +323,6 @@ public class EventFragment extends BackHandledFragment {
                             }
 
                             event.setEventUserUes(endStatus);
-                            new updateDbEvent().execute(event);
                             setFollowButtonColors(endStatus);
                         }
                     }
@@ -479,12 +472,4 @@ public class EventFragment extends BackHandledFragment {
         set.start();
         mCurrentAnimator = set;
     }
-
-    private class updateDbEvent extends AsyncTask<Event, Void, Integer> {
-        @Override
-        protected Integer doInBackground(Event... event) {
-            appDatabase.dbDao().updateEvent(event[0]);
-            return 1;
-        }
-    }
 }

app/src/main/java/app/insti/fragment/FeedFragment.java

@@ -2,7 +2,6 @@ package app.insti.fragment;
 
 
 import android.app.Activity;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
@@ -27,16 +26,11 @@ import app.insti.R;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.FeedAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.ServiceGenerator;
 import app.insti.api.model.NewsFeedResponse;
-import app.insti.data.AppDatabase;
 import app.insti.data.Event;
-import okhttp3.OkHttpClient;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import retrofit2.Retrofit;
-import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -45,7 +39,6 @@ public class FeedFragment extends BaseFragment {
 
     private RecyclerView feedRecyclerView;
     private SwipeRefreshLayout feedSwipeRefreshLayout;
-    private AppDatabase appDatabase;
     private FloatingActionButton fab;
     private boolean freshEventsDisplayed = false;
     LinearLayoutManager mLayoutManager;
@@ -81,8 +74,6 @@ public class FeedFragment extends BaseFragment {
     @Override
     public void onStart() {
         super.onStart();
-        appDatabase = AppDatabase.getAppDatabase(getContext());
-        //new showEventsFromDB().execute();
         fab = (FloatingActionButton) getView().findViewById(R.id.fab);
         updateFeed();
     }

app/src/main/java/app/insti/fragment/MapFragment.java

@@ -90,8 +90,6 @@ import app.insti.Constants;
 import app.insti.R;
 import app.insti.activity.MainActivity;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.ServiceGenerator;
-import app.insti.data.AppDatabase;
 import app.insti.data.Venue;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -129,7 +127,6 @@ public class MapFragment extends Fragment implements TextWatcher,
     public ImageButton addMarkerIcon;
     public SoundPool soundPool;
     public int[] soundPoolIds;
-    private AppDatabase appDatabase;
     private SettingsManager settingsManager;
     private FuzzySearchAdapter adapter;
     private ExpandableListAdapter expAdapter;
@@ -223,12 +220,10 @@ public class MapFragment extends Fragment implements TextWatcher,
         toolbar.setTitle("InstiMap");
 
         /* Initialize */
-        appDatabase = AppDatabase.getAppDatabase(getContext());
         editText = (EditText) getView().findViewById(R.id.search);
         setFonts();
 
         getAPILocations();
-        new showLocationsFromDB().execute();
     }
 
     private void getAPILocations() {
@@ -237,7 +232,6 @@ public class MapFragment extends Fragment implements TextWatcher,
             @Override
             public void onResponse(Call<List<Venue>> call, Response<List<Venue>> response) {
                 if (response.isSuccessful()) {
-                    new updateDatabase().execute(response.body());
                     if (!locationsShown) {
                         setupWithData(response.body());
                         locationsShown = true;
@@ -1026,29 +1020,6 @@ public class MapFragment extends Fragment implements TextWatcher,
         });
     }
 
-    private class updateDatabase extends AsyncTask<List<Venue>, Void, Integer> {
-        @Override
-        protected Integer doInBackground(List<Venue>... venues) {
-            appDatabase.dbDao().deleteVenues();
-            appDatabase.dbDao().insertVenues(venues[0]);
-            return 1;
-        }
-    }
-
-    private class showLocationsFromDB extends AsyncTask<String, Void, List<Venue>> {
-        @Override
-        protected List<Venue> doInBackground(String... events) {
-            return appDatabase.dbDao().getAllVenues();
-        }
-
-        protected void onPostExecute(List<Venue> result) {
-            if (!locationsShown && result.size() > 0) {
-                setupWithData(result);
-                locationsShown = true;
-            }
-        }
-    }
-
     private class CustomListAdapter extends ArrayAdapter<String> {
 
         private Context mContext;

app/src/main/java/app/insti/fragment/MessMenuFragment.java

@@ -27,8 +27,6 @@ import app.insti.R;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.MessMenuAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.ServiceGenerator;
-import app.insti.data.AppDatabase;
 import app.insti.data.HostelMessMenu;
 import app.insti.data.MessMenu;
 import retrofit2.Call;
@@ -42,7 +40,6 @@ public class MessMenuFragment extends BaseFragment {
 
     private RecyclerView messMenuRecyclerView;
     private SwipeRefreshLayout messMenuSwipeRefreshLayout;
-    private AppDatabase appDatabase;
     private Spinner hostelSpinner;
     private String hostel;
 
@@ -107,9 +104,6 @@ public class MessMenuFragment extends BaseFragment {
     }
 
     private void displayMenu(final String hostel) {
-        appDatabase = AppDatabase.getAppDatabase(getContext());
-        new showMessMenuFromDB().execute(hostel);
-
         updateMessMenu(hostel);
     }
 
@@ -123,8 +117,6 @@ public class MessMenuFragment extends BaseFragment {
                     HostelMessMenu hostelMessMenu = findMessMenu(instituteMessMenu, hostel);
                     if(hostelMessMenu != null)
                         displayMessMenu(hostelMessMenu);
-
-                    new updateDatabase().execute(instituteMessMenu);
                 }
                 //Server Error
                 messMenuSwipeRefreshLayout.setRefreshing(false);
@@ -187,27 +179,4 @@ public class MessMenuFragment extends BaseFragment {
         });
         getActivity().findViewById(R.id.loadingPanel).setVisibility(View.GONE);
     }
-
-    private class updateDatabase extends AsyncTask<List<HostelMessMenu>, Void, Integer> {
-        @Override
-        protected Integer doInBackground(List<HostelMessMenu>... menus) {
-            appDatabase.dbDao().deleteHostelMessMenus();
-            appDatabase.dbDao().insertHostelMessMenus(menus[0]);
-            return 1;
-        }
-    }
-
-    public class showMessMenuFromDB extends AsyncTask<String, Void, HostelMessMenu> {
-
-        @Override
-        protected HostelMessMenu doInBackground(String... strings) {
-            return findMessMenu(appDatabase.dbDao().getAllHostelMessMenus(), strings[0]);
-        }
-
-        @Override
-        protected void onPostExecute(HostelMessMenu hostelMessMenu) {
-            if (hostelMessMenu != null)
-                displayMessMenu(hostelMessMenu);
-        }
-    }
 }

app/src/main/java/app/insti/fragment/MyEventsFragment.java

@@ -26,8 +26,12 @@ import app.insti.ItemClickListener;
 import app.insti.R;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.FeedAdapter;
-import app.insti.data.AppDatabase;
+import app.insti.api.RetrofitInterface;
 import app.insti.data.Event;
+import app.insti.data.User;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -36,7 +40,6 @@ public class MyEventsFragment extends BaseFragment {
 
     private RecyclerView myEventsFeedRecyclerView;
     private SwipeRefreshLayout myEventsFeedSwipeRefreshLayout;
-    private AppDatabase appDatabase;
     private FloatingActionButton fab;
 
     public MyEventsFragment() {
@@ -71,8 +74,7 @@ public class MyEventsFragment extends BaseFragment {
             fab.setVisibility(View.VISIBLE);
         }
 
-        appDatabase = AppDatabase.getAppDatabase(getContext());
-        new showEvents().execute();
+        updateOnRefresh();
 
         myEventsFeedSwipeRefreshLayout = getActivity().findViewById(R.id.my_events_feed_swipe_refresh_layout);
         myEventsFeedSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@@ -85,9 +87,21 @@ public class MyEventsFragment extends BaseFragment {
     }
 
     private void updateOnRefresh() {
+        RetrofitInterface retrofitInterface = ((MainActivity) getActivity()).getRetrofitInterface();
+        retrofitInterface.getUserMe(((MainActivity)getActivity()).getSessionIDHeader()).enqueue(new Callback<User>() {
+            @Override
+            public void onResponse(Call<User> call, Response<User> response) {
+                if (response.isSuccessful()) {
+                    User user = response.body();
+                    List<Event> events = user.getUserGoingEvents();
+                    events.addAll(user.getUserInterestedEvents());
+                    displayEvents(events);
+                }
+            }
 
-        new showEvents().execute();
-
+            @Override
+            public void onFailure(Call<User> call, Throwable t) {}
+        });
     }
 
     private void displayEvents(final List<Event> events) {
@@ -126,16 +140,4 @@ public class MyEventsFragment extends BaseFragment {
 
         getActivity().findViewById(R.id.loadingPanel).setVisibility(View.GONE);
     }
-
-    private class showEvents extends AsyncTask<String, Void, List<Event>> {
-
-        @Override
-        protected List<Event> doInBackground(String... events) {
-            return appDatabase.dbDao().getFollowingEvents();
-        }
-
-        protected void onPostExecute(List<Event> result) {
-            displayEvents(result);
-        }
-    }
 }
\ No newline at end of file

app/src/main/java/app/insti/fragment/NewsFragment.java

@@ -30,8 +30,6 @@ import app.insti.R;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.NewsAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.ServiceGenerator;
-import app.insti.data.AppDatabase;
 import app.insti.data.NewsArticle;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -45,7 +43,6 @@ public class NewsFragment extends BaseFragment {
     public static boolean showLoader = true;
     private RecyclerView newsRecyclerView;
     private SwipeRefreshLayout newsSwipeRefreshLayout;
-    private AppDatabase appDatabase;
     private boolean freshNewsDisplayed = false;
     private String searchQuery;
 
@@ -70,9 +67,6 @@ public class NewsFragment extends BaseFragment {
 
         setHasOptionsMenu(true);
 
-        appDatabase = AppDatabase.getAppDatabase(getContext());
-        new NewsFragment.showNewsFromDB().execute();
-
         updateNews();
 
         newsSwipeRefreshLayout = getActivity().findViewById(R.id.news_swipe_refresh_layout);
@@ -93,8 +87,6 @@ public class NewsFragment extends BaseFragment {
                     List<NewsArticle> articles = response.body();
                     freshNewsDisplayed = true;
                     displayNews(articles);
-
-                    new updateDatabase().execute(articles);
                 }
                 //Server Error
                 newsSwipeRefreshLayout.setRefreshing(false);
@@ -213,26 +205,4 @@ public class NewsFragment extends BaseFragment {
         updateNews();
         showLoader = false;
     }
-
-    private class updateDatabase extends AsyncTask<List<NewsArticle>, Void, Integer> {
-        @Override
-        protected Integer doInBackground(List<NewsArticle>... posts) {
-            appDatabase.dbDao().deleteNewsArticles();
-            appDatabase.dbDao().insertNewsArticles(posts[0]);
-            return 1;
-        }
-    }
-
-    private class showNewsFromDB extends AsyncTask<String, Void, List<NewsArticle>> {
-        @Override
-        protected List<NewsArticle> doInBackground(String... posts) {
-            return appDatabase.dbDao().getAllNewsArticles();
-        }
-
-        protected void onPostExecute(List<NewsArticle> result) {
-            if (!freshNewsDisplayed) {
-                displayNews(result);
-            }
-        }
-    }
 }

app/src/main/java/app/insti/fragment/PlacementBlogFragment.java

@@ -30,8 +30,6 @@ import app.insti.R;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.PlacementBlogAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.ServiceGenerator;
-import app.insti.data.AppDatabase;
 import app.insti.data.PlacementBlogPost;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -46,7 +44,6 @@ public class PlacementBlogFragment extends BaseFragment {
     private RecyclerView placementFeedRecyclerView;
     private PlacementBlogAdapter placementBlogAdapter;
     private SwipeRefreshLayout feedSwipeRefreshLayout;
-    private AppDatabase appDatabase;
     private boolean freshBlogDisplayed = false;
     private String searchQuery;
 
@@ -72,9 +69,6 @@ public class PlacementBlogFragment extends BaseFragment {
 
         setHasOptionsMenu(true);
 
-        appDatabase = AppDatabase.getAppDatabase(getContext());
-        new PlacementBlogFragment.showPlacementBlogFromDB().execute();
-
         updatePlacementFeed();
 
         feedSwipeRefreshLayout = getActivity().findViewById(R.id.placement_feed_swipe_refresh_layout);
@@ -95,8 +89,6 @@ public class PlacementBlogFragment extends BaseFragment {
                     List<PlacementBlogPost> posts = response.body();
                     freshBlogDisplayed = true;
                     displayPlacementFeed(posts);
-
-                    new updateDatabase().execute(posts);
                 }
                 //Server Error
                 feedSwipeRefreshLayout.setRefreshing(false);
@@ -213,26 +205,4 @@ public class PlacementBlogFragment extends BaseFragment {
         updatePlacementFeed();
         showLoader = false;
     }
-
-    private class updateDatabase extends AsyncTask<List<PlacementBlogPost>, Void, Integer> {
-        @Override
-        protected Integer doInBackground(List<PlacementBlogPost>... posts) {
-            appDatabase.dbDao().deletePlacementBlogPosts();
-            appDatabase.dbDao().insertPlacementBlogPosts(posts[0]);
-            return 1;
-        }
-    }
-
-    private class showPlacementBlogFromDB extends AsyncTask<String, Void, List<PlacementBlogPost>> {
-        @Override
-        protected List<PlacementBlogPost> doInBackground(String... posts) {
-            return appDatabase.dbDao().getAllPlacementBlogPosts();
-        }
-
-        protected void onPostExecute(List<PlacementBlogPost> result) {
-            if (!freshBlogDisplayed) {
-                displayPlacementFeed(result);
-            }
-        }
-    }
 }

app/src/main/java/app/insti/fragment/TrainingBlogFragment.java

@@ -30,8 +30,6 @@ import app.insti.R;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.TrainingBlogAdapter;
 import app.insti.api.RetrofitInterface;
-import app.insti.api.ServiceGenerator;
-import app.insti.data.AppDatabase;
 import app.insti.data.TrainingBlogPost;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -45,7 +43,6 @@ public class TrainingBlogFragment extends BaseFragment {
     public static boolean showLoader = true;
     private RecyclerView trainingFeedRecyclerView;
     private SwipeRefreshLayout feedSwipeRefreshLayout;
-    private AppDatabase appDatabase;
     private boolean freshBlogDisplayed = false;
     private String searchQuery;
 
@@ -71,9 +68,6 @@ public class TrainingBlogFragment extends BaseFragment {
 
         setHasOptionsMenu(true);
 
-        appDatabase = AppDatabase.getAppDatabase(getContext());
-        new TrainingBlogFragment.showTrainingBlogFromDB().execute();
-
         updateTrainingFeed();
 
         feedSwipeRefreshLayout = getActivity().findViewById(R.id.training_feed_swipe_refresh_layout);
@@ -94,8 +88,6 @@ public class TrainingBlogFragment extends BaseFragment {
                     List<TrainingBlogPost> posts = response.body();
                     freshBlogDisplayed = true;
                     displayTrainingFeed(posts);
-
-                    new updateDatabase().execute(posts);
                 }
                 //Server Error
                 feedSwipeRefreshLayout.setRefreshing(false);
@@ -212,26 +204,4 @@ public class TrainingBlogFragment extends BaseFragment {
         updateTrainingFeed();
         showLoader = false;
     }
-
-    private class updateDatabase extends AsyncTask<List<TrainingBlogPost>, Void, Integer> {
-        @Override
-        protected Integer doInBackground(List<TrainingBlogPost>... posts) {
-            appDatabase.dbDao().deleteTrainingBlogPosts();
-            appDatabase.dbDao().insertTrainingBlogPosts(posts[0]);
-            return 1;
-        }
-    }
-
-    private class showTrainingBlogFromDB extends AsyncTask<String, Void, List<TrainingBlogPost>> {
-        @Override
-        protected List<TrainingBlogPost> doInBackground(String... posts) {
-            return appDatabase.dbDao().getAllTrainingBlogPosts();
-        }
-
-        protected void onPostExecute(List<TrainingBlogPost> result) {
-            if (!freshBlogDisplayed) {
-                displayTrainingFeed(result);
-            }
-        }
-    }
 }