mirror of
https://github.com/ethauvin/android-about-box.git
synced 2025-04-25 02:37:11 -07:00
added null checks to protect lib from crashes
This commit is contained in:
parent
93ae9c499e
commit
11f7abc55f
1 changed files with 144 additions and 136 deletions
|
@ -34,13 +34,13 @@ public class AboutActivity extends MaterialAboutActivity {
|
||||||
final AboutConfig config = AboutConfig.getInstance();
|
final AboutConfig config = AboutConfig.getInstance();
|
||||||
|
|
||||||
return new MaterialAboutList.Builder()
|
return new MaterialAboutList.Builder()
|
||||||
.addCard(buildGeneralInfoCard(config))
|
.addCard(buildGeneralInfoCard(config))
|
||||||
.addCard(buildSupportCard(config))
|
.addCard(buildSupportCard(config))
|
||||||
.addCard(buildShareCard(config))
|
.addCard(buildShareCard(config))
|
||||||
.addCard(buildAboutCard(config))
|
.addCard(buildAboutCard(config))
|
||||||
.addCard(buildSocialNetworksCard(config))
|
.addCard(buildSocialNetworksCard(config))
|
||||||
.addCard(buildPrivacyCard(config))
|
.addCard(buildPrivacyCard(config))
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
|
@ -65,27 +65,27 @@ public class AboutActivity extends MaterialAboutActivity {
|
||||||
|
|
||||||
if (!TextUtils.isEmpty(config.guideHtmlPath)) {
|
if (!TextUtils.isEmpty(config.guideHtmlPath)) {
|
||||||
card.addItem(itemHelper(R.string.egab_guide, R.drawable.ic_help_green,
|
card.addItem(itemHelper(R.string.egab_guide, R.drawable.ic_help_green,
|
||||||
new MaterialAboutItemOnClickListener() {
|
new MaterialAboutItemOnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(boolean b) {
|
public void onClick(boolean b) {
|
||||||
if (config.dialog == null) {
|
if (config.dialog == null) {
|
||||||
openHTMLPage(config.guideHtmlPath);
|
openHTMLPage(config.guideHtmlPath);
|
||||||
} else {
|
} else {
|
||||||
config.dialog.open(AboutActivity.this, config.guideHtmlPath, getString(R.string.egab_guide));
|
config.dialog.open(AboutActivity.this, config.guideHtmlPath, getString(R.string.egab_guide));
|
||||||
|
}
|
||||||
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_guide));
|
||||||
}
|
}
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_guide));
|
})
|
||||||
}
|
|
||||||
})
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
card.addItem(itemHelper(R.string.egab_contact_support, R.drawable.ic_email_black,
|
card.addItem(itemHelper(R.string.egab_contact_support, R.drawable.ic_email_black,
|
||||||
new MaterialAboutItemOnClickListener() {
|
new MaterialAboutItemOnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(boolean b) {
|
public void onClick(boolean b) {
|
||||||
EmailUtil.contactUs(AboutActivity.this);
|
EmailUtil.contactUs(AboutActivity.this);
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_contact_log_event));
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_contact_log_event));
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
return card.build();
|
return card.build();
|
||||||
}
|
}
|
||||||
|
@ -93,24 +93,24 @@ public class AboutActivity extends MaterialAboutActivity {
|
||||||
@NonNull
|
@NonNull
|
||||||
private MaterialAboutCard buildShareCard(final AboutConfig config) {
|
private MaterialAboutCard buildShareCard(final AboutConfig config) {
|
||||||
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
|
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
|
||||||
|
if (config.buildType != null && !TextUtils.isEmpty(config.packageName)) {
|
||||||
card.addItem(itemHelper(R.string.egab_leave_review, R.drawable.ic_review,
|
card.addItem(itemHelper(R.string.egab_leave_review, R.drawable.ic_review,
|
||||||
new MaterialAboutItemOnClickListener() {
|
new MaterialAboutItemOnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(boolean b) {
|
public void onClick(boolean b) {
|
||||||
openApp(config.buildType, config.packageName);
|
openApp(config.buildType, config.packageName);
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_review_log_event));
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_review_log_event));
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
}
|
||||||
card.addItem(itemHelper(R.string.egab_share, R.drawable.ic_share_black,
|
card.addItem(itemHelper(R.string.egab_share, R.drawable.ic_share_black,
|
||||||
new MaterialAboutItemOnClickListener() {
|
new MaterialAboutItemOnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(boolean b) {
|
public void onClick(boolean b) {
|
||||||
ShareUtil.share(AboutActivity.this);
|
ShareUtil.share(AboutActivity.this);
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_share_log_event));
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_share_log_event));
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
return card.build();
|
return card.build();
|
||||||
}
|
}
|
||||||
|
@ -118,119 +118,127 @@ public class AboutActivity extends MaterialAboutActivity {
|
||||||
@NonNull
|
@NonNull
|
||||||
private MaterialAboutCard buildAboutCard(final AboutConfig config) {
|
private MaterialAboutCard buildAboutCard(final AboutConfig config) {
|
||||||
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
|
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
|
||||||
|
if (config.buildType != null && !TextUtils.isEmpty(config.appPublisher) && !TextUtils.isEmpty(config.packageName)) {
|
||||||
card.addItem(itemHelper(R.string.egab_try_other_apps, R.drawable.ic_try_other_apps,
|
card.addItem(itemHelper(R.string.egab_try_other_apps, R.drawable.ic_try_other_apps,
|
||||||
new MaterialAboutItemOnClickListener() {
|
new MaterialAboutItemOnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(boolean b) {
|
public void onClick(boolean b) {
|
||||||
openPublisher(config.buildType, config.appPublisher, config.packageName);
|
openPublisher(config.buildType, config.appPublisher, config.packageName);
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_try_other_app_log_event));
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_try_other_app_log_event));
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
card.addItem(new MaterialAboutActionItem.Builder()
|
}
|
||||||
.text(config.aboutLabelTitle)
|
if (!TextUtils.isEmpty(config.companyHtmlPath)) {
|
||||||
.icon(R.drawable.ic_about_black)
|
card.addItem(new MaterialAboutActionItem.Builder()
|
||||||
.setOnClickListener(new MaterialAboutItemOnClickListener() {
|
.text(config.aboutLabelTitle)
|
||||||
@Override
|
.icon(R.drawable.ic_about_black)
|
||||||
public void onClick(boolean b) {
|
.setOnClickListener(new MaterialAboutItemOnClickListener() {
|
||||||
if (config.dialog == null) {
|
@Override
|
||||||
openHTMLPage(config.companyHtmlPath);
|
public void onClick(boolean b) {
|
||||||
} else {
|
if (config.dialog == null) {
|
||||||
config.dialog.open(AboutActivity.this, config.companyHtmlPath, config.aboutLabelTitle);
|
openHTMLPage(config.companyHtmlPath);
|
||||||
}
|
} else {
|
||||||
logUIEventName(config.analytics, config.logUiEventName, config.aboutLabelTitle);
|
config.dialog.open(AboutActivity.this, config.companyHtmlPath, config.aboutLabelTitle);
|
||||||
}
|
}
|
||||||
})
|
logUIEventName(config.analytics, config.logUiEventName, config.aboutLabelTitle);
|
||||||
.build());
|
}
|
||||||
|
})
|
||||||
|
.build());
|
||||||
|
}
|
||||||
return card.build();
|
return card.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
private MaterialAboutCard buildSocialNetworksCard(final AboutConfig config) {
|
private MaterialAboutCard buildSocialNetworksCard(final AboutConfig config) {
|
||||||
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
|
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
|
||||||
|
if (!TextUtils.isEmpty(config.facebookUserName)) {
|
||||||
card.addItem(new MaterialAboutActionItem.Builder()
|
card.addItem(new MaterialAboutActionItem.Builder()
|
||||||
.text(R.string.egab_facebook_label)
|
.text(R.string.egab_facebook_label)
|
||||||
.subText(config.facebookUserName)
|
.subText(config.facebookUserName)
|
||||||
.icon(R.drawable.ic_facebook_24)
|
.icon(R.drawable.ic_facebook_24)
|
||||||
.setOnClickListener(new MaterialAboutItemOnClickListener() {
|
.setOnClickListener(new MaterialAboutItemOnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(boolean b) {
|
public void onClick(boolean b) {
|
||||||
getOpenFacebookIntent(AboutActivity.this, config.facebookUserName);
|
getOpenFacebookIntent(AboutActivity.this, config.facebookUserName);
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_facebook_log_event));
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_facebook_log_event));
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.build());
|
.build());
|
||||||
card.addItem(new MaterialAboutActionItem.Builder()
|
}
|
||||||
.text(R.string.egab_twitter_label)
|
if (!TextUtils.isEmpty(config.twitterUserName)) {
|
||||||
.subText(config.twitterUserName)
|
card.addItem(new MaterialAboutActionItem.Builder()
|
||||||
.icon(R.drawable.ic_twitter_24dp)
|
.text(R.string.egab_twitter_label)
|
||||||
.setOnClickListener(new MaterialAboutItemOnClickListener() {
|
.subText(config.twitterUserName)
|
||||||
@Override
|
.icon(R.drawable.ic_twitter_24dp)
|
||||||
public void onClick(boolean b) {
|
.setOnClickListener(new MaterialAboutItemOnClickListener() {
|
||||||
startTwitter(AboutActivity.this, config.twitterUserName);
|
@Override
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_twitter_log_event));
|
public void onClick(boolean b) {
|
||||||
}
|
startTwitter(AboutActivity.this, config.twitterUserName);
|
||||||
})
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_twitter_log_event));
|
||||||
.build());
|
}
|
||||||
|
})
|
||||||
card.addItem(new MaterialAboutActionItem.Builder()
|
.build());
|
||||||
.text(R.string.egab_web_label)
|
}
|
||||||
.subText(config.webHomePage.replace("https://", "").replace("http://", "").replace("/", ""))
|
if (!TextUtils.isEmpty(config.webHomePage)) {
|
||||||
.icon(R.drawable.ic_web_black_24dp)
|
card.addItem(new MaterialAboutActionItem.Builder()
|
||||||
.setOnClickListener(new MaterialAboutItemOnClickListener() {
|
.text(R.string.egab_web_label)
|
||||||
@Override
|
.subText(config.webHomePage.replace("https://", "").replace("http://", "").replace("/", ""))
|
||||||
public void onClick(boolean b) {
|
.icon(R.drawable.ic_web_black_24dp)
|
||||||
openHTMLPage(config.webHomePage);
|
.setOnClickListener(new MaterialAboutItemOnClickListener() {
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_website_log_event));
|
@Override
|
||||||
}
|
public void onClick(boolean b) {
|
||||||
})
|
openHTMLPage(config.webHomePage);
|
||||||
.build());
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_website_log_event));
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.build());
|
||||||
|
}
|
||||||
return card.build();
|
return card.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
private MaterialAboutCard buildPrivacyCard(final AboutConfig config) {
|
private MaterialAboutCard buildPrivacyCard(final AboutConfig config) {
|
||||||
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
|
MaterialAboutCard.Builder card = new MaterialAboutCard.Builder();
|
||||||
|
if (!TextUtils.isEmpty(config.privacyHtmlPath)) {
|
||||||
|
card.addItem(itemHelper(R.string.egab_privacy_policy, R.drawable.ic_privacy,
|
||||||
|
new MaterialAboutItemOnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(boolean b) {
|
||||||
|
if (config.dialog == null) {
|
||||||
|
openHTMLPage(config.privacyHtmlPath);
|
||||||
|
} else {
|
||||||
|
config.dialog.open(AboutActivity.this, config.privacyHtmlPath, getString(R.string.egab_privacy_policy));
|
||||||
|
}
|
||||||
|
|
||||||
card.addItem(itemHelper(R.string.egab_privacy_policy, R.drawable.ic_privacy,
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_privacy_log_event));
|
||||||
new MaterialAboutItemOnClickListener() {
|
}
|
||||||
@Override
|
})
|
||||||
public void onClick(boolean b) {
|
);
|
||||||
if (config.dialog == null) {
|
}
|
||||||
openHTMLPage(config.privacyHtmlPath);
|
if (!TextUtils.isEmpty(config.acknowledgmentHtmlPath)) {
|
||||||
} else {
|
card.addItem(itemHelper(R.string.egab_acknowledgements, R.drawable.ic_acknowledgements,
|
||||||
config.dialog.open(AboutActivity.this, config.privacyHtmlPath, getString(R.string.egab_privacy_policy));
|
new MaterialAboutItemOnClickListener() {
|
||||||
}
|
@Override
|
||||||
|
public void onClick(boolean b) {
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_privacy_log_event));
|
if (config.dialog == null) {
|
||||||
}
|
openHTMLPage(config.acknowledgmentHtmlPath);
|
||||||
})
|
} else {
|
||||||
);
|
config.dialog.open(AboutActivity.this, config.acknowledgmentHtmlPath, getString(R.string.egab_acknowledgements));
|
||||||
card.addItem(itemHelper(R.string.egab_acknowledgements, R.drawable.ic_acknowledgements,
|
}
|
||||||
new MaterialAboutItemOnClickListener() {
|
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_acknowledgements_log_event));
|
||||||
@Override
|
}
|
||||||
public void onClick(boolean b) {
|
})
|
||||||
if (config.dialog == null) {
|
);
|
||||||
openHTMLPage(config.acknowledgmentHtmlPath);
|
}
|
||||||
} else {
|
|
||||||
config.dialog.open(AboutActivity.this, config.acknowledgmentHtmlPath, getString(R.string.egab_acknowledgements));
|
|
||||||
}
|
|
||||||
logUIEventName(config.analytics, config.logUiEventName, getString(R.string.egab_acknowledgements_log_event));
|
|
||||||
}
|
|
||||||
})
|
|
||||||
);
|
|
||||||
return card.build();
|
return card.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private MaterialAboutActionItem itemHelper(int name, int icon, MaterialAboutItemOnClickListener listener) {
|
private MaterialAboutActionItem itemHelper(int name, int icon, MaterialAboutItemOnClickListener listener) {
|
||||||
return new MaterialAboutActionItem.Builder()
|
return new MaterialAboutActionItem.Builder()
|
||||||
.text(name)
|
.text(name)
|
||||||
.icon(icon)
|
.icon(icon)
|
||||||
.setOnClickListener(listener)
|
.setOnClickListener(listener)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue