tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Nullpointer Exception

Browse source
This commit is contained in:
Karim Abou Zeid 2019-05-01 16:33:04 +02:00
commit dc91897189
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
View file

@ -192,20 +192,20 @@ public class MusicUtil {
* to a music library item.
* 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
if (string1.isEmpty()) {return string2;}
if (string2.isEmpty()) {return string1;}
if (TextUtils.isEmpty(string1)) {
//noinspection ConstantConditions
return TextUtils.isEmpty(string2) ? "" : string2;
}
if (TextUtils.isEmpty(string2)) {
//noinspection ConstantConditions
return TextUtils.isEmpty(string1) ? "" : string1;
}
final String separator = " • ";
final StringBuilder builder = new StringBuilder();
builder.append(string1);
builder.append(separator);
builder.append(string2);
return builder.toString();
return string1 + " • " + string2;
}
//iTunes uses for example 1002 for track 2 CD1 or 3011 for track 11 CD3.