move strings to strings.xml

Author: master-hax

app/src/main/java/app/attestation/auditor/InspectAuditeeActivity.java

@@ -20,12 +20,12 @@ public class InspectAuditeeActivity extends AppCompatActivity {
 
     public static final String INTENT_KEY_FINGERPRINT = "fingerprint_hex";
 
-    private void addSummaryFieldToTable(int tableId, final String fieldName, final String fieldValue) {
+    private void addSummaryFieldToTable(int tableId, final int fieldNameId, final String fieldValue) {
         final TableLayout summaryContainer = findViewById(tableId);
         final TableRow fieldContainer = (TableRow) getLayoutInflater().inflate(R.layout.content_inspectauditee_summary_row, summaryContainer, false);
         final TextView fieldLabel = fieldContainer.findViewById(R.id.name);
         final TextView fieldContent = fieldContainer.findViewById(R.id.value);
-        fieldLabel.setText(fieldName);
+        fieldLabel.setText(fieldNameId);
         fieldContent.setText(fieldValue);
         summaryContainer.addView(fieldContainer);
     }
@@ -65,19 +65,19 @@ protected void onCreate(Bundle savedInstanceState) {
                 fingerprint_hex
         );
 
-        addSummaryFieldToTable(R.id.summary_hardware, "fingerprint", fingerprint_hex);
-        addSummaryFieldToTable(R.id.summary_hardware, "pinned security level", String.valueOf(summary.pinnedSecurityLevel()));
-        addSummaryFieldToTable(R.id.summary_hardware, "pinned OS version", String.valueOf(summary.pinnedOsVersion()));
-        addSummaryFieldToTable(R.id.summary_hardware, "pinned OS patch level", String.valueOf(summary.pinnedOsPatchLevel()));
-        addSummaryFieldToTable(R.id.summary_hardware, "pinned vendor patch level", String.valueOf(summary.pinnedVendorPatchLevel()));
-        addSummaryFieldToTable(R.id.summary_hardware, "pinned boot patch level", String.valueOf(summary.pinnedBootPatchLevel()));
-        addSummaryFieldToTable(R.id.summary_hardware, "verified boot key", summary.verifiedBootKey());
+        addSummaryFieldToTable(R.id.summary_hardware, R.string.inspect_auditee_field_name_fingerprint, fingerprint_hex);
+        addSummaryFieldToTable(R.id.summary_hardware, R.string.inspect_auditee_field_name_pinned_security_level, String.valueOf(summary.pinnedSecurityLevel()));
+        addSummaryFieldToTable(R.id.summary_hardware, R.string.inspect_auditee_field_name_pinned_os_version, String.valueOf(summary.pinnedOsVersion()));
+        addSummaryFieldToTable(R.id.summary_hardware, R.string.inspect_auditee_field_name_pinned_os_patch_level, String.valueOf(summary.pinnedOsPatchLevel()));
+        addSummaryFieldToTable(R.id.summary_hardware, R.string.inspect_auditee_field_name_pinned_vendor_patch_level, String.valueOf(summary.pinnedVendorPatchLevel()));
+        addSummaryFieldToTable(R.id.summary_hardware, R.string.inspect_auditee_field_name_pinned_boot_patch_level, String.valueOf(summary.pinnedBootPatchLevel()));
+        addSummaryFieldToTable(R.id.summary_hardware, R.string.inspect_auditee_field_name_verified_boot_key, summary.verifiedBootKey());
 
-        addSummaryFieldToTable(R.id.summary_os, "pinned app version", String.valueOf(summary.pinnedAppVersion()));
-        addSummaryFieldToTable(R.id.summary_os, "pinned app variant", String.valueOf(summary.pinnedAppVariant()));
+        addSummaryFieldToTable(R.id.summary_os, R.string.inspect_auditee_field_name_pinned_app_version, String.valueOf(summary.pinnedAppVersion()));
+        addSummaryFieldToTable(R.id.summary_os, R.string.inspect_auditee_field_name_pinned_app_variant, String.valueOf(summary.pinnedAppVariant()));
 
-        addSummaryFieldToTable(R.id.summary_history, "first verified", new Date(summary.verifiedTimeFirst()).toString());
-        addSummaryFieldToTable(R.id.summary_history, "last verified", new Date(summary.verifiedTimeLast()).toString());
+        addSummaryFieldToTable(R.id.summary_history, R.string.inspect_auditee_field_name_first_verified, new Date(summary.verifiedTimeFirst()).toString());
+        addSummaryFieldToTable(R.id.summary_history, R.string.inspect_auditee_field_name_last_verified, new Date(summary.verifiedTimeLast()).toString());
     }
 
 }

app/src/main/res/values/strings.xml

@@ -126,6 +126,18 @@
     <string name="inspect_auditee_attestation_history">attestation history</string>
     <string name="inspect_auditee_error_message_missing_fingerprint">auditee fingerprint was not provided</string>
 
+    <string name="inspect_auditee_field_name_fingerprint">fingerprint</string>
+    <string name="inspect_auditee_field_name_pinned_security_level">pinned security level</string>
+    <string name="inspect_auditee_field_name_pinned_os_version">pinned OS version</string>
+    <string name="inspect_auditee_field_name_pinned_os_patch_level">pinned OS patch level</string>
+    <string name="inspect_auditee_field_name_pinned_vendor_patch_level">pinned vendor patch level</string>
+    <string name="inspect_auditee_field_name_pinned_boot_patch_level">pinned boot patch level</string>
+    <string name="inspect_auditee_field_name_verified_boot_key">verified boot key</string>
+    <string name="inspect_auditee_field_name_pinned_app_version">pinned app version</string>
+    <string name="inspect_auditee_field_name_pinned_app_variant">pinned app variant</string>
+    <string name="inspect_auditee_field_name_first_verified">first verified</string>
+    <string name="inspect_auditee_field_name_last_verified">last verified</string>
+
     <string name="device_pixel_4_generic">Google Pixel 4 / Pixel 4 XL</string>
     <string name="device_pixel_4">Google Pixel 4</string>
     <string name="device_pixel_4_xl">Google Pixel 4 XL</string>