Bring the DBus XML files up to date with the current API.

sailfishos · Jan 26, 2017 · 4963d65 · 4963d65
1 parent 966735e
commit 4963d65
Show file tree

Hide file tree

Showing 24 changed files with 824 additions and 47 deletions.
diff --git a/dbus/org.nemomobile.devicelock.AuthenticationInput.xml b/dbus/org.nemomobile.devicelock.AuthenticationInput.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.nemomobile.devicelock.AuthenticationInput">
+  <method name="SetRegistered">
+   <arg name="client" type="o" direction="in"/>
+   <arg name="registered" type="b" direction="in"/>
+  </method>
+  <method name="SetActive">
+   <arg name="client" type="o" direction="in"/>
+   <arg name="active" type="b" direction="in"/>
+  </method>
+  <method name="EnterSecurityCode">
+   <arg name="client" type="o" direction="in"/>
+   <arg name="code" type="s" direction="in"/>
+  </method>
+  <method name="Cancel">
+   <arg name="client" type="o" direction="in"/>
+  </method>
+ </interface>
+</node>
diff --git a/dbus/org.nemomobile.devicelock.Authenticator.xml b/dbus/org.nemomobile.devicelock.Authenticator.xml
@@ -4,16 +4,12 @@
  <interface name="org.nemomobile.devicelock.Authenticator">
   <property name="AvailableMethods" type="u" access="read"/>
   <method name="Authenticate">
-   <arg name="authenticator" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
    <arg name="challenge_code" type="v" direction="in"/>
    <arg name="methods" type="u" direction="in"/>
   </method>
-  <method name="EnterLockCode">
-   <arg name="authenticator" type="o" direction="in"/>
-   <arg name="lock_code" type="s" direction="in"/>
-  </method>
   <method name="Cancel">
-   <arg name="authenticator" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
   </method>
  </interface>
 </node>
diff --git a/dbus/org.nemomobile.devicelock.Authorization.xml b/dbus/org.nemomobile.devicelock.Authorization.xml
@@ -3,12 +3,12 @@
 <node>
  <interface name="org.nemomobile.devicelock.Authorization">
   <method name="RequestChallenge">
-   <arg name="requester" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
    <arg name="challenge_code" type="v" direction="out"/>
    <arg name="allowed_methods" type="u" direction="out"/>
   </method>
   <method name="RelinquishChallenge">
-   <arg name="requester" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
   </method>
  </interface>
 </node>
diff --git a/dbus/org.nemomobile.devicelock.DeviceLock.Settings.xml b/dbus/org.nemomobile.devicelock.DeviceLock.Settings.xml
@@ -3,7 +3,7 @@
 <node name="/devicelock/settings">
  <interface name="org.nemomobile.devicelock.DeviceLock.Settings">
   <method name="ChangeSetting">
-   <arg name="requestor" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
    <arg name="authentication_token" type="v" direction="in"/>
    <arg name="key" type="s" direction="in"/>
    <arg name="value" type="v" direction="in"/>

diff --git a/dbus/org.nemomobile.devicelock.DeviceLock.xml b/dbus/org.nemomobile.devicelock.DeviceLock.xml
@@ -4,9 +4,8 @@
  <interface name="org.nemomobile.devicelock.DeviceLock">
   <property name="State" type="u" access="read"/>
   <property name="Enabled" type="b" access="read"/>
-  <method name="Unlock">
-   <arg name="requestor" type="o" direction="in"/>
-   <arg name="authentication_token" type="v" direction="in"/>
-  </method>
+  <property name="Unlocking" type="b" access="read"/>
+  <method name="Unlock"/>
+  <method name="Cancel"/>
  </interface>
 </node>
diff --git a/dbus/org.nemomobile.devicelock.DeviceReset.xml b/dbus/org.nemomobile.devicelock.DeviceReset.xml
@@ -3,7 +3,7 @@
 <node name="/devicereset">
  <interface name="org.nemomobile.devicelock.DeviceReset">
   <method name="ClearDevice">
-   <arg name="requestor" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
    <arg name="authentication_token" type="v" direction="in"/>
    <arg name="mode" type="u" direction="in"/>
   </method>

diff --git a/dbus/org.nemomobile.devicelock.EncryptionSettings.xml b/dbus/org.nemomobile.devicelock.EncryptionSettings.xml
@@ -2,8 +2,9 @@
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node name="/encryption">
  <interface name="org.nemomobile.devicelock.EncryptionSettings">
+  <property name="Supported" type="b" access="read"/>
   <method name="EncryptHome">
-   <arg name="requestor" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
    <arg name="authentication_token" type="v" direction="in"/>
   </method>
  </interface>

