Quality tools fixes

app/src/main/java/chat/rocket/android/push/PushNotificationHandler.java

@@ -40,6 +40,8 @@ public class PushNotificationHandler implements PushConstants {
 
   private static SparseArrayCompat<ArrayList<String>> messageMap = new SparseArrayCompat<>();
 
+  private Random random = new Random();
+
   public void setNotification(int notId, String message) {
     ArrayList<String> messageList = messageMap.get(notId);
     if (messageList == null) {
@@ -108,7 +110,7 @@ public class PushNotificationHandler implements PushConstants {
     notificationIntent.putExtra(ROOM_ID, roomId);
     notificationIntent.putExtra(NOT_ID, notId);
 
-    int requestCode = new Random().nextInt();
+    int requestCode = random.nextInt();
     PendingIntent contentIntent = PendingIntent
         .getActivity(context, requestCode, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
 

app/src/main/java/chat/rocket/android/push/gcm/GCMIntentService.java

@@ -137,11 +137,11 @@ public class GCMIntentService extends GcmListenerService implements PushConstant
    */
   private Bundle normalizeExtras(Context context, Bundle extras) {
     Log.d(LOG_TAG, "normalize extras");
-    Iterator<String> it = extras.keySet().iterator();
+    Iterator<String> keyIterator = extras.keySet().iterator();
     Bundle newExtras = new Bundle();
 
-    while (it.hasNext()) {
-      String key = it.next();
+    while (keyIterator.hasNext()) {
+      String key = keyIterator.next();
 
       Log.d(LOG_TAG, "key = " + key);