move mfconn_update_secret_key into the apicalls

This commit is contained in:
josch
2014-12-05 14:02:33 +01:00
parent 7e26de7e2a
commit 73123d87e9
30 changed files with 13 additions and 30 deletions

View File

@@ -57,7 +57,6 @@ int mfshell_cmd_changes(mfshell * mfshell, int argc, char *const argv[])
changes = NULL;
retval = mfconn_api_device_get_changes(mfshell->conn, revision, &changes);
mfconn_update_secret_key(mfshell->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_device_get_changes failed\n");

View File

@@ -83,7 +83,6 @@ int mfshell_cmd_chdir(mfshell * mfshell, int argc, char *const argv[])
}
retval = mfconn_api_folder_get_info(mfshell->conn,
folder_new, (char *)folderkey);
mfconn_update_secret_key(mfshell->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_folder_get_info failed\n");

View File

@@ -60,7 +60,6 @@ int mfshell_cmd_file(mfshell * mfshell, int argc, char *const argv[])
file = file_alloc();
retval = mfconn_api_file_get_info(mfshell->conn, file, (char *)quickkey);
mfconn_update_secret_key(mfshell->conn);
if (retval != 0) {
fprintf(stderr, "mfconn_api_file_get_info failed\n");

View File

@@ -80,7 +80,6 @@ int mfshell_cmd_folder(mfshell * mfshell, int argc, char *const argv[])
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");
}
mfconn_update_secret_key(mfshell->conn);
folderkey = folder_get_key(folder);
name = folder_get_name(folder);

View File

@@ -73,7 +73,6 @@ int mfshell_cmd_get(mfshell * mfshell, int argc, char *const argv[])
// get file name
retval = mfconn_api_file_get_info(mfshell->conn, file, (char *)quickkey);
mfconn_update_secret_key(mfshell->conn);
if (retval == -1) {
file_free(file);
@@ -81,7 +80,6 @@ int mfshell_cmd_get(mfshell * mfshell, int argc, char *const argv[])
}
// request a direct download (streaming) link
retval = mfconn_api_file_get_links(mfshell->conn, file, (char *)quickkey);
mfconn_update_secret_key(mfshell->conn);
if (retval == -1) {
file_free(file);

View File

@@ -64,7 +64,6 @@ int mfshell_cmd_links(mfshell * mfshell, int argc, char *const argv[])
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");
}
mfconn_update_secret_key(mfshell->conn);
share_link = file_get_share_link(file);
direct_link = file_get_direct_link(file);

View File

@@ -53,7 +53,6 @@ int mfshell_cmd_list(mfshell * mfshell, int argc, char *const argv[])
mfconn_api_folder_get_content(mfshell->conn, 0,
folder_get_key(mfshell->folder_curr),
&folder_result, NULL);
mfconn_update_secret_key(mfshell->conn);
if (folder_result == NULL) {
return -1;
@@ -75,7 +74,6 @@ int mfshell_cmd_list(mfshell * mfshell, int argc, char *const argv[])
mfconn_api_folder_get_content(mfshell->conn, 1,
folder_get_key(mfshell->folder_curr),
NULL, &file_result);
mfconn_update_secret_key(mfshell->conn);
for (i = 0; file_result[i] != NULL; i++) {
printf("%s %s\n", file_get_name(file_result[i]),

View File

@@ -54,7 +54,6 @@ int mfshell_cmd_mkdir(mfshell * mfshell, int argc, char *const argv[])
retval =
mfconn_api_folder_create(mfshell->conn, folder_curr, (char *)name);
mfconn_update_secret_key(mfshell->conn);
return retval;
}

View File

@@ -72,7 +72,6 @@ int mfshell_cmd_put(mfshell * mfshell, int argc, char *const argv[])
retval = mfconn_api_upload_simple(mfshell->conn,
folder_get_key(mfshell->folder_curr),
fh, file_name, &upload_key);
mfconn_update_secret_key(mfshell->conn);
fclose(fh);
free(temp);

View File

@@ -53,7 +53,6 @@ int mfshell_cmd_rm(mfshell * mfshell, int argc, char *const argv[])
}
retval = mfconn_api_file_delete(mfshell->conn, quickkey);
mfconn_update_secret_key(mfshell->conn);
return retval;
}

View File

@@ -53,7 +53,6 @@ int mfshell_cmd_rmdir(mfshell * mfshell, int argc, char *const argv[])
}
retval = mfconn_api_folder_delete(mfshell->conn, folderkey);
mfconn_update_secret_key(mfshell->conn);
return retval;
}

View File

@@ -46,7 +46,6 @@ int mfshell_cmd_status(mfshell * mfshell, int argc, char *const argv[])
}
// then files
retval = mfconn_api_device_get_status(mfshell->conn, &revision);
mfconn_update_secret_key(mfshell->conn);
if (retval == 0) {
printf("device_revision: %" PRIu64 "\n", revision);
} else {

View File

@@ -76,7 +76,6 @@ int mfshell_cmd_updates(mfshell * mfshell, int argc, char *const argv[])
retval = mfconn_api_device_get_updates(mfshell->conn, quickkey, revision,
target_revision, &patches);
mfconn_update_secret_key(mfshell->conn);
if (retval != 0) {
fprintf(stderr, "api call unsuccessful\n");

View File

@@ -45,7 +45,6 @@ int mfshell_cmd_whoami(mfshell * mfshell, int argc, char *const argv[])
}
retval = mfconn_api_user_get_info(mfshell->conn);
mfconn_update_secret_key(mfshell->conn);
return retval;
}