From ff088cb2e47598ad786c43f49bfb28d7224e9c3d Mon Sep 17 00:00:00 2001 From: Lyndon Date: Mon, 6 Nov 2017 13:13:53 +0100 Subject: [PATCH] . --- .../bewoplaner-chat-android/app/build.gradle | 1 + .../app/src/main/AndroidManifest.xml | 14 ++++++++++---- .../ownchat/BewoplanerApplication.java | 19 +++++++++++++++++++ .../data/firebase/HandleMessagesService.java | 3 ++- .../firebase/ReplyNotificationReceiver.java | 3 ++- .../ownchat/page/login/LoginPresenter.java | 1 - .../ownchat/page/main/MainActivity.java | 1 - .../app/src/main/res/values/strings.xml | 2 ++ .../bewoplaner-chat-android/build.gradle | 5 ++--- 9 files changed, 38 insertions(+), 11 deletions(-) diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle index 74289b8..412ea2a 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle @@ -114,6 +114,7 @@ dependencies { annotationProcessor 'com.google.dagger:dagger-compiler:2.7' provided 'javax.annotation:jsr250-api:1.0' implementation files('libs/sanselan-0_97-android-1.0.0.jar') + compile 'com.firebase:firebase-jobdispatcher:0.5.2' } task adp2upload(type: Exec, dependsOn: "build") { diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml index 1e01959..cf15c0b 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml @@ -17,7 +17,6 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> @@ -29,7 +28,6 @@ @@ -70,7 +68,8 @@ android:name="io.fabric.ApiKey" android:value="1dcc8d0ead50f1b328778876834fea3392c6fc22" /> - + @@ -78,12 +77,19 @@ - + + + = Build.VERSION_CODES.O) { + NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + String channelId = getString(R.string.default_notification_channel_id); + + if(manager != null && manager.getNotificationChannel(channelId) == null) { + NotificationChannel channel = new NotificationChannel(channelId, + getString(R.string.default_notification_channel_id), + NotificationManager.IMPORTANCE_DEFAULT); + channel.setDescription(getString(R.string.default_notification_channel_id)); + + manager.createNotificationChannel(channel); + } + } } private void buildGraphAndInject() { diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/HandleMessagesService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/HandleMessagesService.java index d396c70..aa3e7d6 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/HandleMessagesService.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/HandleMessagesService.java @@ -144,7 +144,7 @@ public class HandleMessagesService extends FirebaseMessagingService { bitmapToDisplay = BitmapFactory.decodeResource(context.getResources(), R.drawable.avatar); } - NotificationCompat.Builder builder = new NotificationCompat.Builder(context) + NotificationCompat.Builder builder = new NotificationCompat.Builder(context, getString(R.string.default_notification_channel_id)) .setSmallIcon(getNotificationIcon()) .setContentTitle(setNotificationTitle(message, message.numberOfGroupUsers)) .setContentText(getTextFromNotification(message)) @@ -180,6 +180,7 @@ public class HandleMessagesService extends FirebaseMessagingService { false, mUserIdReference.get(), false); + storeMessageLocally(message); storeGroupLocally(groupId, message); } diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/ReplyNotificationReceiver.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/ReplyNotificationReceiver.java index 9550fce..c346d94 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/ReplyNotificationReceiver.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/ReplyNotificationReceiver.java @@ -1,5 +1,6 @@ package de.beyondsoft.ownchat.data.firebase; +import de.beyondsoft.ownchat.BewoplanerApplication; import de.beyondsoft.ownchat.R; import de.beyondsoft.ownchat.data.AppPrefsConstants; import de.beyondsoft.ownchat.data.api.common.ErrorHandlingResponseConverter; @@ -99,7 +100,7 @@ public class ReplyNotificationReceiver extends BroadcastReceiver { private void updateNotificationOnReply(Context context, String replyMessage, int groupId) { NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context); - NotificationCompat.Builder builder = new NotificationCompat.Builder(context) + NotificationCompat.Builder builder = new NotificationCompat.Builder(context, "ownChat") .setSmallIcon(HandleMessagesService.getNotificationIcon()) .setColor(ContextCompat.getColor(context, R.color.colorDefaultBright)) .setContentTitle(context.getResources().getString(R.string.chat_you_name)) diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java index 89436d4..6ca6654 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java @@ -47,7 +47,6 @@ import io.realm.Realm; import rx.Observable; import rx.Subscriber; import rx.Subscription; -import rx.functions.Func1; import rx.schedulers.Schedulers; /** diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java index f6c8c20..e1fc9b9 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java @@ -39,7 +39,6 @@ import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.View; import android.widget.ArrayAdapter; import android.widget.ListView; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml index 65b44bd..aa77178 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml @@ -88,4 +88,6 @@ Die Datei, die Sie versuchen hochzuladen, ist zu groß Datei teilen + ownChat + \ No newline at end of file diff --git a/BeWoPlanerChat/bewoplaner-chat-android/build.gradle b/BeWoPlanerChat/bewoplaner-chat-android/build.gradle index 4414c47..3e37a24 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/build.gradle +++ b/BeWoPlanerChat/bewoplaner-chat-android/build.gradle @@ -3,16 +3,15 @@ buildscript { repositories { jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.0.0' - //classpath 'me.tatarka:gradle-retrolambda:3.3.0' - //classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2' classpath 'io.realm:realm-gradle-plugin:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files - classpath 'com.google.gms:google-services:3.0.0' + classpath 'com.google.gms:google-services:3.1.1' } }