Skip to content

Commit 9925dcd

Browse files
Merge pull request #95 from tygalive/master
Fix Null pointer Exceptions
2 parents 7c17e35 + 2e27415 commit 9925dcd

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

library/src/main/java/com/vansuita/materialabout/util/VisibleUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
public final class VisibleUtil {
1414

15-
public static void handle(@NonNull View v, @Nullable String s) {
15+
public static void handle(@NonNull View v, @Nullable CharSequence s) {
1616
v.setVisibility(TextUtils.isEmpty(s) ? View.GONE : View.VISIBLE);
1717
}
1818
}

library/src/main/java/com/vansuita/materialabout/views/AboutView.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import androidx.appcompat.widget.AppCompatImageView;
1818
import androidx.appcompat.widget.AppCompatTextView;
1919
import androidx.cardview.widget.CardView;
20+
2021
import android.util.AttributeSet;
2122
import android.view.LayoutInflater;
2223
import android.view.View;
@@ -118,13 +119,13 @@ public void build(@NonNull AboutBuilder bundle) {
118119
setupCard(bundle);
119120

120121
tvName.setText(bundle.getName());
121-
VisibleUtil.handle(tvName, bundle.getName().toString());
122+
VisibleUtil.handle(tvName, bundle.getName());
122123

123124
tvSubTitle.setText(bundle.getSubTitle());
124-
VisibleUtil.handle(tvSubTitle, bundle.getSubTitle().toString());
125+
VisibleUtil.handle(tvSubTitle, bundle.getSubTitle());
125126

126127
tvBrief.setText(bundle.getBrief());
127-
VisibleUtil.handle(tvBrief, bundle.getBrief().toString());
128+
VisibleUtil.handle(tvBrief, bundle.getBrief());
128129

129130
tvAppName.setText(bundle.getAppName());
130131
tvAppTitle.setText(bundle.getAppTitle());
@@ -138,7 +139,7 @@ public void build(@NonNull AboutBuilder bundle) {
138139
if (bundle.getBackgroundColor() != 0)
139140
cvHolder.setCardBackgroundColor(bundle.getBackgroundColor());
140141

141-
VisibleUtil.handle(appHolder, bundle.getAppName().toString());
142+
VisibleUtil.handle(appHolder, bundle.getAppName());
142143

143144
if (appHolder.getVisibility() == VISIBLE)
144145
setDivider(bundle, appHolder);

0 commit comments

Comments
 (0)