Merge pull request #2482 from nextcloud/chore/noid/housekeeping2

Housekeeping Part 2

app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.java

@@ -283,12 +283,12 @@ public class CallNotificationActivity extends CallBaseActivity {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Observer<RoomOverall>() {
                 @Override
-                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                public void onSubscribe(@NonNull Disposable d) {
                     disposablesList.add(d);
                 }
 
                 @Override
-                public void onNext(@io.reactivex.annotations.NonNull RoomOverall roomOverall) {
+                public void onNext(@NonNull RoomOverall roomOverall) {
                     currentConversation = roomOverall.getOcs().getData();
                     setUpAfterConversationIsKnown();
 
@@ -311,7 +311,7 @@ public class CallNotificationActivity extends CallBaseActivity {
                 }
 
                 @Override
-                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                public void onError(@NonNull Throwable e) {
                     Log.e(TAG, e.getMessage(), e);
                 }
 

app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java

@@ -215,34 +215,32 @@ public class DisplayUtils {
         return new ControllerListener() {
             @Override
             public void onSubmit(String id, Object callerContext) {
-
+                // unused atm
             }
 
             @Override
-            public void onFinalImageSet(String id,
+            public void onFinalImageSet(String id, @Nullable Object imageInfo, @Nullable Animatable animatable) {
-                                        @androidx.annotation.Nullable Object imageInfo,
-                                        @androidx.annotation.Nullable Animatable animatable) {
                 updateViewSize((ImageInfo) imageInfo, draweeView);
             }
 
             @Override
-            public void onIntermediateImageSet(String id, @androidx.annotation.Nullable Object imageInfo) {
+            public void onIntermediateImageSet(String id, @Nullable Object imageInfo) {
                 updateViewSize((ImageInfo) imageInfo, draweeView);
             }
 
             @Override
             public void onIntermediateImageFailed(String id, Throwable throwable) {
-
+                // unused atm
             }
 
             @Override
             public void onFailure(String id, Throwable throwable) {
-
+                // unused atm
             }
 
             @Override
             public void onRelease(String id) {
-
+                // unused atm
             }
         };
     }
@@ -659,7 +657,7 @@ public class DisplayUtils {
     public static CharSequence getRelativeTimestamp(Context context, long modificationTimestamp, boolean showFuture) {
         return getRelativeDateTimeString(context,
                                          modificationTimestamp,
-                                         android.text.format.DateUtils.SECOND_IN_MILLIS,
+                                         DateUtils.SECOND_IN_MILLIS,
                                          DateUtils.WEEK_IN_MILLIS,
                                          0,
                                          showFuture);

docs/notifications.md

@@ -4,12 +4,13 @@ This list is intended to help users that have problems to receive talk notificat
 not be complete. Please contribute to this list as you gain new knowledge. Just create an issue with the 
 "notification" label or create a pull request for this document. 
 
-# 📱 Users
+## 📱 Users
 - Please make sure to install the app from the Google PlayStore. The f-droid version doesn't support push notifications.
   
   [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
   alt="Download from Google Play"
   height="80">](https://play.google.com/store/apps/details?id=com.nextcloud.talk2)
+
 - Only talk notifications will be delivered by the Talk app, for all other notifications install the Nextcloud Files 
   app from Google PlayStore.
   
@@ -19,40 +20,55 @@ not be complete. Please contribute to this list as you gain new knowledge. Just
 
 If your problem still occurs after checking all these hints, create an issue at https://github.com/nextcloud/talk-android/issues
 
-## 🤖 Check android settings
+### 🤖 Check android settings
 
 Please take into account that the android settings might be different for each manufacturer.
 It might be worth it to check what other messaging apps recommend to get their apps running on a certain smartphone and adapt this to the talk app.
 Also [https://dontkillmyapp.com/](https://dontkillmyapp.com/) might be good starting point.
 
 - Check that your phone is not in "do not disturb" mode
+
 - Check that your phone has internet access
+
 - Check the android settings like **"energy saving"** and **"notifications"** regularly as they might be reset by
- android at 
+  android at any time!
-  any time!
+
     - Energy saving options example for Xiaomi RedMi:
+
 		- go to "Settings" 
+
         - "Battery & performance"
+
         - "App battery saver"
+
         - tap on the Talk app 
+
         - set "No restrictions"
+
     - Notification options example for Xiaomi RedMi:
+
 		- go to "Settings" 
+
         - "Notifications" 
+
         - tap on the Talk app 
+
         - enable "Show notifications" and if you like 
           enable "Lock screen notifications"
 
-## 🗨️ Check talk app settings
+### 🗨️ Check talk app settings
 - In the settings, check if ringtones are set for calls and notifications and if vibration is activated if you would 
   like so.
+
 - In the conversation settings (in the upper right corner of a conversation), check that notifications are set to 
   "Always notify" or "Notify when mentioned"
+
 	- Be aware that this is a per conversation setting. Set it for every conversation differently depending on your 
       needs.
+
 - Also be aware that notifications are not generated when you have an active session for a conversation. This also applies for tabs that are open in the background, etc.
 
-## 🖥 Check server settings
+### 🖥 Check server settings
 
 Run the `notification:test-push` command for the user who is logged in at the device that should receive the notification:
 
@@ -75,17 +91,17 @@ Data to encrypt is: {"nid":525210,"app":"admin_notification_talk","subject":"Tes
 Signed encrypted push subject
 Push notification sent successfully
 ```
-This means the notifications are set up correctly on server side. Note that there won't be any notification on the
+This means the notifications are set up correctly on server side. Note that there won't be any notification on the 
- phone as this is just a test-message which won't be handled (As a developer you could set a breakpoint in the
+phone as this is just a test-message which won't be handled (As a developer you could set a breakpoint in the 
-  "onMessageReceived"-method of the Firebase cloud messaging handling to check if the notification is received).
+"onMessageReceived"-method of the Firebase cloud messaging handling to check if the notification is received).
 
 If it prints something like
 ```
 sudo -u www-data php /var/www/yourinstance/occ notification:test-push --talk youruser
 No devices found for user
 ```
-try to remove the account from the Nextcloud Android Talk app and log in again. Afterwards try to run the command
+try to remove the account from the Nextcloud Android Talk app and log in again. Afterwards try to run the command 
- again.
+again.
  
 If it prints
 ```
@@ -93,14 +109,14 @@ There are no commands defined in the "notification" namespace.
 ```
 then the https://github.com/nextcloud/notifications app is not installed on your nextcloud instance.
 The notification app is shipped and enabled by default, but could be missing in development environments or being disabled manually.
-Install and enable the app by following the instructions at https://github.com/nextcloud/notifications#developers and
+Install and enable the app by following the instructions at https://github.com/nextcloud/notifications#developers and 
- try again to execute the command.
+try again to execute the command.
 
-# 🦺 Developers/testers
+## 🦺 Developers/testers
 - Be aware that the "qa"-versions that you can install by scanning the QR-code in a github pull request don't 
   support notifications!
 
 - When starting the talk app within Android Studio, make sure to select the "gplayDebug" build variant:
-![gplay debug build variant](/docs/gplayDebugBuildVariant.png "gplay debug build variant")
+  ![gplay debug build variant](/docs/gplayDebugBuildVariant.png "gplay debug build variant")
 
-- Especially after reinstalling the app, make sure to always check the android settings as they might be reset.
+- Especially after reinstalling the app, make sure to always check the android settings as they might be reset.