diff options
| -rw-r--r-- | java/direct_bt/tinyb/DBTDevice.java | 12 | ||||
| -rw-r--r-- | java/jni/direct_bt/DBTDevice.cxx | 8 | ||||
| -rw-r--r-- | java/org/tinyb/BluetoothDevice.java | 20 | ||||
| -rw-r--r-- | java/tinyb/dbus/DBusDevice.java | 4 |
4 files changed, 22 insertions, 22 deletions
diff --git a/java/direct_bt/tinyb/DBTDevice.java b/java/direct_bt/tinyb/DBTDevice.java index 3a1ca144..620e517d 100644 --- a/java/direct_bt/tinyb/DBTDevice.java +++ b/java/direct_bt/tinyb/DBTDevice.java @@ -345,16 +345,16 @@ public class DBTDevice extends DBTObject implements BluetoothDevice private native byte setPairingNumericComparisonImpl(final boolean equal); @Override - public PairingMode getCurrentPairingMode() { - return PairingMode.get( getCurrentPairingModeImpl() ); + public PairingMode getPairingMode() { + return PairingMode.get( getPairingModeImpl() ); } - private native byte getCurrentPairingModeImpl(); + private native byte getPairingModeImpl(); @Override - public SMPPairingState getCurrentPairingState() { - return SMPPairingState.get( getCurrentPairingStateImpl() ); + public SMPPairingState getPairingState() { + return SMPPairingState.get( getPairingStateImpl() ); } - private native byte getCurrentPairingStateImpl(); + private native byte getPairingStateImpl(); @Override public final boolean cancelPairing() throws BluetoothException { diff --git a/java/jni/direct_bt/DBTDevice.cxx b/java/jni/direct_bt/DBTDevice.cxx index acc31ee1..c0ce02f6 100644 --- a/java/jni/direct_bt/DBTDevice.cxx +++ b/java/jni/direct_bt/DBTDevice.cxx @@ -372,24 +372,24 @@ jbyte Java_direct_1bt_tinyb_DBTDevice_connectLEImpl1(JNIEnv *env, jobject obj, return (jbyte) number(HCIStatusCode::INTERNAL_FAILURE); } -jbyte Java_direct_1bt_tinyb_DBTDevice_getCurrentPairingModeImpl(JNIEnv *env, jobject obj) { +jbyte Java_direct_1bt_tinyb_DBTDevice_getPairingModeImpl(JNIEnv *env, jobject obj) { try { DBTDevice *device = getJavaUplinkObject<DBTDevice>(env, obj); JavaGlobalObj::check(device->getJavaObject(), E_FILE_LINE); - return number( device->getCurrentPairingMode() ); + return number( device->getPairingMode() ); } catch(...) { rethrow_and_raise_java_exception(env); } return number( PairingMode::NONE ); } -jbyte Java_direct_1bt_tinyb_DBTDevice_getCurrentPairingStateImpl(JNIEnv *env, jobject obj) { +jbyte Java_direct_1bt_tinyb_DBTDevice_getPairingStateImpl(JNIEnv *env, jobject obj) { try { DBTDevice *device = getJavaUplinkObject<DBTDevice>(env, obj); JavaGlobalObj::check(device->getJavaObject(), E_FILE_LINE); - return static_cast<uint8_t>( device->getCurrentPairingState() ); + return static_cast<uint8_t>( device->getPairingState() ); } catch(...) { rethrow_and_raise_java_exception(env); } diff --git a/java/org/tinyb/BluetoothDevice.java b/java/org/tinyb/BluetoothDevice.java index feee1290..3af372d2 100644 --- a/java/org/tinyb/BluetoothDevice.java +++ b/java/org/tinyb/BluetoothDevice.java @@ -212,8 +212,8 @@ public interface BluetoothDevice extends BluetoothObject * @see AdapterStatusListener#devicePairingState(BluetoothDevice, SMPPairingState, PairingMode, long) * @see #setPairingPasskey(String) * @see #setPairingNumericComparison(boolean) - * @see #getCurrentPairingMode() - * @see #getCurrentPairingState() + * @see #getPairingMode() + * @see #getPairingState() * @since 2.1.0 * @implNote not implemented in tinyb.dbus */ @@ -238,8 +238,8 @@ public interface BluetoothDevice extends BluetoothObject * @see AdapterStatusListener#devicePairingState(BluetoothDevice, SMPPairingState, PairingMode, long) * @see #setPairingPasskey(String) * @see #setPairingNumericComparison(boolean) - * @see #getCurrentPairingMode() - * @see #getCurrentPairingState() + * @see #getPairingMode() + * @see #getPairingState() * @since 2.1.0 * @implNote not implemented in tinyb.dbus */ @@ -265,12 +265,12 @@ public interface BluetoothDevice extends BluetoothObject * @see AdapterStatusListener#devicePairingState(BluetoothDevice, SMPPairingState, PairingMode, long) * @see #setPairingPasskey(String) * @see #setPairingNumericComparison(boolean) - * @see #getCurrentPairingMode() - * @see #getCurrentPairingState() + * @see #getPairingMode() + * @see #getPairingState() * @since 2.1.0 * @implNote not implemented in tinyb.dbus */ - PairingMode getCurrentPairingMode(); + PairingMode getPairingMode(); /** * Returns the current {@link SMPPairingState}. @@ -282,12 +282,12 @@ public interface BluetoothDevice extends BluetoothObject * @see AdapterStatusListener#devicePairingState(BluetoothDevice, SMPPairingState, PairingMode, long) * @see #setPairingPasskey(String) * @see #setPairingNumericComparison(boolean) - * @see #getCurrentPairingMode() - * @see #getCurrentPairingState() + * @see #getPairingMode() + * @see #getPairingState() * @since 2.1.0 * @implNote not implemented in tinyb.dbus */ - SMPPairingState getCurrentPairingState(); + SMPPairingState getPairingState(); /** * Remove this device from the system (like an unpair). diff --git a/java/tinyb/dbus/DBusDevice.java b/java/tinyb/dbus/DBusDevice.java index 3181689c..72e84dfb 100644 --- a/java/tinyb/dbus/DBusDevice.java +++ b/java/tinyb/dbus/DBusDevice.java @@ -114,10 +114,10 @@ public class DBusDevice extends DBusObject implements BluetoothDevice public HCIStatusCode setPairingNumericComparison(final boolean equal) { return HCIStatusCode.INTERNAL_FAILURE; } @Override - public PairingMode getCurrentPairingMode() { return PairingMode.NONE; } + public PairingMode getPairingMode() { return PairingMode.NONE; } @Override - public SMPPairingState getCurrentPairingState() { return SMPPairingState.NONE; } + public SMPPairingState getPairingState() { return SMPPairingState.NONE; } @Override public native boolean remove() throws BluetoothException; |