Skip to content

Commit 157f214

Browse files
stonebuzzstonebuzz
committed
fix
1 parent 2d4b462 commit 157f214

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎app/src/main/java/org/glpi/inventory/agent/ui/ActivityMain.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -513,10 +513,10 @@ private void resolveRestrictions() {
513513
enterpriseFeedback(getApplicationContext(), "server_login", "server_login added successfully", serverConfig.getString("server_login"), KeyedAppState.SEVERITY_INFO);
514514
enterpriseFeedback(getApplicationContext(), "server_password", "server_password added successfully", "***", KeyedAppState.SEVERITY_INFO);
515515
enterpriseFeedback(getApplicationContext(), "server_itemtype", "server_itemtype added successfully", serverConfig.getString("server_itemtype"), KeyedAppState.SEVERITY_INFO);
516-
enterpriseFeedback(getApplicationContext(), "server_custom_asset_serial", "server_custom_asset_serial added successfully", serverConfig.getString("server_custom_asset_serial"), KeyedAppState.SEVERITY_INFO);
517-
enterpriseFeedback(getApplicationContext(), "server_custom_asset_name", "server_custom_asset_name added successfully", serverConfig.getString("server_custom_asset_name"), KeyedAppState.SEVERITY_INFO);
518-
enterpriseFeedback(getApplicationContext(), "server_client_id", "server_client_id added successfully", serverConfig.getString("server_client_id"), KeyedAppState.SEVERITY_INFO);
519-
enterpriseFeedback(getApplicationContext(), "server_client_secret", "server_client_secret added successfully", serverConfig.getString("server_client_secret"), KeyedAppState.SEVERITY_INFO);
516+
enterpriseFeedback(getApplicationContext(), "server_custom_asset_serial", "server_custom_asset_serial added successfully", serial, KeyedAppState.SEVERITY_INFO);
517+
enterpriseFeedback(getApplicationContext(), "server_custom_asset_name", "server_custom_asset_name added successfully", name, KeyedAppState.SEVERITY_INFO);
518+
enterpriseFeedback(getApplicationContext(), "server_client_id", "server_client_id added successfully", client_id, KeyedAppState.SEVERITY_INFO);
519+
enterpriseFeedback(getApplicationContext(), "server_client_secret", "server_client_secret added successfully", "***", KeyedAppState.SEVERITY_INFO);
520520
AgentLog.e("EMM - Server added successfully");
521521
} else {
522522
preferences.deletePreferences(serverConfig.getString("server_url"));
@@ -526,10 +526,10 @@ private void resolveRestrictions() {
526526
enterpriseFeedback(getApplicationContext(), "server_login", "server_login updated successfully", serverConfig.getString("server_login"), KeyedAppState.SEVERITY_INFO);
527527
enterpriseFeedback(getApplicationContext(), "server_password", "server_password updated successfully", "***", KeyedAppState.SEVERITY_INFO);
528528
enterpriseFeedback(getApplicationContext(), "server_itemtype", "server_itemtype updated successfully", serverConfig.getString("server_itemtype"), KeyedAppState.SEVERITY_INFO);
529-
enterpriseFeedback(getApplicationContext(), "server_custom_asset_serial", "server_custom_asset_serial updated successfully", serverConfig.getString("server_custom_asset_serial"), KeyedAppState.SEVERITY_INFO);
530-
enterpriseFeedback(getApplicationContext(), "server_custom_asset_name", "server_custom_asset_name updated successfully", serverConfig.getString("server_custom_asset_name"), KeyedAppState.SEVERITY_INFO);
531-
enterpriseFeedback(getApplicationContext(), "server_client_id", "server_client_id updated successfully", serverConfig.getString("server_client_id"), KeyedAppState.SEVERITY_INFO);
532-
enterpriseFeedback(getApplicationContext(), "server_client_secret", "server_client_secret updated successfully", serverConfig.getString("server_client_secret"), KeyedAppState.SEVERITY_INFO);
529+
enterpriseFeedback(getApplicationContext(), "server_custom_asset_serial", "server_custom_asset_serial updated successfully", serial, KeyedAppState.SEVERITY_INFO);
530+
enterpriseFeedback(getApplicationContext(), "server_custom_asset_name", "server_custom_asset_name updated successfully", name, KeyedAppState.SEVERITY_INFO);
531+
enterpriseFeedback(getApplicationContext(), "server_client_id", "server_client_id updated successfully", client_id, KeyedAppState.SEVERITY_INFO);
532+
enterpriseFeedback(getApplicationContext(), "server_client_secret", "server_client_secret updated successfully", "***", KeyedAppState.SEVERITY_INFO);
533533
AgentLog.e("EMM - Server updated successfully");
534534
}
535535

‎app/src/main/java/org/glpi/inventory/agent/utils/HttpInventory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ public boolean verify(String hostname, javax.net.ssl.SSLSession session) {
354354
BufferedReader br = new BufferedReader(new InputStreamReader(es));
355355
AgentLog.e("OAuth - token request error body: " + br.readLine());
356356
}
357-
throw new IOException("HTTP " + responseCode + " : " + conn.getResponseMessage());
357+
throw new IOException("OAuth - HTTP " + responseCode + " : " + conn.getResponseMessage());
358358
}
359359
}
360360

@@ -429,7 +429,7 @@ public boolean verify(String hostname, javax.net.ssl.SSLSession session) {
429429
BufferedReader br = new BufferedReader(new InputStreamReader(es));
430430
AgentLog.e("OAuth - refresh error body: " + br.readLine());
431431
}
432-
throw new IOException("HTTP " + responseCode + " : Unable to refresh OAuth token");
432+
throw new IOException("OAuth - HTTP " + responseCode + " : Unable to refresh OAuth token");
433433
}
434434
}
435435
/**

0 commit comments

Comments
 (0)