Merge remote-tracking branch 'upstream/master'

update from wncc repo

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

+package in.ac.iitb.gymkhana.iitbapp;
+
+import in.ac.iitb.gymkhana.iitbapp.data.Event;
+
+/**
+ * Created by varun on 03-Apr-18.
+ */
+
+public final class ShareURLMaker {
+    public static final String WEB_HOST = "https://insti.app/";
+
+    public static final String getEventURL(Event event) {
+        return WEB_HOST + "event/" + event.getEventStrID();
+    }
+}

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java

@@ -18,6 +18,9 @@ public class Event {
     @ColumnInfo(name = "id")
     @SerializedName("id")
     String eventID;
+    @ColumnInfo(name = "str_id")
+    @SerializedName("str_id")
+    String eventStrID;
     @ColumnInfo(name = "name")
     @SerializedName("name")
     String eventName;
@@ -79,6 +82,14 @@ public class Event {
         this.eventID = eventID;
     }
 
+    public String getEventStrID() {
+        return eventStrID;
+    }
+
+    public void setEventStrID(String eventStrID) {
+        this.eventStrID = eventStrID;
+    }
+
     public String getEventName() {
         return eventName;
     }

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

@@ -23,6 +23,7 @@ import java.util.Date;
 
 import in.ac.iitb.gymkhana.iitbapp.Constants;
 import in.ac.iitb.gymkhana.iitbapp.R;
+import in.ac.iitb.gymkhana.iitbapp.ShareURLMaker;
 import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
 import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
 import in.ac.iitb.gymkhana.iitbapp.data.Event;
@@ -98,7 +99,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
         interestedButton.setOnClickListener(this);
         notGoingButton.setOnClickListener(this);
         shareEventButton.setOnClickListener(new View.OnClickListener() {
-            String shareUrl = "https://instiapp.wncc-iitb.org/event-details/" + event.getEventID();
+            String shareUrl = ShareURLMaker.getEventURL(event);
             @Override
             public void onClick(View view) {
                 Intent i = new Intent(Intent.ACTION_SEND);