Merge branch '926-class-cast-exception' into 'master' (a1b41533) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

a1b41533

Commit a1b41533 authored 8 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '926-class-cast-exception' into 'master'

Don't cast Context to BaseActivity

Closes #926

See merge request !505

parents 199a2ffc 10bb30e1

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java 7 additions, 1 deletion

...java/org/briarproject/briar/android/AndroidComponent.java
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java 0 additions, 6 deletions

...riarproject/briar/android/activity/ActivityComponent.java
briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java 8 additions, 5 deletions

...houghtcrime/securesms/components/emoji/EmojiProvider.java
briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java 26 additions, 30 deletions

...rime/securesms/components/emoji/RecentEmojiPageModel.java

with 41 additions and 42 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment