Merge branch 'master' of https://github.com/unstablebrainiac/IITB-App

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java

@@ -65,6 +65,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        try { initPicasso(); } catch (IllegalStateException ignored) {}
         setContentView(R.layout.activity_main);
         session = new SessionManager(getApplicationContext());
         session.checkLogin();
@@ -121,15 +122,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         nameTextView.setText(currentUser.getUserName());
         rollNoTextView.setText(currentUser.getUserRollNumber());
 
-        Picasso.Builder picassoBuilder = new Picasso.Builder(this);
-        picassoBuilder.downloader(
-            new OkHttp3Downloader((
-                UnsafeOkHttpClient.getUnsafeOkHttpClient()
-            )
-        ));
-        Picasso picasso = picassoBuilder.build();
-
-        picasso.load(currentUser.getUserProfilePictureUrl()).into(profilePictureImageView);
+        Picasso.with(this).load(currentUser.getUserProfilePictureUrl()).into(profilePictureImageView);
     }
 
 //    private void fetchNotifications() {
@@ -327,6 +320,18 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         return "sessionid=" + session.getSessionID();
     }
 
+    public void initPicasso() {
+        Picasso.Builder builder = new Picasso.Builder(getApplicationContext());
+        builder.downloader(new OkHttp3Downloader((
+                UnsafeOkHttpClient.getUnsafeOkHttpClient(getApplicationContext())
+        )));
+        Picasso built = builder.build();
+        // TODO Set these to false before launch
+        built.setIndicatorsEnabled(true);
+        built.setLoggingEnabled(true);
+        Picasso.setSingletonInstance(built);
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/FeedAdapter.java

@@ -68,7 +68,7 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
         if (!eventVenueName.toString().equals(""))
             viewHolder.eventVenue.setText(eventVenueName.toString().substring(2));
 
-        Picasso.with(context).load(currentEvent.getEventImageURL()).resize(320, 0).into(viewHolder.eventPicture);
+        Picasso.with(context).load(currentEvent.getEventImageURL()).into(viewHolder.eventPicture);
     }
 
     @Override

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/UnsafeOkHttpClient.java

 package in.ac.iitb.gymkhana.iitbapp.api;
 
+import android.content.Context;
+
 import java.security.cert.CertificateException;
 
 import javax.net.ssl.HostnameVerifier;
@@ -9,10 +11,11 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import okhttp3.Cache;
 import okhttp3.OkHttpClient;
 
 public class UnsafeOkHttpClient {
-    public static OkHttpClient getUnsafeOkHttpClient() {
+    public static OkHttpClient getUnsafeOkHttpClient(Context context) {
         try {
             // Create a trust manager that does not validate certificate chains
             final TrustManager[] trustAllCerts = new TrustManager[] {
@@ -40,6 +43,8 @@ public class UnsafeOkHttpClient {
             final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
 
             OkHttpClient.Builder builder = new OkHttpClient.Builder();
+            Cache cache = new Cache(context.getCacheDir(), 200000000);
+            builder.cache(cache);
             builder.sslSocketFactory(sslSocketFactory, (X509TrustManager)trustAllCerts[0]);
             builder.hostnameVerifier(new HostnameVerifier() {
                 @Override

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyFragment.java

@@ -98,7 +98,7 @@ public class BodyFragment extends Fragment {
 
         /* Initialize */
         appDatabase = AppDatabase.getAppDatabase(getContext());
-
+        displayBody(min_body);
         new getDbBody().execute(min_body.getBodyID());
         bodySwipeRefreshLayout=getActivity().findViewById(R.id.body_swipe_refresh_layout);
         bodySwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@@ -142,9 +142,15 @@ public class BodyFragment extends Fragment {
 
         /* Set body information */
         bodyName.setText(body.getBodyName());
-        Markwon.setMarkdown(bodyDescription, body.getBodyDescription());
         Picasso.with(getContext()).load(body.getBodyImageURL()).into(eventPicture);
 
+        /* Return if it's a min body */
+        if (body.getBodyDescription() == null) {
+            return;
+        }
+
+        Markwon.setMarkdown(bodyDescription, body.getBodyDescription());
+
         /* Check if user is already following
          * Initialize follow button */
         followButton.setBackgroundColor(getResources().getColor(body.getBodyUserFollows() ? R.color.colorAccent : R.color.colorWhite));

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/ProfileFragment.java

@@ -14,7 +14,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.jakewharton.picasso.OkHttp3Downloader;
 import com.squareup.picasso.Picasso;
 
 import java.util.List;
@@ -26,7 +25,6 @@ import in.ac.iitb.gymkhana.iitbapp.adapter.RoleAdapter;
 import in.ac.iitb.gymkhana.iitbapp.adapter.TabAdapter;
 import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
 import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
-import in.ac.iitb.gymkhana.iitbapp.api.UnsafeOkHttpClient;
 import in.ac.iitb.gymkhana.iitbapp.data.Body;
 import in.ac.iitb.gymkhana.iitbapp.data.Event;
 import in.ac.iitb.gymkhana.iitbapp.data.Role;
@@ -101,16 +99,7 @@ public class ProfileFragment extends BaseFragment {
         userRoleRecyclerView.setAdapter(roleAdapter);
         userRoleRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-
-        Picasso.Builder picassoBuilder = new Picasso.Builder(getContext());
-        picassoBuilder.downloader(
-                new OkHttp3Downloader((
-                        UnsafeOkHttpClient.getUnsafeOkHttpClient()
-                )
-                ));
-        Picasso picasso = picassoBuilder.build();
-
-        picasso.load(user.getUserProfilePictureUrl()).into(userProfilePictureImageView);
+        Picasso.with(getContext()).load(user.getUserProfilePictureUrl()).into(userProfilePictureImageView);
 
         final List<Body> bodyList = user.getUserFollowedBodies();
         final List<Event> eventList = user.getUserGoingEvents();