Skip to content

Commit 34df09d

Browse files
rlazorlazo
authored
Documentation updates and simple code changes. (#1999)
1 parent 8f27059 commit 34df09d

File tree

3 files changed

+26
-91
lines changed

3 files changed

+26
-91
lines changed

‎firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/DynamicLink.java‎

Lines changed: 24 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public Builder setLongLink(@NonNull Uri longLink) {
114114
return this;
115115
}
116116

117-
/** @return the long Dynamic link set to this DynamicLink. */
117+
/** @return the long Dynamic link associated with this DynamicLink. */
118118
@NonNull
119119
public Uri getLongLink() {
120120
Uri longLink = fdlParameters.getParcelable(KEY_DYNAMIC_LINK);
@@ -138,7 +138,7 @@ public Builder setLink(@NonNull Uri link) {
138138
return this;
139139
}
140140

141-
/** @return the deep link set to this DynamicLink. */
141+
/** @return the deep link associated with this DynamicLink. */
142142
@NonNull
143143
public Uri getLink() {
144144
Uri link = fdlParameters.getParcelable(KEY_LINK);
@@ -191,11 +191,7 @@ public Builder setDomainUriPrefix(@NonNull String domainUriPrefix) {
191191
/** @return the deep link set to this DynamicLink. */
192192
@NonNull
193193
public String getDomainUriPrefix() {
194-
String domainUriPrefix = builderParameters.getString(KEY_DOMAIN_URI_PREFIX);
195-
if (domainUriPrefix == null) {
196-
domainUriPrefix = "";
197-
}
198-
return domainUriPrefix;
194+
return builderParameters.getString(KEY_DOMAIN_URI_PREFIX, "");
199195
}
200196

201197
/**
@@ -383,7 +379,7 @@ public AndroidParameters.Builder setFallbackUrl(@NonNull Uri fallbackUrl) {
383379
return this;
384380
}
385381

386-
/** @return the iPad parameters ID of the app. */
382+
/** @return the link to open on Android if the app isn't installed. */
387383
@NonNull
388384
public Uri getFallbackUrl() {
389385
Uri fallbackUrl = parameters.getParcelable(KEY_ANDROID_FALLBACK_LINK);
@@ -453,7 +449,7 @@ public static final class Builder {
453449
/**
454450
* Create iOS parameters builder.
455451
*
456-
* @param bundleId The parameters ID of the iOS app to use to open the link. The app must be
452+
* @param bundleId The bundle ID of the iOS app to use to open the link. The app must be
457453
* connected to your project from the Overview page of the Firebase console.
458454
*/
459455
public Builder(@NonNull String bundleId) {
@@ -475,8 +471,8 @@ public IosParameters.Builder setFallbackUrl(@NonNull Uri fallbackUrl) {
475471
}
476472

477473
/**
478-
* Sets the app's custom URL scheme, if defined to be something other than your app's
479-
* parameters ID.
474+
* Sets the app's custom URL scheme, if defined to be something other than your app's bundle
475+
* ID.
480476
*
481477
* @param customScheme The app's custom URL scheme.
482478
*/
@@ -489,11 +485,7 @@ public IosParameters.Builder setCustomScheme(@NonNull String customScheme) {
489485
/** @return the app's custom URL scheme. */
490486
@NonNull
491487
public String getCustomScheme() {
492-
String customScheme = parameters.getString(KEY_IOS_CUSTOM_SCHEME);
493-
if (customScheme == null) {
494-
customScheme = "";
495-
}
496-
return customScheme;
488+
return parameters.getString(KEY_IOS_CUSTOM_SCHEME, "");
497489
}
498490

499491
/**
@@ -521,25 +513,21 @@ public Uri getIpadFallbackUrl() {
521513
}
522514

523515
/**
524-
* Sets the parameters ID of the iOS app to use on iPads to open the link. The app must be
516+
* Sets the bundle ID of the iOS app to use on iPads to open the link. The app must be
525517
* connected to your project from the Overview page of the Firebase console.
526518
*
527-
* @param bundleId The iPad parameters ID of the app.
519+
* @param bundleId The iPad bundle ID of the app.
528520
*/
529521
@NonNull
530522
public IosParameters.Builder setIpadBundleId(@NonNull String bundleId) {
531523
parameters.putString(KEY_IPAD_BUNDLE_ID, bundleId);
532524
return this;
533525
}
534526

535-
/** @return the iPad parameters ID of the app. */
527+
/** @return the iPad bundle ID of the app. */
536528
@NonNull
537529
public String getIpadBundleId() {
538-
String bundleId = parameters.getString(KEY_IPAD_BUNDLE_ID);
539-
if (bundleId == null) {
540-
bundleId = "";
541-
}
542-
return bundleId;
530+
return parameters.getString(KEY_IPAD_BUNDLE_ID, "");
543531
}
544532

545533
/**
@@ -558,11 +546,7 @@ public IosParameters.Builder setAppStoreId(@NonNull String appStoreId) {
558546
*/
559547
@NonNull
560548
public String getAppStoreId() {
561-
String appStoreId = parameters.getString(KEY_IOS_APP_STORE_ID);
562-
if (appStoreId == null) {
563-
appStoreId = "";
564-
}
565-
return appStoreId;
549+
return parameters.getString(KEY_IOS_APP_STORE_ID, "");
566550
}
567551

568552
/**
@@ -579,11 +563,7 @@ public IosParameters.Builder setMinimumVersion(@NonNull String minimumVersion) {
579563
/** @return the minimum version of your app that can open the link. */
580564
@NonNull
581565
public String getMinimumVersion() {
582-
String minVersion = parameters.getString(KEY_IOS_MINIMUM_VERSION);
583-
if (minVersion == null) {
584-
minVersion = "";
585-
}
586-
return minVersion;
566+
return parameters.getString(KEY_IOS_MINIMUM_VERSION, "");
587567
}
588568

589569
/**
@@ -660,11 +640,7 @@ public GoogleAnalyticsParameters.Builder setSource(@NonNull String source) {
660640
/** @return the campaign source. */
661641
@NonNull
662642
public String getSource() {
663-
String source = parameters.getString(KEY_UTM_SOURCE);
664-
if (source == null) {
665-
source = "";
666-
}
667-
return source;
643+
return parameters.getString(KEY_UTM_SOURCE, "");
668644
}
669645

670646
/**
@@ -682,11 +658,7 @@ public GoogleAnalyticsParameters.Builder setMedium(@NonNull String medium) {
682658
/** @return the campaign medium. */
683659
@NonNull
684660
public String getMedium() {
685-
String medium = parameters.getString(KEY_UTM_MEDIUM);
686-
if (medium == null) {
687-
medium = "";
688-
}
689-
return medium;
661+
return parameters.getString(KEY_UTM_MEDIUM, "");
690662
}
691663

692664
/**
@@ -704,11 +676,7 @@ public GoogleAnalyticsParameters.Builder setCampaign(@NonNull String campaign) {
704676
/** @return the campaign name. */
705677
@NonNull
706678
public String getCampaign() {
707-
String campaign = parameters.getString(KEY_UTM_CAMPAIGN);
708-
if (campaign == null) {
709-
campaign = "";
710-
}
711-
return campaign;
679+
return parameters.getString(KEY_UTM_CAMPAIGN, "");
712680
}
713681

714682
/**
@@ -725,11 +693,7 @@ public GoogleAnalyticsParameters.Builder setTerm(@NonNull String term) {
725693
/** @return the campaign term. */
726694
@NonNull
727695
public String getTerm() {
728-
String term = parameters.getString(KEY_UTM_TERM);
729-
if (term == null) {
730-
term = "";
731-
}
732-
return term;
696+
return parameters.getString(KEY_UTM_TERM, "");
733697
}
734698

735699
/**
@@ -747,11 +711,7 @@ public GoogleAnalyticsParameters.Builder setContent(@NonNull String content) {
747711
/** @return the campaign content. */
748712
@NonNull
749713
public String getContent() {
750-
String content = parameters.getString(KEY_UTM_CONTENT);
751-
if (content == null) {
752-
content = "";
753-
}
754-
return content;
714+
return parameters.getString(KEY_UTM_CONTENT, "");
755715
}
756716

757717
/**
@@ -808,11 +768,7 @@ public ItunesConnectAnalyticsParameters.Builder setProviderToken(
808768
/** @return the provider token. */
809769
@NonNull
810770
public String getProviderToken() {
811-
String providerToken = parameters.getString(KEY_ITUNES_CONNECT_PT);
812-
if (providerToken == null) {
813-
providerToken = "";
814-
}
815-
return providerToken;
771+
return parameters.getString(KEY_ITUNES_CONNECT_PT, "");
816772
}
817773

818774
/**
@@ -830,11 +786,7 @@ public ItunesConnectAnalyticsParameters.Builder setAffiliateToken(
830786
/** @return the affiliate token. */
831787
@NonNull
832788
public String getAffiliateToken() {
833-
String affiliateToken = parameters.getString(KEY_ITUNES_CONNECT_AT);
834-
if (affiliateToken == null) {
835-
affiliateToken = "";
836-
}
837-
return affiliateToken;
789+
return parameters.getString(KEY_ITUNES_CONNECT_AT, "");
838790
}
839791

840792
/**
@@ -853,11 +805,7 @@ public ItunesConnectAnalyticsParameters.Builder setCampaignToken(
853805
/** @return the campaign token. */
854806
@NonNull
855807
public String getCampaignToken() {
856-
String campaignToken = parameters.getString(KEY_ITUNES_CONNECT_CT);
857-
if (campaignToken == null) {
858-
campaignToken = "";
859-
}
860-
return campaignToken;
808+
return parameters.getString(KEY_ITUNES_CONNECT_CT, "");
861809
}
862810

863811
/**
@@ -912,11 +860,7 @@ public SocialMetaTagParameters.Builder setTitle(@NonNull String title) {
912860
/** @return the meta-tag title. */
913861
@NonNull
914862
public String getTitle() {
915-
String title = parameters.getString(KEY_SOCIAL_TITLE);
916-
if (title == null) {
917-
title = "";
918-
}
919-
return title;
863+
return parameters.getString(KEY_SOCIAL_TITLE, "");
920864
}
921865

922866
/**
@@ -933,11 +877,7 @@ public SocialMetaTagParameters.Builder setDescription(@NonNull String descriptio
933877
/** @return the meta-tag description. */
934878
@NonNull
935879
public String getDescription() {
936-
String description = parameters.getString(KEY_SOCIAL_DESCRIPTION);
937-
if (description == null) {
938-
description = "";
939-
}
940-
return description;
880+
return parameters.getString(KEY_SOCIAL_DESCRIPTION, "");
941881
}
942882

943883
/**

‎firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/FirebaseDynamicLinkRegistrar.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.firebase.components.ComponentRegistrar;
2222
import com.google.firebase.components.Dependency;
2323
import com.google.firebase.dynamiclinks.FirebaseDynamicLinks;
24-
import java.util.Collections;
24+
import java.util.Arrays;
2525
import java.util.List;
2626

2727
/**
@@ -47,6 +47,6 @@ public List<Component<?>> getComponents() {
4747
container.get(FirebaseApp.class), container.get(AnalyticsConnector.class)))
4848
.build(); // no need for eager init for the Internal component.
4949

50-
return Collections.singletonList(firebaseDynamicLinks);
50+
return Arrays.asList(firebaseDynamicLinks);
5151
}
5252
}

‎firebase-dynamic-links/src/main/java/com/google/firebase/dynamiclinks/internal/ShortDynamicLinkImpl.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,5 @@ public String getMessage() {
9797
public void writeToParcel(Parcel dest, int flags) {
9898
WarningImplCreator.writeToParcel(this, dest, flags);
9999
}
100-
101-
@Override
102-
public String toString() {
103-
return message;
104-
}
105100
}
106101
}

0 commit comments

Comments
 (0)