Add fetch API key button to settings screen

Author: xsveda

app/src/main/java/org/galaxyproject/sampletracker/ui/settings/SettingsActivity.java

@@ -27,7 +27,7 @@
 
 /**
  * Allows to modify user and project settings.
- * 
+ *
  * @author Pavel Sveda <[email protected]>
  */
 @ContentView(R.layout.act_settings)
@@ -37,9 +37,12 @@ public static final Intent showIntent() {
         return new Intent(GalaxyApplication.get(), SettingsActivity.class);
     }
 
+    private static final int API_KEY_REQUEST = 1;
+
     @Inject private SettingsController mSettingsController;
     @Inject private GalaxyRestAdapter mGalaxyRestAdapter;
     @InjectView(R.id.key) private EditText mKeyField;
+    @InjectView(R.id.key_fetch) private Button mKeyFetchButton;
     @InjectView(R.id.project_id) private EditText mProjectIdField;
     @InjectView(R.id.server_url) private EditText mServerUrlField;
     @InjectView(R.id.save) private Button mSaveButton;
@@ -52,6 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mKeyField.addTextChangedListener(this);
         mProjectIdField.addTextChangedListener(this);
         mServerUrlField.addTextChangedListener(this);
+        mKeyFetchButton.setOnClickListener(this);
         mSaveButton.setOnClickListener(this);
 
         mKeyField.setText(mSettingsController.loadApiKey());
@@ -68,6 +72,15 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == API_KEY_REQUEST && resultCode == RESULT_OK && data != null && data.hasExtra(ApiKeyFetchActivity.EXTRA_API_KEY)) {
+            mKeyFetchButton.setText(data.getStringExtra(ApiKeyFetchActivity.EXTRA_API_KEY));
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
     }
@@ -84,6 +97,9 @@ public void afterTextChanged(Editable s) {
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
+            case R.id.key_fetch:
+                startActivityForResult(ApiKeyFetchActivity.showIntent(), API_KEY_REQUEST);
+                break;
             case R.id.save:
                 doSave();
                 break;

app/src/main/res/layout/act_settings.xml

@@ -19,6 +19,14 @@
         android:inputType="textVisiblePassword"
         />
 
+    <Button
+        android:id="@+id/key_fetch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:text="@string/settings_key_fetch"
+        />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -24,6 +24,7 @@
     <string name="settings_title">Settings</string>
     <string name="settings_key">API access key</string>
     <string name="settings_key_hint">Please enter API key</string>
+    <string name="settings_key_fetch">Fetch API key</string>
     <string name="settings_project_id">ID of current project</string>
     <string name="settings_project_id_hint">Please enter project ID</string>
     <string name="settings_galaxy_server_url">Galaxy server</string>