From c07e029345b7ae3ac9447df3ee12c796e6d131df Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 8 Sep 2015 15:53:24 +0200
Subject: [PATCH] linked: add "retry"

---
 Graphics/get-material-icons.sh                |   1 +
 .../linked/LinkedIdCreateGithubFragment.java  |  20 +++++++++++++++---
 .../drawable-hdpi/ic_repeat_black_24dp.png    | Bin 0 -> 183 bytes
 .../drawable-mdpi/ic_repeat_black_24dp.png    | Bin 0 -> 122 bytes
 .../drawable-xhdpi/ic_repeat_black_24dp.png   | Bin 0 -> 168 bytes
 .../drawable-xxhdpi/ic_repeat_black_24dp.png  | Bin 0 -> 214 bytes
 .../drawable-xxxhdpi/ic_repeat_black_24dp.png | Bin 0 -> 243 bytes
 .../layout/linked_create_github_fragment.xml  |  15 +++++++++++--
 8 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_repeat_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_repeat_black_24dp.png

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 0000000000000000000000000000000000000000..d8b42bbe4a9084fe0af6c56bea53acabf7c072b8
GIT binary patch
literal 183
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8ou`XqNCo5DD;s$aDDb#klx_`_
zXbrTHTD+n2^0MFRPj`K|Yk!hu(e2$!7kVt6ywHnx3csOgs73VIkd<>8wfNs&$$BdP
zO`StRo{3GNLW#k#LUH-O(7M{+%{*&aOiDudj`&my80j79`7W)QQZZ@5eyMX`_@$Y(
g7!J0!yy(0mch&rQWwgEuC(tDfp00i_>zopr0QQ?eKL7v#

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..c00a24ebfc314fde45d92335916a8bd2c31886cd
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1M^6{WkP61L=Pz<HIB*=k&~xu>
zwXg=uyTd>JE+|^0uv&Gl$Mw_d3)Fl4r3C~YIOJu?aF{AwX}Iv!W=4mWNTkID=INF3
VE7uk_ZvYy`;OXk;vd$@?2>^)PDIov=

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..75ecb04629f53b5f1369703b9db5e73e6aa28869
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dd`}n0kP61PmkhaB6d8_Qkg+xY
zADw6GksxvAeeHrz6Z3?&&x-I}qZTGy?e!+%+5rRhd&REo{W6SBoE)kOQyK!8oVW{k
z?&RhFE#20zh9yN+L7Op>^Msc}*@hoK<Qir@&=mZtzJfEWX;#N%|B~N~JdSk>-Y_;M
Q1FdH8boFyt=akR{07Z8<`2YX_

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..965a319ff923a1ed47a882a18c6d1cbc575c8617
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw=6bp~hEy=Vz2eC0VkmGpz?uKE
zPG@B8>aO+!)>{(Se)Vt+%UyEIW9!5$<*RP1dPAgFhA)Y`E4tDw$X<na%5%A`?{44c
zU(6z6(8#0~aDatth6AIpMgkLSi~?I!_S&~MpD)<quuv^v1*b?BQ|l}g=6@^c<xG8Y
tDawh;g|55aHnj92po;dIt@B>6i=B>ncE052Q=mf`JYD@<);T3K0RZ>pP{05H

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..fd4d0c028ccddc750d01949953e4a63ab601dea2
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeG3?%1&o4*=JaR&H=xB_ViXik240LWr03GxeO
zXqc_-CjsP5_jGX#sbIW&exWFXAqPvKfrz8&6=zeCM$XWAzDGJbj3s{`-8VIzyGbdd
z$<@FyfW>zMhZ;xM0?us{Ey04NytTG+(iaXg&sxC2l)&jAEaJ$Z!<f;e#KH8FF)sI+
zdH|DhK@-abMgt~w4+dEVFvs$?8p9lg^#|7<pZdU};t7k}0+vZEehDmI3Z4&uoKIQu
XyH@;XEa`ut4|2MvtDnm{r-UW|J<vz}

literal 0
HcmV?d00001

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>