From 085ba52294205480d7ef7bf6a2b78eecb2bf8297 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Sun, 5 Jan 2020 15:48:47 -0500 Subject: [PATCH] #632 Resolves issue with audio recordings and from identifiers stemming from changes to the way radio IDs are handled. (#634) --- .../dsheirer/record/RecorderManager.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/dsheirer/record/RecorderManager.java b/src/main/java/io/github/dsheirer/record/RecorderManager.java index 9ccfb98e..cf3df4ed 100644 --- a/src/main/java/io/github/dsheirer/record/RecorderManager.java +++ b/src/main/java/io/github/dsheirer/record/RecorderManager.java @@ -1,7 +1,7 @@ /* * * * ****************************************************************************** - * * Copyright (C) 2014-2019 Dennis Sheirer + * * Copyright (C) 2014-2020 Dennis Sheirer * * * * This program is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by @@ -280,14 +280,32 @@ public class RecorderManager implements Listener String toValue = ((IntegerIdentifier)to).getValue().toString().replace(":", ""); sb.append("_TO_").append(toValue); } + else + { + List toIdentifiers = identifierCollection.getIdentifiers(Role.TO); - Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.FROM); + if(!toIdentifiers.isEmpty()) + { + sb.append("_TO_").append(toIdentifiers.get(0)).toString(); + } + } + + Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.RADIO, Role.FROM); if(from != null) { String fromValue = ((IntegerIdentifier)from).getValue().toString().replace(":", ""); sb.append("_FROM_").append(fromValue); } + else + { + List fromIdentifiers = identifierCollection.getIdentifiers(Role.FROM); + + if(!fromIdentifiers.isEmpty()) + { + sb.append("_FROM_").append(fromIdentifiers.get(0)).toString(); + } + } } else {