Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
c8a890d
Add support for account linking
SUPERCILEX Aug 10, 2017
3b2f13d
Improve sign-in UX when user has multiple providers
SUPERCILEX Aug 13, 2017
e56eaed
Fix progress dialog disappearing too early
SUPERCILEX Aug 15, 2017
4a7164b
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Aug 18, 2017
c5f1915
Merge remote-tracking branch 'upstream/version-2.3.1-dev' into anonym…
SUPERCILEX Sep 7, 2017
c09cab9
Merge remote-tracking branch 'upstream/version-3.0.0-dev' into anonym…
SUPERCILEX Sep 23, 2017
3748381
Merge remote-tracking branch 'upstream/version-2.3.1-dev' into anonym…
SUPERCILEX Sep 23, 2017
22eac95
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Sep 23, 2017
d9a2136
Properly bubble up intermediary load failures
SUPERCILEX Sep 23, 2017
65c3071
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Oct 3, 2017
b021b81
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Oct 3, 2017
9753da1
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Oct 4, 2017
4634c43
Merge remote-tracking branch 'upstream/version-3.1.1-dev' into anonym…
SUPERCILEX Oct 19, 2017
eb1e24c
Merge remote-tracking branch 'upstream/version-3.1.1-dev' into anonym…
SUPERCILEX Oct 26, 2017
94a7295
Fix typo
SUPERCILEX Nov 5, 2017
d90e004
Merge remote-tracking branch 'upstream/version-3.1.1-dev' into anonym…
SUPERCILEX Nov 10, 2017
3e1e419
Merge branch 'anonymous-auth' of https://github.com/SUPERCILEX/Fireba…
SUPERCILEX Nov 10, 2017
3769dfb
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Dec 14, 2017
22cf8d3
Fix merge mistakes
SUPERCILEX Dec 14, 2017
7a0ad3b
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Dec 19, 2017
f0a3b49
Merge remote-tracking branch 'upstream/version-3.2.0-dev' into anonym…
SUPERCILEX Jan 4, 2018
efb7a88
Fix merge mistakes
SUPERCILEX Jan 4, 2018
e65a19f
Merge remote-tracking branch 'upstream/version-3.2.0-dev' into anonym…
SUPERCILEX Jan 17, 2018
41e6321
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Jan 22, 2018
84bb271
Fix merge mistakes
SUPERCILEX Jan 23, 2018
6f5f42d
Mmm
SUPERCILEX Jan 23, 2018
4a7baf4
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Jan 23, 2018
135ca8d
Merge remote-tracking branch 'upstream/version-3.2.2-dev' into anonym…
SUPERCILEX Feb 13, 2018
e2e2458
Support 2-way linking for phone auth
SUPERCILEX Feb 14, 2018
aeabf42
Merge branch 'version-3.3.0-dev' into anonymous-auth
SUPERCILEX Mar 11, 2018
d717e7d
Fix merge mistakes
SUPERCILEX Mar 11, 2018
e800ec2
Fix tests
SUPERCILEX Mar 11, 2018
77809a1
Merge remote-tracking branch 'upstream/version-3.3.0-dev' into anonym…
SUPERCILEX Mar 17, 2018
460f430
Fix merge mistakes
SUPERCILEX Mar 17, 2018
e47e2d8
Merge remote-tracking branch 'upstream/version-3.3.0-dev' into anonym…
SUPERCILEX Mar 25, 2018
f4fae6b
Get things working again
SUPERCILEX Mar 25, 2018
a202658
Fixes
SUPERCILEX Mar 25, 2018
a82593d
Merge remote-tracking branch 'upstream/version-3.3.0-dev' into anonym…
SUPERCILEX Mar 26, 2018
4b219a2
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX Mar 28, 2018
9e05a24
Fix merge mistakes
SUPERCILEX Mar 28, 2018
2943d51
Merge remote-tracking branch 'upstream/version-3.3.1-dev' into anonym…
SUPERCILEX Mar 30, 2018
4dae5fe
Merge remote-tracking branch 'upstream/version-3.3.1-dev' into anonym…
SUPERCILEX Apr 12, 2018
c4d93fa
Fix merge mistakes
SUPERCILEX Apr 12, 2018
440a97e
Merge remote-tracking branch 'upstream/version-3.3.1-dev' into anonym…
SUPERCILEX Apr 13, 2018
e26f7ac
Merge remote-tracking branch 'upstream/version-3.4.0-dev' into anonym…
SUPERCILEX Apr 21, 2018
c87dc74
Merge remote-tracking branch 'upstream/version-3.4.0-dev' into anonym…
SUPERCILEX Apr 25, 2018
e2873ab
Merge remote-tracking branch 'upstream/version-4.0.0-dev' into anonym…
SUPERCILEX May 5, 2018
556daf1
Fix potential account linking sign-in failure due to recursive sign-i…
SUPERCILEX May 8, 2018
83546ad
Merge branch 'link-recursion' into anonymous-auth
SUPERCILEX May 8, 2018
3d7291e
Merge remote-tracking branch 'upstream/master' into anonymous-auth
SUPERCILEX May 25, 2018
0880aa7
Merge branch 'version-4.1.0-dev' into anonymous-auth
SUPERCILEX Jun 19, 2018
3886b0b
Fix merge mistakes
SUPERCILEX Jun 19, 2018
be283dd
Fix broken phone auth merging
SUPERCILEX Jun 19, 2018
95eb5d0
Merge branch 'version-4.1.0-dev' into anonymous-auth
SUPERCILEX Jun 19, 2018
9f257b6
Version 4.2.0
lsirac Jun 26, 2018
2631d09
Adds continue as guest (#1375)
lsirac Jun 29, 2018
0c13d77
Speed up full build (#1386)
SUPERCILEX Jul 4, 2018
a108176
Translations for continue as guest (#1390)
samtstern Jul 9, 2018
71fa34a
Save phone verification ID across process deaths (#1393)
SUPERCILEX Jul 18, 2018
f8affdf
Revert "Upgrading anonymous accounts (#1368)"
SUPERCILEX Aug 5, 2018
8552cc4
Merge branch 'tmp' into anonymous-auth
SUPERCILEX Aug 5, 2018
e0fe130
Fix merge mistakes
SUPERCILEX Aug 5, 2018
c387047
Fix GitHub provider NPE when no perms are supplied (#1405)
SUPERCILEX Aug 6, 2018
f1d5374
Merge remote-tracking branch 'upstream/version-4.2.0-dev' into anonym…
SUPERCILEX Aug 14, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
<activity
android:name=".auth.SignedInActivity"
android:label="@string/title_auth_activity" />
<activity
android:name=".auth.AnonymousUpgradeActivity"
android:label="@string/title_anonymous_upgrade"/>

<!-- Firestore demo -->
<activity
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/com/firebase/uidemo/ChooserActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import android.view.ViewGroup;
import android.widget.TextView;

import com.firebase.uidemo.auth.AnonymousUpgradeActivity;
import com.firebase.uidemo.auth.AuthUiActivity;
import com.firebase.uidemo.database.firestore.FirestoreChatActivity;
import com.firebase.uidemo.database.firestore.FirestorePagingActivity;
Expand Down Expand Up @@ -54,7 +53,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
private static class ActivityChooserAdapter extends RecyclerView.Adapter<ActivityStarterHolder> {
private static final Class[] CLASSES = new Class[]{
AuthUiActivity.class,
AnonymousUpgradeActivity.class,
FirestoreChatActivity.class,
FirestorePagingActivity.class,
RealtimeDbChatActivity.class,
Expand All @@ -63,7 +61,6 @@ private static class ActivityChooserAdapter extends RecyclerView.Adapter<Activit

private static final int[] DESCRIPTION_NAMES = new int[]{
R.string.title_auth_activity,
R.string.title_anonymous_upgrade,
R.string.title_firestore_activity,
R.string.title_firestore_paging_activity,
R.string.title_realtime_database_activity,
Expand All @@ -72,7 +69,6 @@ private static class ActivityChooserAdapter extends RecyclerView.Adapter<Activit

private static final int[] DESCRIPTION_IDS = new int[]{
R.string.desc_auth,
R.string.desc_anonymous_upgrade,
R.string.desc_firestore,
R.string.desc_firestore_paging,
R.string.desc_realtime_database,
Expand Down

This file was deleted.

Loading