1 files changed, 23 insertions, 32 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index 52a1a5f9..ef293220 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -21,7 +21,6 @@ import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.activities.FrostWebActivity
 import com.pitchedapps.frost.dbflow.CookieModel
-import com.pitchedapps.frost.dbflow.fetchUsername
 import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.utils.ARG_USER_ID
 import com.pitchedapps.frost.utils.L
@@ -77,39 +76,31 @@ data class NotificationContent(val data: CookieModel,
                                val text: String,
                                val timestamp: Long,
                                val profileUrl: String) {
-    fun createNotification(context: Context, verifiedUser: Boolean = false) {
-        //in case we haven't found the name, we will try one more time before passing the notification
-        if (!verifiedUser && data.name?.isBlank() ?: true) {
-            data.fetchUsername {
-                data.name = it
-                createNotification(context, true)
-            }
-        } else {
-            val intent = Intent(context, FrostWebActivity::class.java)
-            intent.data = Uri.parse(href.formattedFbUrl)
-            intent.putExtra(ARG_USER_ID, data.id)
-            val group = "frost_${data.id}"
-            val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
-            val notifBuilder = context.frostNotification
-                    .setContentTitle(title ?: context.string(R.string.frost_name))
-                    .setContentText(text)
-                    .setContentIntent(pendingIntent)
-                    .setCategory(Notification.CATEGORY_SOCIAL)
-                    .setSubText(data.name)
-                    .setGroup(group)
+    fun createNotification(context: Context) {
+        val intent = Intent(context, FrostWebActivity::class.java)
+        intent.data = Uri.parse(href.formattedFbUrl)
+        intent.putExtra(ARG_USER_ID, data.id)
+        val group = "frost_${data.id}"
+        val pendingIntent = PendingIntent.getActivity(context, 0, intent, 0)
+        val notifBuilder = context.frostNotification
+                .setContentTitle(title ?: context.string(R.string.frost_name))
+                .setContentText(text)
+                .setContentIntent(pendingIntent)
+                .setCategory(Notification.CATEGORY_SOCIAL)
+                .setSubText(data.name)
+                .setGroup(group)
 
-            if (timestamp != -1L) notifBuilder.setWhen(timestamp * 1000)
-            L.v("Notif load", this.toString())
-            NotificationManagerCompat.from(context).notify(group, notifId, notifBuilder.withBigText.build().frostConfig())
+        if (timestamp != -1L) notifBuilder.setWhen(timestamp * 1000)
+        L.v("Notif load", this.toString())
+        NotificationManagerCompat.from(context).notify(group, notifId, notifBuilder.withBigText.build().frostConfig())
 
-            if (profileUrl.isNotBlank()) {
-                context.runOnUiThread {
-                    Glide.with(context)
-                            .asBitmap()
-                            .load(profileUrl)
-                            .withRoundIcon()
-                            .into(FrostNotificationTarget(context, notifId, group, notifBuilder))
-                }
+        if (profileUrl.isNotBlank()) {
+            context.runOnUiThread {
+                Glide.with(context)
+                        .asBitmap()
+                        .load(profileUrl)
+                        .withRoundIcon()
+                        .into(FrostNotificationTarget(context, notifId, group, notifBuilder))
             }
         }
     }