Fix Nullpointer Exception
This commit is contained in:
parent
33869b3bfd
commit
dc91897189
1 changed files with 11 additions and 11 deletions
|
|
@ -192,20 +192,20 @@ public class MusicUtil {
|
||||||
* to a music library item.
|
* to a music library item.
|
||||||
* Ex: for a given album --> buildInfoString(album.artist, album.songCount)
|
* Ex: for a given album --> buildInfoString(album.artist, album.songCount)
|
||||||
*/
|
*/
|
||||||
public static String buildInfoString(@NonNull final String string1, @NonNull final String string2)
|
@NonNull
|
||||||
|
public static String buildInfoString(@Nullable final String string1, @Nullable final String string2)
|
||||||
{
|
{
|
||||||
// Skip empty strings
|
// Skip empty strings
|
||||||
if (string1.isEmpty()) {return string2;}
|
if (TextUtils.isEmpty(string1)) {
|
||||||
if (string2.isEmpty()) {return string1;}
|
//noinspection ConstantConditions
|
||||||
|
return TextUtils.isEmpty(string2) ? "" : string2;
|
||||||
|
}
|
||||||
|
if (TextUtils.isEmpty(string2)) {
|
||||||
|
//noinspection ConstantConditions
|
||||||
|
return TextUtils.isEmpty(string1) ? "" : string1;
|
||||||
|
}
|
||||||
|
|
||||||
final String separator = " • ";
|
return string1 + " • " + string2;
|
||||||
|
|
||||||
final StringBuilder builder = new StringBuilder();
|
|
||||||
builder.append(string1);
|
|
||||||
builder.append(separator);
|
|
||||||
builder.append(string2);
|
|
||||||
|
|
||||||
return builder.toString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//iTunes uses for example 1002 for track 2 CD1 or 3011 for track 11 CD3.
|
//iTunes uses for example 1002 for track 2 CD1 or 3011 for track 11 CD3.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue