Projects >> bo-android >>d7d8077e22c1fee0b4f57f679619d912af324f0f

Chunk
Conflicting content 
            notificationHandler.clearNotification();
        }

<<<<<<< HEAD:src/main/java/org/blitzortung/android/alarm/AlarmManager.java
        Log.v(Main.LOG_TAG, "AlarmManager.processResult() broadcast result " + alarmResult);
=======
        Log.v(Main.LOG_TAG, String.format("AlertHandler.processResult() broadcast result %s", alarmResult));
>>>>>>> b8d1c709c463cdfd02374e50666ca0295df04ceb:src/main/java/org/blitzortung/android/alarm/AlertHandler.java

        broadcastResult(alarmResult);
    }
Solution content 
            notificationHandler.clearNotification();
        }

        Log.v(Main.LOG_TAG, String.format("AlertHandler.processResult() broadcast result %s", alarmResult));

        broadcastResult(alarmResult);
    }
File
AlertHandler.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        if (alarmSoundNotificationSignal != null ) {
            Ringtone r = RingtoneManager.getRingtone(context, alarmSoundNotificationSignal);
            if (r != null) {
<<<<<<< HEAD:src/main/java/org/blitzortung/android/alarm/AlarmManager.java
                r.setStreamType(AudioManager.STREAM_NOTIFICATION);
                if (!r.isPlaying()) {
=======
                if (!r.isPlaying()) {
                    r.setStreamType(AudioManager.STREAM_NOTIFICATION);
>>>>>>> b8d1c709c463cdfd02374e50666ca0295df04ceb:src/main/java/org/blitzortung/android/alarm/AlertHandler.java
                    r.play();
                }
                Log.v(Main.LOG_TAG, "playing " + r.getTitle(context));
Solution content 
        if (alarmSoundNotificationSignal != null ) {
            Ringtone r = RingtoneManager.getRingtone(context, alarmSoundNotificationSignal);
            if (r != null) {
                if (!r.isPlaying()) {
                    r.setStreamType(AudioManager.STREAM_NOTIFICATION);
                    r.play();
                }
                Log.v(Main.LOG_TAG, "playing " + r.getTitle(context));
File
AlertHandler.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation