mirror
/
codec2_talkie
kopia lustrzana https://github.com/sh123/codec2_talkie
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Refactoring

aprs
sh123 2022-08-14 22:27:06 +03:00
rodzic ef49bde42b
commit db83ad37b5
2 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java
Wyświetl plik

@ -162,8 +162,7 @@ public class MainActivity extends AppCompatActivity implements ServiceConnection
// show/hide S-meter
FrameLayout frameRssi = findViewById(R.id.frameRssi);
if (!SettingsWrapper.isSoundModemEnabled(_sharedPreferences) &&
_sharedPreferences.getBoolean(PreferenceKeys.KISS_EXTENSIONS_ENABLED, false)) {
if (SettingsWrapper.isFreeDvSoundModemModulation(_sharedPreferences) || SettingsWrapper.isKissExtensionEnabled(_sharedPreferences)) {
int sLevelId = RadioTools.getMinimumDecodeSLevelLabel(_sharedPreferences, S_METER_S0_VALUE_DB);
TextView sLevel = findViewById(sLevelId);

3
codec2talkie/src/main/java/com/radio/codec2talkie/protocol/Kiss.java
Wyświetl plik

@ -14,6 +14,7 @@ import com.radio.codec2talkie.R;
import com.radio.codec2talkie.protocol.message.TextMessage;
import com.radio.codec2talkie.protocol.position.Position;
import com.radio.codec2talkie.settings.PreferenceKeys;
import com.radio.codec2talkie.settings.SettingsWrapper;
import com.radio.codec2talkie.transport.Transport;
import java.io.IOException;
@ -115,7 +116,7 @@ public class Kiss implements Protocol {
_context = context;
_sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
_isExtendedMode = _sharedPreferences.getBoolean(PreferenceKeys.KISS_EXTENSIONS_ENABLED, false);
_isExtendedMode = SettingsWrapper.isKissExtensionEnabled(_sharedPreferences);
byte tncCsmaPersistence = (byte) Integer.parseInt(_sharedPreferences.getString(PreferenceKeys.KISS_BASIC_P, String.valueOf(CSMA_PERSISTENCE)));
byte tncCsmaSlotTime = (byte) Integer.parseInt(_sharedPreferences.getString(PreferenceKeys.KISS_BASIC_SLOT_TIME, String.valueOf(CSMA_SLOT_TIME)));