cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linked: smooth over progress with tactical pauses

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-01 13:58:52 +02:00
parent 6225c940f9
commit 1b3f70073a
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateGithubFragment.java
View File

@@ -31,6 +31,7 @@ import java.net.URL;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -172,28 +173,18 @@ public class LinkedIdCreateGithubFragment extends CryptoOperationFragment<SaveKe
mButtonContainer.setDisplayedChild(1); mButtonContainer.setDisplayedChild(1);
new AsyncTask<Void,Void,Void>() { new Handler().postDelayed(new Runnable() {
@Override @Override
protected Void doInBackground(Void... params) { public void run() {
try {
Thread.sleep(250);
} catch (InterruptedException e) {
// never mind
}
return null;
}
@Override
protected void onPostExecute(Void aVoid) {
super.onPostExecute(aVoid);
LinkedIdWizard wizard = (LinkedIdWizard) getActivity(); LinkedIdWizard wizard = (LinkedIdWizard) getActivity();
if (wizard == null) { if (wizard == null) {
return; return;
} }
wizard.oAuthRequest("github.com/login/oauth/authorize", "7a011b66275f244d3f21", "gist"); wizard.oAuthRequest("github.com/login/oauth/authorize", "7a011b66275f244d3f21", "gist");
} }
}.execute(); }, 250);
} }
@@ -271,15 +262,22 @@ public class LinkedIdCreateGithubFragment extends CryptoOperationFragment<SaveKe
} }
private void step3EditKey(GithubResource resource) { private void step3EditKey(final GithubResource resource) {
mStatus3.setDisplayedChild(1); mStatus3.setDisplayedChild(1);
WrappedUserAttribute ua = LinkedAttribute.fromResource(resource).toUserAttribute(); new Handler().postDelayed(new Runnable() {
mSaveKeyringParcel = new SaveKeyringParcel(mMasterKeyId, mFingerprint); @Override
mSaveKeyringParcel.mAddUserAttribute.add(ua); public void run() {
cryptoOperation(); WrappedUserAttribute ua = LinkedAttribute.fromResource(resource).toUserAttribute();
mSaveKeyringParcel = new SaveKeyringParcel(mMasterKeyId, mFingerprint);
mSaveKeyringParcel.mAddUserAttribute.add(ua);
cryptoOperation();
}
}, 250);
} }
@@ -301,6 +299,12 @@ public class LinkedIdCreateGithubFragment extends CryptoOperationFragment<SaveKe
mStatus3.setDisplayedChild(3); mStatus3.setDisplayedChild(3);
} }
@Override
public void onCryptoOperationCancelled() {
super.onCryptoOperationCancelled();
mStatus3.setDisplayedChild(3);
}
private static JSONObject jsonHttpRequest(String url, JSONObject params, String accessToken) private static JSONObject jsonHttpRequest(String url, JSONObject params, String accessToken)
throws IOException { throws IOException {