[taler-anastasis-gtk] branch master updated: -API break: allow clients to specify number of years of service to pay for, including reducer update. Will break stuff, partial patch for #6841

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository anastasis-gtk.

The following commit(s) were added to refs/heads/master by this push:
     new 21d6380  -API break: allow clients to specify number of years of 
service to pay for, including reducer update. Will break stuff, partial patch 
for #6841
21d6380 is described below

commit 21d63803179c5a6b44da4f05bc362c98a69405b2
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Jul 11 12:16:41 2021 +0200

    -API break: allow clients to specify number of years of service to pay for, 
including reducer update. Will break stuff, partial patch for #6841
---
 .../anastasis-gtk_handle-core-secret-changed.c     | 28 +++++++++++++++++++
 .../anastasis-gtk_handle-expiration-change.c       | 31 +++++++++++++++++-----
 ...stasis-gtk_handle-main-window-forward-clicked.c | 25 ++---------------
 .../anastasis-gtk_handle-secret-buttons.c          | 10 +++++--
 4 files changed, 63 insertions(+), 31 deletions(-)

diff --git a/src/anastasis/anastasis-gtk_handle-core-secret-changed.c 
b/src/anastasis/anastasis-gtk_handle-core-secret-changed.c
index 9d0d93e..71cc5d3 100644
--- a/src/anastasis/anastasis-gtk_handle-core-secret-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-core-secret-changed.c
@@ -37,6 +37,34 @@ anastasis_gtk_enter_secret_entry_changed_cb (GtkEditable 
*entry,
 {
   GtkEntry *e = GTK_ENTRY (entry);
   const char *text = gtk_entry_get_text (e);
+  GtkEntry *ne = GTK_ENTRY (GCG_get_main_window_object (
+                              "anastasis_gtk_secret_name_entry"));
+  const char *name = gtk_entry_get_text (ne);
+
+  {
+    json_t *arguments;
+    struct GNUNET_TIME_Absolute expiration;
+
+    expiration = AG_get_desired_expiration ();
+    arguments = json_pack ("{s:s?,s:{s:s,s:s?},s:o}",
+                           "name",
+                           name,
+                           "secret",
+                           "value",
+                           test,
+                           "mime",
+                           "text/plain",
+                           "expiration",
+                           GNUNET_JSON_from_time_absolute (expiration));
+    GNUNET_assert (NULL != arguments);
+    AG_freeze ();
+    AG_ra = ANASTASIS_redux_action (AG_redux_state,
+                                    "enter_secret",
+                                    arguments,
+                                    &AG_action_cb,
+                                    NULL);
+    json_decref (arguments);
+  }
 
   if ( (NULL != text) &&
        (strlen (text) > 0) )
diff --git a/src/anastasis/anastasis-gtk_handle-expiration-change.c 
b/src/anastasis/anastasis-gtk_handle-expiration-change.c
index 59a58ba..c16bb32 100644
--- a/src/anastasis/anastasis-gtk_handle-expiration-change.c
+++ b/src/anastasis/anastasis-gtk_handle-expiration-change.c
@@ -29,6 +29,18 @@
 #include <jansson.h>
 
 
+struct GNUNET_TIME_Absolute
+AG_get_desired_expiration ()
+{
+  gint value;
+  struct GNUNET_TIME_Absolute res;
+
+  value = gtk_spin_button_get_value_as_int (spin_button);
+  // FIXME: implement!
+  return res;
+}
+
+
 /**
  * Callback invoked if the user changed when the
  * backup may expire. Update cost.
@@ -41,12 +53,19 @@ expiration_year_spin_button_value_changed_cb (
   GtkSpinButton *spin_button,
   gpointer user_data)
 {
-  gint value;
   json_t *arg;
+  struct GNUNET_TIME_Absolute expiration;
 
-  value = gtk_spin_button_get_value_as_int (spin_button);
-  arg = json_pack ("s:I",
-                   "expiration-year",
-                   (json_int_t) value);
-  // FIXME: action to update expiration time!
+  expiration = AG_get_desired_expiration ();
+  arg = json_pack ("s:o",
+                   "expiration",
+                   GNUNET_JSON_from_time_absolute (expiration));
+  GNUNET_assert (NULL != arg);
+  AG_freeze ();
+  AG_ra = ANASTASIS_redux_action (AG_redux_state,
+                                  "update_expiration",
+                                  arg,
+                                  &AG_action_cb,
+                                  NULL);
+  json_decref (arg);
 }
diff --git a/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c 
b/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
index d681f87..62a3129 100644
--- a/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
@@ -162,33 +162,12 @@ forward_policies_reviewing (void)
 static void
 forward_secret_editing (void)
 {
-  json_t *arguments;
-  GtkEntry *entry;
-  const char *str;
-  const char *name;
-
-  entry = GTK_ENTRY (GCG_get_main_window_object (
-                       "anastasis_gtk_enter_secret_entry"));
-  str = gtk_entry_get_text (entry);
-  entry = GTK_ENTRY (GCG_get_main_window_object (
-                       "anastasis_gtk_secret_name_entry"));
-  name = gtk_entry_get_text (entry);
-  arguments = json_pack ("{s:s?,s:{s:o,s:s}}",
-                         "name",
-                         name,
-                         "secret",
-                         "value",
-                         GNUNET_JSON_from_data (str,
-                                                strlen (str)),
-                         "mime",
-                         "text/plain");
   AG_freeze ();
   AG_ra = ANASTASIS_redux_action (AG_redux_state,
-                                  "enter_secret",
-                                  arguments,
+                                  "next",
+                                  NULL,
                                   &AG_action_cb,
                                   NULL);
-  json_decref (arguments);
 }
 
 
diff --git a/src/anastasis/anastasis-gtk_handle-secret-buttons.c 
b/src/anastasis/anastasis-gtk_handle-secret-buttons.c
index a96a002..e73c419 100644
--- a/src/anastasis/anastasis-gtk_handle-secret-buttons.c
+++ b/src/anastasis/anastasis-gtk_handle-secret-buttons.c
@@ -26,6 +26,7 @@
 #include <gnunet/platform.h>
 #include <gnunet/gnunet_util_lib.h>
 #include "anastasis-gtk_action.h"
+#include "anastasis-gtk_handle-expiration-change.h"
 #include "anastasis-gtk_helper.h"
 #include <jansson.h>
 #include <magic.h>
@@ -56,6 +57,7 @@ open_secret_dialog_response_cb (GtkDialog *dialog,
   const char *mime;
   GtkEntry *entry;
   const char *name;
+  struct GNUNET_TIME_Absolute expiration;
 
   if (GTK_RESPONSE_OK != response_id)
   {
@@ -130,8 +132,10 @@ open_secret_dialog_response_cb (GtkDialog *dialog,
                        data_size);
   {
     json_t *arguments;
+    struct GNUNET_TIME_Absolute expiration;
 
-    arguments = json_pack ("{s:s?,s:{s:o,s:s?}}",
+    expiration = AG_get_desired_expiration ();
+    arguments = json_pack ("{s:s?,s:{s:o,s:s?},s:o}",
                            "name",
                            name,
                            "secret",
@@ -139,7 +143,9 @@ open_secret_dialog_response_cb (GtkDialog *dialog,
                            GNUNET_JSON_from_data (data,
                                                   data_size),
                            "mime",
-                           mime);
+                           mime,
+                           "expiration",
+                           GNUNET_JSON_from_time_absolute (expiration));
     GNUNET_free (data);
     GNUNET_assert (NULL != arguments);
     AG_freeze ();

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.