Merge branch 'master' of https://github.com/xtralifecloud/unity-sdk

xtralifecloud · Sep 3, 2018 · cb306d2 · cb306d2
2 parents c8a4f18 + a04a56d
commit cb306d2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/...ications/src/main/java/com/clanofthecloud/cotcpushnotifications/MyGcmListenerService.java b/...ications/src/main/java/com/clanofthecloud/cotcpushnotifications/MyGcmListenerService.java
@@ -19,20 +19,30 @@
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.NotificationChannel;
+import android.app.Notification;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+
+import android.graphics.Bitmap; 
+import android.graphics.BitmapFactory; 
+
 import android.media.RingtoneManager;
+
 import android.net.Uri;
+
+import android.os.Build;
 import android.os.Bundle;
+
 import android.support.v4.app.NotificationCompat;
+
 import android.util.Log;
-import android.os.Build;
-import android.app.NotificationChannel;
-import android.app.Notification;
 
 import com.google.android.gms.gcm.GcmListenerService;
+
 import com.unity3d.player.UnityPlayer;
 import com.unity3d.player.UnityPlayerActivity;
 
@@ -77,6 +87,12 @@ private void sendNotification(String message) {
                 Log.e(TAG, "!!!!!!!!! cotc.GcmNotificationIcon not configured in manifest, push notifications won't work !!!!!!!!!");
                 return;
             }
+            int notificationLargeIcon = ai.metaData.getInt("cotc.GcmNotificationLargeIcon", -1);
+            if (notificationLargeIcon == -1) {
+                Log.e(TAG, "There is no large icon for push notifs, will only use default icon");
+                return;
+            }
+
             String pushNotifName = ai.metaData.getString("cotc.GcmNotificationTitle");
             if (pushNotifName == null) {
                 Log.e(TAG, "!!!!!!!!! cotc.GcmNotificationTitle not configured in manifest, push notifications won't work !!!!!!!!!");
@@ -99,13 +115,17 @@ private void sendNotification(String message) {
                 notificationBuilder = new NotificationCompat.Builder(this);
 
             Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+
             notificationBuilder.setSmallIcon(notificationIcon)
                 .setContentTitle(pushNotifName)
                 .setContentText(message)
                 .setAutoCancel(true)
                 .setSound(defaultSoundUri)
                 .setContentIntent(pendingIntent)
                 .setPriority(Notification.PRIORITY_HIGH);
+            if(notificationLargeIcon != -1)
+                notificationBuilder.setLargeIcon(BitmapFactory.decodeResource(currentAct.getResources(), notificationLargeIcon));
+
             notifManager.notify(0 /* ID of notification */, notificationBuilder.build());
         } catch (Exception e) {
             Log.w(TAG, "Failed to handle push notification", e);

diff --git a/UnityProject/Assets/Plugins/Android/AndroidManifest.xml b/UnityProject/Assets/Plugins/Android/AndroidManifest.xml
@@ -18,6 +18,7 @@
     <!-- [START GCM] -->
     <meta-data android:name="cotc.GcmSenderId" android:value="\ 752049070991" />
     <meta-data android:name="cotc.GcmNotificationIcon" android:resource="@drawable/ic_stat_ic_notification" />
+    <meta-data android:name="cotc.GcmNotificationLargeIcon" android:resource="@drawable/ic_stat_ic_notification" />
     <meta-data android:name="cotc.GcmNotificationTitle" android:value="Cotc sample" />
     <receiver android:name="com.google.android.gms.gcm.GcmReceiver" android:exported="true" android:permission="com.google.android.c2dm.permission.SEND">
       <intent-filter>