Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shorten Firebase Dynamic Links #719

Closed
wants to merge 5 commits into from
Closed

Shorten Firebase Dynamic Links #719

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57795ea
Shorten share URLs
unstablebrainiac May 26, 2017
7e608d2
Add SHORT param
unstablebrainiac May 26, 2017
a5276fb
Align code with project conventions
unstablebrainiac May 29, 2017
5137f04
Make style changes to align with repository conventions
unstablebrainiac Nov 24, 2018
68ef1b4
Fix indentation issues
unstablebrainiac Nov 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions app/src/main/java/org/gdg/frisbee/android/api/FirebaseDynamicLinks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package org.gdg.frisbee.android.api;

import org.gdg.frisbee.android.api.model.FirebaseDynamicLinksRequest;
import org.gdg.frisbee.android.api.model.FirebaseDynamicLinksResponse;

import okhttp3.RequestBody;
import retrofit2.Call;
import retrofit2.http.Body;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.POST;
import retrofit2.http.Query;

public interface FirebaseDynamicLinks {

@POST("/v1/shortLinks")
Call<FirebaseDynamicLinksResponse> shortenUrl(@Query("key") String apiKey, @Body FirebaseDynamicLinksRequest firebaseDynamicLinksRequest);
}
30 changes: 30 additions & 0 deletions app/src/main/java/org/gdg/frisbee/android/api/FirebaseDynamicLinksFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package org.gdg.frisbee.android.api;

import com.google.gson.FieldNamingPolicy;

import org.gdg.frisbee.android.utils.Utils;

import okhttp3.OkHttpClient;
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;

public final class FirebaseDynamicLinksFactory {
private static final String BASE_URL = "https://firebasedynamiclinks.googleapis.com";

private FirebaseDynamicLinksFactory() {
}

private static Retrofit provideRestAdapter(OkHttpClient okHttpClient) {
return new Retrofit.Builder()
.baseUrl(BASE_URL)
.client(okHttpClient)
.addConverterFactory(
GsonConverterFactory.create(Utils.getGson(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES))
)
.build();
}

public static FirebaseDynamicLinks provideFirebaseDynamicLinksApi(OkHttpClient okHttpClient) {
return provideRestAdapter(okHttpClient).create(FirebaseDynamicLinks.class);
}
}
11 changes: 11 additions & 0 deletions app/src/main/java/org/gdg/frisbee/android/api/model/FirebaseDynamicLinksRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package org.gdg.frisbee.android.api.model;

public class FirebaseDynamicLinksRequest {
private String longDynamicLink;
private Suffix suffix;

public FirebaseDynamicLinksRequest(String longDynamicLink, Suffix suffix) {
this.longDynamicLink = longDynamicLink;
this.suffix = suffix;
}
}
19 changes: 19 additions & 0 deletions app/src/main/java/org/gdg/frisbee/android/api/model/FirebaseDynamicLinksResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package org.gdg.frisbee.android.api.model;

public class FirebaseDynamicLinksResponse {
private final String shortLink;
private final String previewLink;

public FirebaseDynamicLinksResponse(String shortLink, String previewLink) {
this.shortLink = shortLink;
this.previewLink = previewLink;
}

public String getShortLink() {
return shortLink;
}

public String getPreviewLink() {
return previewLink;
}
}
5 changes: 5 additions & 0 deletions app/src/main/java/org/gdg/frisbee/android/api/model/Suffix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.gdg.frisbee.android.api.model;

public class Suffix {
private final String option = "SHORT";
}
10 changes: 10 additions & 0 deletions app/src/main/java/org/gdg/frisbee/android/app/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@

