Merge pull request #1008 from PhenoApps/v5_976_client_id_bugfix

v5 client id preference bugfix

app/src/main/java/com/fieldbook/tracker/preferences/BrapiPreferencesFragment.java

@@ -84,6 +84,8 @@ public class BrapiPreferencesFragment extends PreferenceFragmentCompat implement
     private NeutralButtonEditTextDialog brapiURLPreference;
     private NeutralButtonEditTextDialog brapiDisplayName;
     private NeutralButtonEditTextDialog brapiOIDCURLPreference;
+    private NeutralButtonEditTextDialog brapiClientIdPreference;
+
     private ListPreference brapiOIDCFlow;
 
     //old base url must be in memory now, since NeutralEditText preference updates preferences
@@ -152,6 +154,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         brapiPrefCategory = findPreference("brapi_category");
         brapiLogoutButton = findPreference("revokeBrapiAuth");
 
+        brapiClientIdPreference = findPreference(GeneralKeys.BRAPI_OIDC_CLIENT_ID);
         brapiURLPreference = findPreference(GeneralKeys.BRAPI_BASE_URL);
         brapiDisplayName = findPreference(GeneralKeys.BRAPI_DISPLAY_NAME);
         if (brapiURLPreference != null) {
@@ -458,6 +461,8 @@ public void onDisplayPreferenceDialog(Preference preference) {
                     text = (text == null || text.isEmpty()) ? getString(R.string.export_source_brapi) : text;
                     brapiDisplayName.setText(text);
                     onPreferenceChange(brapiDisplayName, text);
+                } else if (preference.getKey().equals(brapiClientIdPreference.getKey())) {
+                    //pass to ensure oidc isn't updated as well, client id is automatically handled by xml definition
                 } else {
                     preferences.edit().putBoolean(GeneralKeys.BRAPI_EXPLICIT_OIDC_URL, true).apply();
                     brapiOIDCURLPreference.setText(text);