Merge pull request #344 from Backendless/oleg.vyalyh/17591/set_default_icon

Oleg.vyalyh/17591/set default icon

Author: ksv510

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Mar 21 17:39:57 EET 2018
+#Tue Oct 02 11:40:33 EEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

src/com/backendless/push/BackendlessBroadcastReceiver.java

@@ -37,8 +37,7 @@ public BackendlessBroadcastReceiver()
   }
 
   /**
-   * This method is no need anymore. All you need is just declare your implementation in AndroidManifest.xml.
-   * @return
+   * @deprecated This method is no need anymore. All you need is just declare your implementation in AndroidManifest.xml.
    */
   @Deprecated
   public Class<? extends BackendlessPushService> getServiceClass()

src/com/backendless/push/PushTemplateHelper.java

@@ -196,11 +196,18 @@ else if( messageText.length() > 35 )
     }
 
     int icon = 0;
+
+    // try to get icon from template
     if( template.getIcon() != null )
       icon = appContext.getResources().getIdentifier( template.getIcon(), "drawable", appContext.getPackageName() );
 
+    // try to get default icon
     if( icon == 0 )
-      icon = appContext.getResources().getIdentifier( "ic_launcher", "drawable", appContext.getPackageName() );
+    {
+      icon = context.getApplicationInfo().icon;
+      if( icon == 0 )
+        icon = android.R.drawable.sym_def_app_icon;
+    }
 
     if( icon != 0 )
         notificationBuilder.setSmallIcon( icon );