Merge System prod #26
Open
Conversation
This file contains 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
…into androi_PhamVanHuy � Conflicts: � app/src/main/AndroidManifest.xml
…into androi_PhamVanHuy
refactor structure
…into android_PhamLeXuanPhong � Conflicts: � app/src/main/AndroidManifest.xml � app/src/main/java/com/ltdd/cringempone/MainActivity.java
…into androi_PhamVanHuy � Conflicts: � app/src/main/AndroidManifest.xml
…tivy_main.xml cũ sang activity_main_link.xml
…hamVanHuy # Conflicts: # app/src/main/res/values/strings.xml
Androi pham van huy
…into android_PhamLeXuanPhong � Conflicts: � app/src/main/AndroidManifest.xml
…uNgoDat # Conflicts: # app/src/main/res/layout/fragment_main_player.xml
Add button đăng ký , đăng nhập tạm ở nav menu
…into android_PhamLeXuanPhong
…uNgoDat # Conflicts: # .idea/deploymentTargetDropDown.xml # app/src/main/java/com/ltdd/cringempone/MainActivity.java
update lại chức năng google
…BaNgoc # Conflicts: # app/src/main/java/com/ltdd/cringempone/MainActivity.java # app/src/main/java/com/ltdd/cringempone/data/firebase/User.java # app/src/main/java/com/ltdd/cringempone/firebase/DBUser.java # app/src/main/java/com/ltdd/cringempone/ui/activity/LoginActivity.java # app/src/main/java/com/ltdd/cringempone/ui/musicplayer/fragment/MainPlayerFragment.java # app/src/main/java/com/ltdd/cringempone/ui/search/SearchResultActivity.java # app/src/main/res/layout/activity_playlist.xml
Merge prod
…BaNgoc # Conflicts: # app/src/main/java/com/ltdd/cringempone/MainActivity.java # app/src/main/java/com/ltdd/cringempone/data/firebase/User.java # app/src/main/java/com/ltdd/cringempone/firebase/DBUser.java # app/src/main/java/com/ltdd/cringempone/ui/activity/LoginActivity.java # app/src/main/java/com/ltdd/cringempone/ui/musicplayer/fragment/MainPlayerFragment.java # app/src/main/java/com/ltdd/cringempone/ui/search/SearchResultActivity.java # app/src/main/res/layout/activity_playlist.xml
…id_NguyenBaNgoc # Conflicts: # app/src/main/java/com/ltdd/cringempone/MainActivity.java # app/src/main/java/com/ltdd/cringempone/data/firebase/User.java # app/src/main/java/com/ltdd/cringempone/firebase/DBUser.java # app/src/main/java/com/ltdd/cringempone/ui/musicplayer/fragment/MainPlayerFragment.java
Android nguyen ba ngoc
|
| GitGuardian id | GitGuardian status | Secret | Commit | Filename | |
|---|---|---|---|---|---|
| 11506681 | Triggered | Generic High Entropy Secret | 280487a | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | cee708d | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | da881e8 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | cee708d | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | 3e4336c | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | d7d34d2 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | d7d34d2 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | 677fc9b | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | da881e8 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | 55bd5a5 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | c9fe571 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | 0700925 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | 0cc4e99 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | 8281bdf | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | b71386f | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | 2fe4b0c | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506681 | Triggered | Generic High Entropy Secret | 0700925 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| - | Facebook App Keys | b17b90c | app/src/main/res/values/strings.xml | View secret | |
| - | Facebook App Keys | b2cc8da | app/src/main/res/values/strings.xml | View secret | |
| - | Facebook App Keys | 5f27437 | app/src/main/res/values/strings.xml | View secret | |
| 11506682 | Triggered | Generic High Entropy Secret | 0700925 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506682 | Triggered | Generic High Entropy Secret | d7d34d2 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506682 | Triggered | Generic High Entropy Secret | 0cc4e99 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506682 | Triggered | Generic High Entropy Secret | da881e8 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506682 | Triggered | Generic High Entropy Secret | cee708d | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
| 11506682 | Triggered | Generic High Entropy Secret | 55bd5a5 | app/src/main/java/com/ltdd/cringempone/MainActivity.java | View secret |
🛠 Guidelines to remediate hardcoded secrets
- Understand the implications of revoking this secret by investigating where it is used in your code.
- Replace and store your secrets safely. Learn here the best practices.
- Revoke and rotate these secrets.
- If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.
To avoid such incidents in the future consider
- following these best practices for managing and storing secrets including API keys and other credentials
- install secret detection on pre-commit to catch secret before it leaves your machine and ease remediation.
🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.