diff --git a/dbus/org.nemomobile.devicelock.Fingerprint.Sensor.xml b/dbus/org.nemomobile.devicelock.Fingerprint.Sensor.xml
@@ -4,12 +4,12 @@
  <interface name="org.nemomobile.devicelock.Fingerprint.Sensor">
   <property name="HasSensor" type="b" access="read"/>
   <method name="AcquireFinger">
-   <arg name="requester" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
    <arg name="authentication_token" type="v" direction="in"/>
    <arg name="samples_required" type="u" direction="out"/>
   </method>
   <method name="CancelAcquisition">
-   <arg name="requester" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
   </method>
  </interface>
 </node>
diff --git a/dbus/org.nemomobile.devicelock.Fingerprint.Settings.xml b/dbus/org.nemomobile.devicelock.Fingerprint.Settings.xml
@@ -4,7 +4,7 @@
  <interface name="org.nemomobile.devicelock.Fingerprint.Settings">
   <property name="Fingerprints" type="a{vss}" access="read"/>
   <method name="Remove">
-   <arg name="requester" type="o" direction="in"/>
+   <arg name="client" type="o" direction="in"/>
    <arg name="authentication_token" type="v" direction="in"/>
    <arg name="id" type="v" direction="in"/>
   </method>

diff --git a/dbus/org.nemomobile.devicelock.LockCodeSettings.xml b/dbus/org.nemomobile.devicelock.LockCodeSettings.xml
diff --git a/dbus/org.nemomobile.devicelock.SecurityCodeSettings.xml b/dbus/org.nemomobile.devicelock.SecurityCodeSettings.xml
@@ -0,0 +1,20 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/authenticator">
+ <interface name="org.nemomobile.devicelock.SecurityCodeSettings">
+  <property name="SecurityCodeSet" type="b"/>
+  <method name="Change">
+   <arg name="client" type="o" direction="in"/>
+   <arg name="challenge_code" type="v" direction="in"/>
+  </method>
+  <method name="CancelChange">
+   <arg name="client" type="o" direction="in"/>
+  </method>
+  <method name="Clear">
+   <arg name="code" type="s" direction="in"/>
+  </method>
+  <method name="CancelClear">
+   <arg name="client" type="o" direction="in"/>
+  </method>
+ </interface>
+</node>
diff --git a/dbus/org.nemomobile.devicelock.client.AuthenticationInput.xml b/dbus/org.nemomobile.devicelock.client.AuthenticationInput.xml
@@ -0,0 +1,28 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.nemomobile.devicelock.client.AuthenticationInput">
+  <method name="AuthenticationStarted">
+   <arg name="pid" type="u" direction="in"/>
+   <arg name="utilized_methods" type="u" direction="in"/>
+   <arg name="instruction" type="u" direction="in"/>
+  </method>
+  <method name="AuthenticationUnavailable">
+   <arg name="pid" type="u" direction="in"/>
+   <arg name="error" type="u" direction="in"/>
+  </method>
+  <method name="AuthenticationEvaluating"/>
+  <method name="AuthenticationProgress">
+   <arg name="current" type="u" direction="in"/>
+   <arg name="maximum" type="u" direction="in"/>
+  </method>
+  <method name="Feedback">
+   <arg name="feedback" type="u" direction="in"/>
+   <arg name="attempts_remaining" type="u" direction="in"/>
+   <arg name="utilized_methods" type="u" direction="in"/>
+  </method>
+  <method name="Error">
+   <arg name="error" type="u" direction="in"/>
+  </method>
+ </interface>
+</node>
diff --git a/dbus/org.nemomobile.devicelock.client.Authenticator.xml b/dbus/org.nemomobile.devicelock.client.Authenticator.xml
@@ -5,13 +5,6 @@
   <method name="Authenticated">
    <arg name="authentication_token" type="v" direction="in"/>
   </method>
-  <method name="Feedback">
-   <arg name="feedback" type="u" direction="in"/>
-   <arg name="attempts_remaining" type="u" direction="in"/>
-   <arg name="utilized_methods" type="u" direction="in"/>
-  </method>
-  <method name="Error">
-   <arg name="error" type="u" direction="in"/>
-  </method>
+  <method name="Aborted"/>
  </interface>
 </node>
diff --git a/dbus/org.nemomobile.devicelock.client.SecurityCodeSettings.xml b/dbus/org.nemomobile.devicelock.client.SecurityCodeSettings.xml
@@ -0,0 +1,12 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+ <interface name="org.nemomobile.devicelock.client.SecurityCodeSettings">
+  <method name="Changed">
+   <arg name="authentication_token" type="v" direction="in"/>
+  </method>
+  <method name="ChangeAborted"/>
+  <method name="Cleared"/>
+  <method name="ClearAborted"/>
+ </interface>
+</node>