import org.gdg.frisbee.android.BuildConfig;
import org.gdg.frisbee.android.R;
import org.gdg.frisbee.android.api.FirebaseDynamicLinks;
import org.gdg.frisbee.android.api.FirebaseDynamicLinksFactory;
import org.gdg.frisbee.android.api.GdeDirectory;
import org.gdg.frisbee.android.api.GdeDirectoryFactory;
import org.gdg.frisbee.android.api.GdgXHub;
Expand Down Expand Up @@ -78,6 +80,7 @@ public class App extends BaseApp implements LocationListener {
private OrganizerChecker mOrganizerChecker;
private List<TaggedEventSeries> mTaggedEventSeriesList;
private RefWatcher refWatcher;
private FirebaseDynamicLinks firebaseDynamicLinks;

public static App from(Context context) {
return (App) context.getApplicationContext();
Expand Down Expand Up @@ -296,6 +299,13 @@ public PlusApi getPlusApi() {
return plusApi;
}

public FirebaseDynamicLinks getFirebaseDynamicLinks() {
if (firebaseDynamicLinks == null) {
firebaseDynamicLinks = FirebaseDynamicLinksFactory.provideFirebaseDynamicLinksApi(okHttpClient);
}
return firebaseDynamicLinks;
}

public RefWatcher getRefWatcher() {
return refWatcher;
}
Expand Down
69 changes: 57 additions & 12 deletions app/src/main/java/org/gdg/frisbee/android/onboarding/AppInviteLinkGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
package org.gdg.frisbee.android.onboarding;

import android.app.ProgressDialog;
import android.support.v4.app.ShareCompat;

import org.gdg.frisbee.android.BuildConfig;
import org.gdg.frisbee.android.R;
import org.gdg.frisbee.android.api.Callback;
import org.gdg.frisbee.android.api.FirebaseDynamicLinks;
import org.gdg.frisbee.android.api.model.FirebaseDynamicLinksRequest;
import org.gdg.frisbee.android.api.model.FirebaseDynamicLinksResponse;
import org.gdg.frisbee.android.api.model.Suffix;
import org.gdg.frisbee.android.app.App;
import org.gdg.frisbee.android.common.GdgActivity;
import org.gdg.frisbee.android.utils.PlusUtils;

Expand All @@ -16,31 +23,36 @@ public class AppInviteLinkGenerator {

private final String dynamicLinkDomain;
private final String deepLinkBaseUrl;
private GdgActivity activity;
private ProgressDialog shareProgressDialog;

static String extractSender(HttpUrl httpUrl) {
return httpUrl.queryParameter(SENDER);
}

public static AppInviteLinkGenerator create() {
return new AppInviteLinkGenerator("https://fmec6.app.goo.gl/", "https://gdg.events/");
public static AppInviteLinkGenerator create(GdgActivity activity) {
return new AppInviteLinkGenerator("https://fmec6.app.goo.gl/", "https://gdg.events/", activity);
}

private AppInviteLinkGenerator(String dynamicLinkDomain, String deepLinkBaseUrl) {
private AppInviteLinkGenerator(String dynamicLinkDomain, String deepLinkBaseUrl, GdgActivity activity) {
this.dynamicLinkDomain = dynamicLinkDomain;
this.deepLinkBaseUrl = deepLinkBaseUrl;
this.activity = activity;
}

public static void shareAppInviteLink(GdgActivity activity) {
AppInviteLinkGenerator linkGenerator = create();
AppInviteLinkGenerator linkGenerator = create(activity);
String gplusId = PlusUtils.getCurrentPlusId(activity);
HttpUrl appInviteLink = gplusId != null
? linkGenerator.createAppInviteLink(gplusId)
: NON_SIGNED_IN_INVITE_URL;
ShareCompat.IntentBuilder.from(activity)
.setChooserTitle(R.string.invite_friends)
.setText(activity.getString(R.string.invitation_message, appInviteLink))
.setType("text/plain")
.startChooser();
HttpUrl appInviteLink;
if (gplusId != null) {
appInviteLink = linkGenerator.createAppInviteLink(gplusId);
linkGenerator.shareShortAppInviteLink(appInviteLink.toString());
linkGenerator.showProgressDialog(activity);
} else {
appInviteLink = NON_SIGNED_IN_INVITE_URL;
linkGenerator.createChooser(appInviteLink);
}


activity.sendAnalyticsEvent("AppInvite", "Shared",
gplusId != null ? "Signed In" : "Non Signed In");
Expand All @@ -63,4 +75,37 @@ private String createDeepLink(String gplusId) {
.toString();
}

private void shareShortAppInviteLink(String longUrl) {
FirebaseDynamicLinks firebaseDynamicLinks = App.from(activity).getFirebaseDynamicLinks();
FirebaseDynamicLinksRequest firebaseDynamicLinksRequest = new FirebaseDynamicLinksRequest(longUrl, new Suffix());
firebaseDynamicLinks.shortenUrl(BuildConfig.IP_SIMPLE_API_ACCESS_KEY, firebaseDynamicLinksRequest).enqueue(new Callback<FirebaseDynamicLinksResponse>() {
@Override
public void onSuccess(FirebaseDynamicLinksResponse response) {
createChooser(HttpUrl.parse(response.getShortLink()));
shareProgressDialog.dismiss();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's try to decouple the UI concerns and the actual link shortening.

Now the link creation is asynchronous. Ideally we should have a Listener with a possible method onDynamicLinkReady(String url). Listener's method would be called with the shortened link when it is successful.

Then the place where we implement this Listener can handle progress show/dismiss.

What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved all the other errors but did not understand this very well.

Isn't the Retrofit callback the method that you're talking about? Do you want me to create a separate method and call it from within onSuccess(FirebaseDynamicLinksResponse response)? If yes, how do you propose to show the ProgressDialog before making the request?

Also, is there anything similar in the codebase that'll probably give me a better idea?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately not. The app doesn't follow any architecture and async handling codes are really old. We didn't have the chance to refactor yet.

Would you be up to pair on this? We can connect via ScreenHero and do it together.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure thing. But Screenhero is not accepting new signups right now so you'll have to send me an invite. My email ID is [email protected] and I am UnstableBrainiac on Slack.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey! Sorry for the delayed response. I've been trying to get Screenhero to work on my system but couldn't. I even re-installed Windows to get it working, but in vain.

I can still contribute though. Let me know what you need me to do.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't have time to check the latest version of the PR. Sorry.
Let's schedule some time and talk about it. Can also be a chat or Hangouts video call.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will review once more and get back to you.

}

@Override
public void onError() {
createChooser(NON_SIGNED_IN_INVITE_URL);
shareProgressDialog.dismiss();
}
});
}

private void showProgressDialog(GdgActivity activity) {
shareProgressDialog = new ProgressDialog(activity);
shareProgressDialog.setIndeterminate(true);
shareProgressDialog.setCancelable(true);
shareProgressDialog.setMessage(activity.getString(R.string.generating_url));
shareProgressDialog.show();
}

private void createChooser(HttpUrl appInviteLink) {
ShareCompat.IntentBuilder.from(activity)
.setChooserTitle(R.string.invite_friends)
.setText(activity.getString(R.string.invitation_message, appInviteLink))
.setType("text/plain")
.startChooser();
}
}
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,5 @@
<string name="invite_congrats">Yey! You\'re invited by\n%s</string>
<string name="friend">a friend</string>
<string name="login_register">Login/Register</string>
<string name="generating_url">Generating URL</string>
</resources>