linked: add "retry"

8 files changed, 31 insertions, 5 deletions

diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh
index cc0bc9137..67370afc2 100755
--- a/Graphics/get-material-icons.sh
+++ b/Graphics/get-material-icons.sh
@@ -9,6 +9,7 @@ python copy OpenKeychain navigation black expand_more 24
 python copy OpenKeychain navigation white refresh 24
 python copy OpenKeychain av white repeat 24
 python copy OpenKeychain av grey repeat 24
+python copy OpenKeychain av black repeat 24
 python copy OpenKeychain editor white mode_edit 24
 python copy OpenKeychain content white save 24
 python copy OpenKeychain navigation black close 24
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubFragment.java
index e42623c6e..6df31a596 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubFragment.java
@@ -53,6 +53,7 @@ import android.view.ViewGroup;
 import android.webkit.CookieManager;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.ViewAnimator;
@@ -79,6 +80,8 @@ import org.sufficientlysecure.keychain.util.Log;
 
 public class LinkedIdCreateGithubFragment extends CryptoOperationFragment<SaveKeyringParcel,EditKeyResult> {
 
+    private Button mRetryButton;
+
     enum State {
         IDLE, AUTH_PROCESS, AUTH_ERROR, POST_PROCESS, POST_ERROR, LID_PROCESS, LID_ERROR, DONE
     }
@@ -114,6 +117,8 @@ public class LinkedIdCreateGithubFragment extends CryptoOperationFragment<SaveKe
         mStatus2 = (StatusIndicator) view.findViewById(R.id.linked_status_step2);
         mStatus3 = (StatusIndicator) view.findViewById(R.id.linked_status_step3);
 
+        mRetryButton = (Button) view.findViewById(R.id.button_retry);
+
         ((ImageView) view.findViewById(R.id.linked_id_type_icon)).setImageResource(R.drawable.linked_github);
         ((ImageView) view.findViewById(R.id.linked_id_certified_icon)).setImageResource(R.drawable.octo_link_24dp);
         mLinkedIdTitle = (TextView) view.findViewById(R.id.linked_id_title);
@@ -403,13 +408,22 @@ public class LinkedIdCreateGithubFragment extends CryptoOperationFragment<SaveKe
     @Override
     public void onCryptoOperationError(EditKeyResult result) {
         result.createNotify(getActivity()).show(this);
-        mStatus3.setDisplayedChild(3);
+        setState(State.LID_ERROR);
     }
 
     @Override
     public void onCryptoOperationCancelled() {
-        super.onCryptoOperationCancelled();
-        mStatus3.setDisplayedChild(3);
+        mRetryButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                v.setOnClickListener(null);
+                mButtonContainer.setDisplayedChild(1);
+                setState(State.LID_PROCESS);
+                cryptoOperation();
+            }
+        });
+        mButtonContainer.setDisplayedChild(3);
+        setState(State.LID_ERROR);
     }
 
     private String mOAuthCode, mOAuthState;
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png
new file mode 100644
index 000000000..d8b42bbe4
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_black_24dp.png
new file mode 100644
index 000000000..c00a24ebf
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png
new file mode 100644
index 000000000..75ecb0462
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png
new file mode 100644
index 000000000..965a319ff
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png
diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_black_24dp.png
new file mode 100644
index 000000000..fd4d0c028
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_black_24dp.png
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
index 4c8dc03c5..3b4f9e4ff 100644
--- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml
@@ -129,13 +129,13 @@
                 android:layout_marginLeft="4dp"
                 android:inAnimation="@anim/fade_in"
                 android:outAnimation="@anim/fade_out"
-                custom:initialView="2">
+                android:clipChildren="false"
+                custom:initialView="3">
 
                 <Button
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    style="?android:buttonBarButtonStyle"
                     android:drawableLeft="@drawable/link_24dp"
                     android:drawableStart="@drawable/link_24dp"
                     android:drawablePadding="12dp"
@@ -149,6 +149,17 @@
 
                 <include layout="@layout/linked_id_item" />
 
+                <Button
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:drawableLeft="@drawable/ic_repeat_black_24dp"
+                    android:drawableStart="@drawable/ic_repeat_black_24dp"
+                    android:drawablePadding="12dp"
+                    android:text="Retry Last Step"
+                    android:id="@+id/button_retry"
+                    />
+
             </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator>
 
         </LinearLayout>