Kill smartlock fragments #1124

samtstern · 2018-01-24T00:00:27Z

WIP for #1123 💀

Change-Id: Id8ff386e4e2f3b567d351b644cd0fa8a7fb1c5be

Change-Id: Idd5aa9d75041a665273531ae76a369b27bc35e6e

Change-Id: Iae2b2cd5232dce19c2436145448cd1effd972659

Change-Id: I814b28ec989b86904c5914fbbe57345eaea7e412

Change-Id: I6d25fb985a35a8d3e090fa85e9f2d835c5e8b404

Change-Id: Iffc99fe57edd600cb1488ae562d410dace399564

samtstern · 2018-01-24T18:10:36Z

@SUPERCILEX ok I just got into exactly the situation you said would happen: I've got identical code in two ViewModels.

How would you unify SmartLockViewModel and WelcomeBackPasswordHandler in your proposed design?

SUPERCILEX · 2018-01-29T18:55:57Z

I basically had a God class that took in an IdpResponse and handled everything from there. The main issue was that it needed to stay alive even if activities on top of the stack forced lower ones to die. I think a solution to that (which would remove my gross static fields) would be to just store the IdpResponse in the saved state and then restore the God class to its correct state. To fix the God class, I think we could create bunch of repository classes that are in charge of individual stuff like idp, email, and phone auth and saving the credential. Then we would just need a view model to coordinate all that.

Then again, do you have any better ideas? 😊

Change-Id: Ibe01e7a4341e8a9c0544981a92dcebec69151b94

Change-Id: Id25fc69430ad830dfd71dcdcf0c48bfd5055b982

Change-Id: I2191225ea9db5a1efd5c68816781259c24ce1f20

Change-Id: I18817b538c556516070f1be0c956a11c93e712d2

samtstern · 2018-02-06T22:37:47Z

@SUPERCILEX I got rid of the duplicated logic. There aren't really any new abstractions here, the view just talks to multiple view models and calls one when the other is finished.

I'd like to remove all the logic from the view, but I couldn't think of a good way to do that right now. At least this continues the refactor without yet having any duplicated logic. Imo that's the minimum we can do at the moment.

Change-Id: I447b6838e0e9f61af80d868ba252d19e1788fdc8

samtstern · 2018-02-12T20:16:02Z

@SUPERCILEX any thoughts on the recent changes?

SUPERCILEX · 2018-02-14T07:28:52Z

Will take a look at this tomorrow. 👍

SUPERCILEX

I like where this is going! My implementation failed in that it tried to have one God class do everything, so having a bunch of small, reusable ViewModels is refreshing.

Just a few comments, but I think this is good to go! 😄

SUPERCILEX · 2018-02-15T06:01:49Z

auth/src/main/java/com/firebase/ui/auth/data/model/Resource.java

    private final Exception mException;

+    /**
+     * Creates a successful Resource&lt;Void&gt;.


Creates a successful, empty Resource. would be clearer to read in the source code.

SUPERCILEX · 2018-02-15T06:03:31Z

auth/src/main/java/com/firebase/ui/auth/data/model/Resource.java

     * @param exception error in computing the result
     */
