diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
index e486699..eaeab11 100644
--- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
@@ -81,6 +81,7 @@ class RecordingsAdapter(
     fun updateItems(newItems: ArrayList<Recording>) {
         if (newItems.hashCode() != recordings.hashCode()) {
             recordings = newItems
+            notifyDataSetChanged()
             finishActMode()
         }
         fastScroller?.measureRecyclerView()
diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
index ecfdadc..1275ed9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
@@ -5,6 +5,7 @@ import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
 import android.media.AudioManager
+import android.media.MediaMetadataRetriever
 import android.media.MediaPlayer
 import android.os.Handler
 import android.os.Looper
@@ -18,17 +19,23 @@ import com.simplemobiletools.voicerecorder.activities.SimpleActivity
 import com.simplemobiletools.voicerecorder.adapters.RecordingsAdapter
 import com.simplemobiletools.voicerecorder.extensions.config
 import com.simplemobiletools.voicerecorder.interfaces.RefreshRecordingsListener
+import com.simplemobiletools.voicerecorder.models.Events
 import com.simplemobiletools.voicerecorder.models.Recording
 import kotlinx.android.synthetic.main.fragment_player.view.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import java.util.*
 import kotlin.collections.ArrayList
 
+
 class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), RefreshRecordingsListener {
     private val FAST_FORWARD_SKIP_MS = 10000
 
     private var player: MediaPlayer? = null
     private var progressTimer = Timer()
     private var playedRecordingIDs = Stack<Int>()
+    private var bus: EventBus? = null
 
     override fun onResume() {
         setupColors()
@@ -39,12 +46,15 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
         player?.release()
         player = null
 
+        bus?.unregister(this)
         progressTimer.cancel()
     }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
+        bus = EventBus.getDefault()
+        bus!!.register(this)
         setupColors()
         setupAdapter()
         initMediaPlayer()
@@ -111,6 +121,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
 
     private fun setupAdapter() {
         val recordings = getRecordings()
+
         recordings_placeholder.beVisibleIf(recordings.isEmpty())
         if (recordings.isEmpty()) {
             resetProgress(null)
@@ -158,8 +169,17 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
                     val title = cursor.getStringValue(MediaStore.Audio.Media.DISPLAY_NAME)
                     val path = ""
                     val timestamp = cursor.getIntValue(MediaStore.Audio.Media.DATE_ADDED)
-                    val duration = cursor.getLongValue(MediaStore.Audio.Media.DURATION) / 1000
-                    val size = cursor.getIntValue(MediaStore.Audio.Media.SIZE)
+                    var duration = cursor.getLongValue(MediaStore.Audio.Media.DURATION) / 1000
+                    var size = cursor.getIntValue(MediaStore.Audio.Media.SIZE)
+
+                    if (duration == 0L) {
+                        duration = getDurationFromUri(id.toLong())
+                    }
+
+                    if (size == 0) {
+                        size = getSizeFromUri(id.toLong())
+                    }
+
                     val recording = Recording(id, title, "", timestamp, duration.toInt(), size)
                     recordings.add(recording)
                 } while (cursor.moveToNext())
@@ -173,6 +193,27 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
         return recordings
     }
 
+    private fun getDurationFromUri(id: Long): Long {
+        val recordingUri = ContentUris.withAppendedId(
+            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+            id
+        )
+
+        val retriever = MediaMetadataRetriever()
+        retriever.setDataSource(context, recordingUri)
+        val time = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
+        return Math.round(time.toLong() / 1000.toDouble())
+    }
+
+    private fun getSizeFromUri(id: Long): Int {
+        val recordingUri = ContentUris.withAppendedId(
+            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+            id
+        )
+
+        return context.contentResolver.openInputStream(recordingUri)?.available()?.toInt() ?: 0
+    }
+
     private fun initMediaPlayer() {
         player = MediaPlayer().apply {
             setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
@@ -308,4 +349,9 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
             it.applyColorFilter(textColor)
         }
     }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun recordingCompleted(event: Events.RecordingCompleted) {
+        refreshRecordings()
+    }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/models/Events.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/models/Events.kt
index 81157c8..520edc1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/models/Events.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/models/Events.kt
@@ -4,4 +4,5 @@ class Events {
     class RecordingDuration internal constructor(val duration: Int)
     class RecordingStatus internal constructor(val isRecording: Boolean)
     class RecordingAmplitude internal constructor(val amplitude: Int)
+    class RecordingCompleted internal constructor()
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/services/RecorderService.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/services/RecorderService.kt
index 54ee0a6..adaeba8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/services/RecorderService.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/services/RecorderService.kt
@@ -120,6 +120,7 @@ class RecorderService : Service() {
                 } else {
                     addFileInLegacyMediaStore()
                 }
+                EventBus.getDefault().post(Events.RecordingCompleted())
             }
         }
         recorder = null