Commit b464fe16 authored 6 years ago by Torsten Grote

Merge branch 'message-terminology' into 'master'

Use "text" to refer to message text

See merge request !948

parents 09c6f098 79d56126

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/blog/BaseControllerImpl.java 17 additions, 17 deletions

...g/briarproject/briar/android/blog/BaseControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogCommentItem.java 2 additions, 2 deletions

.../org/briarproject/briar/android/blog/BlogCommentItem.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostItem.java 5 additions, 5 deletions

...ava/org/briarproject/briar/android/blog/BlogPostItem.java
briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java 14 additions, 14 deletions

...g/briarproject/briar/android/blog/BlogPostViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java 7 additions, 7 deletions

...riarproject/briar/android/blog/WriteBlogPostActivity.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java 24 additions, 24 deletions

...arproject/briar/android/contact/ConversationActivity.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItem.java 7 additions, 7 deletions

.../briarproject/briar/android/contact/ConversationItem.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationItemViewHolder.java 2 additions, 2 deletions

...ect/briar/android/contact/ConversationItemViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeInViewHolder.java 3 additions, 3 deletions

...briar/android/contact/ConversationNoticeInViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutItem.java 1 addition, 1 deletion

...ject/briar/android/contact/ConversationNoticeOutItem.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationNoticeOutViewHolder.java 3 additions, 3 deletions

...riar/android/contact/ConversationNoticeOutViewHolder.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationRequestItem.java 1 addition, 1 deletion

...roject/briar/android/contact/ConversationRequestItem.java
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationVisitor.java 7 additions, 7 deletions

...iarproject/briar/android/contact/ConversationVisitor.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java 3 additions, 3 deletions

...a/org/briarproject/briar/android/forum/ForumActivity.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java 12 additions, 12 deletions

...briarproject/briar/android/forum/ForumControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumItem.java 2 additions, 2 deletions

.../java/org/briarproject/briar/android/forum/ForumItem.java
briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java 7 additions, 7 deletions

...iar/android/introduction/IntroductionMessageFragment.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java 3 additions, 3 deletions

...riar/android/privategroup/conversation/GroupActivity.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java 11 additions, 11 deletions

...ndroid/privategroup/conversation/GroupControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java 1 addition, 1 deletion

.../android/privategroup/creation/CreateGroupController.java

with 132 additions and 132 deletions

Please register or to comment