-    public Resource(@NonNull Exception exception) {
+    Resource(@NonNull Exception exception) {


Those static factory methods look great! Is there any reason to keep these constructors at all?

SUPERCILEX · 2018-02-15T06:03:55Z

auth/src/main/java/com/firebase/ui/auth/data/model/Resource.java

        mException = Preconditions.checkNotNull(exception, "Failure state cannot have null error.");
    }

+    Resource(State state, T value, Exception exception) {


Can this be private?

SUPERCILEX · 2018-02-15T06:07:18Z

auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java

+                    null, 0, 0, 0);
+        } catch (IntentSender.SendIntentException e) {
+            Log.e(TAG, "STATUS: Failed to send resolution.", e);
+            finish(RESULT_OK, mPendingIdpResponse.toIntent());


Because this implementation is specific to Smart Lock being failure tolerant, I feel like we should just inline it or add a comment specifying that it will finish the activity should an error occur. What do you think?

SUPERCILEX · 2018-02-15T06:08:24Z

auth/src/main/java/com/firebase/ui/auth/ui/HelperActivityBase.java

+                break;
+            case SUCCESS:
+            case FAILURE:
+                finish(RESULT_OK, mPendingIdpResponse.toIntent());


Same here, this seems too specific to Smart Lock to be in HelperActivityBase 🤔.

SUPERCILEX · 2018-02-15T06:12:44Z

auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java


+        if (savedInstanceState != null) {
+            mPendingPassword = savedInstanceState.getString(ExtraConstants.EXTRA_PASSWORD, null);
+        }


Maybe I'm not fully understanding the idea behind these pending data, but wouldn't it make more sense to keep those around in the ViewModel? That seems to be what you're trying to do... 🤷‍♂️

Doh. Thank you. I still have some bad old instincts from the pre-ViewModel dark ages.

SUPERCILEX · 2018-02-15T06:16:06Z

auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java

+            case SUCCESS:
+                getDialogHolder().dismissDialog();
+
+                // TODO: Should this logic be in the View?  If not how do we link the view models?


I think it makes sense to have this in the View since it's acting as the glue binding all the different UI components together: we're moving from sign-in to credential input which are two different "screens".

SUPERCILEX · 2018-02-15T06:17:39Z

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SaveSmartLock.java

-import com.google.firebase.auth.FirebaseUser;
-
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class SaveSmartLock extends SmartLockBase<Void> {


YAAAASSSSSSS! Thank you! 👏🙌🎉🥂😁

SUPERCILEX · 2018-02-15T06:19:41Z

auth/src/main/java/com/firebase/ui/auth/util/signincontainer/SignInDelegate.java

 */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-public class SignInDelegate extends SmartLockBase<CredentialRequestResponse> {
+public class SignInDelegate extends FragmentBase


Tick, tok, tick, tok, tick, tok... 😏

SUPERCILEX · 2018-02-15T06:22:41Z

auth/src/main/java/com/firebase/ui/auth/viewmodel/smartlock/SmartLockHandler.java

+                mResultLiveData.setValue(Resource.forVoidSuccess());
+            } else {
+                Log.e(TAG, "SAVE: Canceled by user.");
+                mResultLiveData.setValue(Resource.<Void>forFailure(new Exception("Save canceled by user.")));


We should probably use FirebaseUiException.

Change-Id: I1637e6670d6d4b7b3eab43f6d7fe4ad256a35fdf

Change-Id: I482e5a3d837bd88d85c9eb0e4299d23660c96185

Change-Id: I14a839e8acf99499de69a5d5d628adfccabe0f86

samtstern · 2018-02-15T18:16:36Z

@SUPERCILEX thanks for taking a look. Still trying to untangle all this.

You just made me think: should smartlock just actually be another view? It could be a transparent Activity that we start for result whenever the flow needs to end in a save.

It seems like that would clean up everything, but want to get your thoughts before I do anything that crazy.

samtstern · 2018-02-15T20:00:51Z

@SUPERCILEX I prototyped something here:
#1151

SUPERCILEX · 2018-02-15T22:57:06Z

@samtstern Actually, yeah, #1151 makes a lot of sense: if we're going to have everything be cleanly separated by component, then Smart Lock should be in its own activity. #1151 certainly makes HelperActivityBase nicer! 😉

samtstern · 2018-02-15T23:00:42Z

@SUPERCILEX ok I am going to go forward with that approach then, thanks for the sanity check. And sorry this PR is getting so big 🤷‍♂️

SUPERCILEX · 2018-02-15T23:03:41Z

Haha, no prob!

Change-Id: Ibc686e40c998717eadc12c868e81857d5c71d097

Change-Id: I2fccf30aca42391d9317c33f2a65aab7ee092f7b

samtstern · 2018-02-16T00:07:09Z

@SUPERCILEX ok this one is almost done except for some rotational issues with the CredentialSaveActivity. The save dialog currently stacks if you rotate it, which is not what we want.

Edit: now I can't get that to happen. Maybe I was running an old app version?

Change-Id: I7026b3326a2125e69d64bbc4736f2b6524e0faf6

SUPERCILEX

Almost ready to go!

SUPERCILEX · 2018-02-21T01:04:59Z

auth/src/main/AndroidManifest.xml

            android:authorities="${applicationId}.authuiinitprovider"
            android:exported="false"
            android:initOrder="90" />
-


Could you add these blank lines back?

SUPERCILEX · 2018-02-21T01:06:18Z

auth/src/main/java/com/firebase/ui/auth/data/model/Resource.java

+    private Resource(State state, T value, Exception exception) {
+        mState = state;
+        mValue = value;
+        mException = exception;


Nit: the constructor should be above the static methods.

SUPERCILEX · 2018-02-21T01:07:06Z

auth/src/main/AndroidManifest.xml

+            android:label=""
+            android:exported="false"
+            android:theme="@style/FirebaseUI.Transparent">
+        </activity>


Nit: this should just be />.

SUPERCILEX · 2018-02-21T01:07:51Z

auth/src/main/java/com/firebase/ui/auth/ui/credentials/CredentialSaveActivity.java

+                                      IdpResponse response) {
+
+        String accountType = ProviderUtils.idpResponseToAccountType(response);
+        Credential credential = CredentialsUtil.buildCredential(firebaseUser, password, accountType);


I think it makes more sense to pass in a credential indead of doing all that logic in here.

SUPERCILEX · 2018-02-21T01:16:57Z

auth/src/main/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPrompt.java

+                startSaveCredentials(user, mHandler.getPendingPassword(), resource.getValue());
+                break;
+            case FAILURE:
+                // TODO: Is this message what we want?


Don't we have an "incorrect password" string? We could see if the exception is an instance of the FirebaseAuthInvalidCredentialsException and use that string or else show the localized message. That's better than what we have. 😁

We actually don't ... I added a TODO to make one since I don't want to add one here and get a red build for a non-translated string.

SUPERCILEX · 2018-02-21T01:18:26Z

auth/src/main/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandler.java


+    // TODO:
+    // FirebaseUser firebaseUser = task.getResult().getUser();
+    // mActivity.saveCredentialsOrFinish(firebaseUser, null, mResponse);


This can be removed, right?

SUPERCILEX · 2018-02-21T01:20:59Z

auth/src/main/java/com/firebase/ui/auth/viewmodel/smartlock/SmartLockHandler.java

+                mResultLiveData.setValue(Resource.forVoidSuccess());
+            } else {
+                Log.e(TAG, "SAVE: Canceled by user.");
+                mResultLiveData.setValue(Resource.<Void>forFailure(new Exception("Save canceled by user.")));


Change-Id: I757fc2b42ba72d1820750e046f62912ef888f877

samtstern · 2018-02-21T01:42:49Z

@SUPERCILEX I think I got it all, minus one TODO about getting a new translated error message.

SUPERCILEX

Awesome! LGTM as long as the build is green. 👍

samtstern added 6 commits January 23, 2018 15:49

Introduce SmartLockViewModel

98956c6

Change-Id: Id8ff386e4e2f3b567d351b644cd0fa8a7fb1c5be

Delete SaveSmartLock

107d1cb

Change-Id: Idd5aa9d75041a665273531ae76a369b27bc35e6e

Make tests pass

e8bacc5

Change-Id: Iae2b2cd5232dce19c2436145448cd1effd972659

Inline SmartLockBase into SignInDelegate

a7c90d5

Change-Id: I814b28ec989b86904c5914fbbe57345eaea7e412

Unify pendingresolution into the base view model

e276607

Change-Id: I6d25fb985a35a8d3e090fa85e9f2d835c5e8b404

Clean up

ddbd808

Change-Id: Iffc99fe57edd600cb1488ae562d410dace399564

samtstern added 4 commits February 6, 2018 14:00

Some more unification

09cdbba

Change-Id: Ibe01e7a4341e8a9c0544981a92dcebec69151b94

Unify saving credential logic

9c2f78e

Change-Id: Id25fc69430ad830dfd71dcdcf0c48bfd5055b982

Move some tests to SmartLockHandlerTest

cd31c5f

Change-Id: I2191225ea9db5a1efd5c68816781259c24ce1f20

Make tests pass

54f7536

Change-Id: I18817b538c556516070f1be0c956a11c93e712d2

Make sure to initialize the ViewModel

1b793ac

Change-Id: I447b6838e0e9f61af80d868ba252d19e1788fdc8

samtstern changed the title ~~[WIP] Kill smartlock fragments~~ Kill smartlock fragments Feb 6, 2018

SUPERCILEX reviewed Feb 15, 2018

View reviewed changes

samtstern added 3 commits February 15, 2018 08:59

Merge branch 'version-3.2.2-dev' into kill-smartlock-fragments

5788997

Change-Id: I1637e6670d6d4b7b3eab43f6d7fe4ad256a35fdf

Respond to low-hanging review comments

bc4ef5a

Change-Id: I482e5a3d837bd88d85c9eb0e4299d23660c96185

Untangling of smartlock saves

bbdfe06

Change-Id: I14a839e8acf99499de69a5d5d628adfccabe0f86

samtstern changed the base branch from master to version-3.2.2-dev February 15, 2018 18:15

firebase deleted a comment from googlebot Feb 15, 2018

samtstern mentioned this pull request Feb 15, 2018

Prototype separate save activity #1151

Merged

Prototype separate save activity (#1151)

bd77d07

samtstern added 2 commits February 15, 2018 16:00

Make test pass

1afe342

Change-Id: Ibc686e40c998717eadc12c868e81857d5c71d097

Method rename

a8d21f1

Change-Id: I2fccf30aca42391d9317c33f2a65aab7ee092f7b

samtstern added this to the 3.2.2 milestone Feb 16, 2018

Logging

b256f59

Change-Id: I7026b3326a2125e69d64bbc4736f2b6524e0faf6

SUPERCILEX reviewed Feb 21, 2018

View reviewed changes

Address review feedback

3cb9b1f

Change-Id: I757fc2b42ba72d1820750e046f62912ef888f877

SUPERCILEX approved these changes Feb 21, 2018

View reviewed changes

samtstern merged commit 2bc242a into version-3.2.2-dev Feb 21, 2018

samtstern deleted the kill-smartlock-fragments branch February 27, 2018 18:12

Kill smartlock fragments #1124

Kill smartlock fragments #1124

Uh oh!

Conversation

samtstern commented Jan 24, 2018 • edited by morganchen12 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

samtstern commented Jan 24, 2018

Uh oh!

SUPERCILEX commented Jan 29, 2018

Uh oh!

samtstern commented Feb 6, 2018

Uh oh!

samtstern commented Feb 12, 2018

Uh oh!

SUPERCILEX commented Feb 14, 2018

Uh oh!

SUPERCILEX left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samtstern commented Feb 15, 2018

Uh oh!

samtstern commented Feb 15, 2018

Uh oh!

SUPERCILEX commented Feb 15, 2018

Uh oh!

samtstern commented Feb 15, 2018

Uh oh!

SUPERCILEX commented Feb 15, 2018

Uh oh!

samtstern commented Feb 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SUPERCILEX left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samtstern commented Feb 21, 2018

Uh oh!

SUPERCILEX left a comment

Choose a reason for hiding this comment

samtstern commented Jan 24, 2018 •

edited by morganchen12

Loading

samtstern commented Feb 16, 2018 •

edited

Loading