@ -210,12 +210,7 @@ public class App extends Application {
// get user defined nickname from Settings
// get user defined nickname from Settings
// returns null if not available
// returns null if not available
private String getUserConfiguredDeviceName ( ) {
private String getUserConfiguredDeviceName ( ) {
String nameFromSystemBluetooth = Settings . System . getString ( getContentResolver ( ) , "bluetooth_name" ) ;
String nameFromSecureBluetooth = Settings . Secure . getString ( getContentResolver ( ) , "bluetooth_name" ) ;
String nameFromSystemDevice = Settings . Secure . getString ( getContentResolver ( ) , "device_name" ) ;
String nameFromSystemDevice = Settings . Secure . getString ( getContentResolver ( ) , "device_name" ) ;
if ( ! isEmpty ( nameFromSystemBluetooth ) ) return nameFromSystemBluetooth ;
if ( ! isEmpty ( nameFromSecureBluetooth ) ) return nameFromSecureBluetooth ;
if ( ! isEmpty ( nameFromSystemDevice ) ) return nameFromSystemDevice ;
if ( ! isEmpty ( nameFromSystemDevice ) ) return nameFromSystemDevice ;
return null ;
return null ;
}
}