Skip to content

Commit 11e869c

Browse files
committed
MM-1150 - Loading default icon from context
1 parent 2b1913f commit 11e869c

2 files changed

Lines changed: 19 additions & 3 deletions

File tree

infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/NotificationSettings.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package org.infobip.mobile.messaging;
22

3-
import android.app.Notification;
43
import android.app.PendingIntent;
54
import android.content.Context;
65
import android.content.Intent;
7-
import android.net.Uri;
86
import android.support.v4.app.NotificationCompat;
97

108
import org.infobip.mobile.messaging.util.PreferenceHelper;
119
import org.infobip.mobile.messaging.util.ResourceLoader;
10+
import org.infobip.mobile.messaging.util.SoftwareInformation;
1211
import org.infobip.mobile.messaging.util.StringUtils;
1312

1413
/**
@@ -171,7 +170,7 @@ private void loadDefaultTitle(Context context) {
171170
}
172171

173172
private void loadDefaultIcon(Context context) {
174-
int resource = ResourceLoader.loadResourceByName(context, "mipmap", "ic_launcher");
173+
int resource = SoftwareInformation.getAppIconResourceId(context);
175174
if (resource > 0) {
176175
this.defaultIcon = resource;
177176
}

infobip-mobile-messaging-android-sdk/src/main/java/org/infobip/mobile/messaging/util/SoftwareInformation.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ private SoftwareInformation() {
1818

1919
private static String appVersion = null;
2020
private static String appName = null;
21+
private static Integer appIconResourceId = null;
2122

2223
public static String getAppVersion(Context context) {
2324
if (appVersion != null) {
@@ -47,6 +48,22 @@ public static String getAppName(Context context) {
4748
return appName;
4849
}
4950

51+
public static int getAppIconResourceId(Context context) {
52+
if (appIconResourceId != null) {
53+
return appIconResourceId;
54+
}
55+
56+
try {
57+
PackageManager packageManager = context.getPackageManager();
58+
ApplicationInfo applicationInfo = packageManager.getApplicationInfo(context.getPackageName(), 0);
59+
appIconResourceId = applicationInfo.icon;
60+
} catch (PackageManager.NameNotFoundException e) {
61+
e.printStackTrace();
62+
}
63+
64+
return appIconResourceId != null ? appIconResourceId : 0;
65+
}
66+
5067
public static String getLibraryVersion() {
5168
return BuildConfig.VERSION_NAME;
5269
}

0 commit comments

Comments
 (0)