-
-
Notifications
You must be signed in to change notification settings - Fork 45
Brings back missing analytics events And Token Exceptions Handling #3075
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
10fcedf
rename method
shubham1g5 d2121b0
static to non static
shubham1g5 981b8a6
clean logs for buildAuth and correct exception handling
shubham1g5 d21859e
re-establish forgotten events
shubham1g5 15751f4
remove log as we are already logging the token error in network layer
shubham1g5 7cfa930
refactor to abstract common nav Controller in an abstract class
shubham1g5 4dca13f
fix the log in check
shubham1g5 2461bf3
revert to logger.exception
shubham1g5 c5c10ab
Add handling of token exceptions in sync and login code
shubham1g5 787f46c
rename exception
shubham1g5 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
app/src/org/commcare/activities/NavigationHostCommCareActivity.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package org.commcare.activities; | ||
|
|
||
| import android.os.Bundle; | ||
|
|
||
| import androidx.navigation.NavController; | ||
| import androidx.navigation.fragment.NavHostFragment; | ||
|
|
||
| import org.commcare.dalvik.R; | ||
| import org.commcare.google.services.analytics.FirebaseAnalyticsUtil; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| public abstract class NavigationHostCommCareActivity<R> extends CommCareActivity<R>{ | ||
|
|
||
| private NavController.OnDestinationChangedListener destinationListener; | ||
|
|
||
| protected NavController navController; | ||
|
|
||
| @Override | ||
| protected void onCreate(@Nullable Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| setContentView(getLayoutResource()); | ||
| destinationListener = FirebaseAnalyticsUtil.getNavControllerPageChangeLoggingListener(); | ||
| navController = getHostFragment().getNavController(); | ||
| navController.addOnDestinationChangedListener(destinationListener); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onDestroy() { | ||
| super.onDestroy(); | ||
| NavController navController = getHostFragment().getNavController(); | ||
| navController.removeOnDestinationChangedListener(destinationListener); | ||
| destinationListener = null; | ||
| } | ||
|
|
||
| protected abstract int getLayoutResource(); | ||
|
|
||
| protected abstract NavHostFragment getHostFragment(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@OrangeAndGreen Given we are moving away from recover workflow, I changed this to re-login but think there is a better word out there that I am missing here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree in the change but not sure of a better term. This is short-lived anyway I think until we can provide a better user experience for situations like this