Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
abook_check
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !197

Merged
Opened Aug 05, 2021 by onuma@onuma 2 of 2 tasks completed2/2 tasks
  • Report abuse
Report abuse

#43368 文書協業中にプッシュメッセージからチャットルーム及びコラボレーション開始する時、チェックしてエラー表示する。

LGTMの場合、チェックをしてください。

  • @kim-p
  • @kim_j
Edited Aug 06, 2021 by onuma
  • Discussion 2
  • Commits 2
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace @kim-p

    marked the task @kim-p as completed

    Aug 05, 2021

    marked the task @kim-p as completed

    marked the task **@kim-p** as completed
    Toggle commit list
  • Kim Peace @kim-p

    assigned to @kim_j

    Aug 05, 2021

    assigned to @kim_j

    assigned to @kim_j
    Toggle commit list
  • Kim Jinsung
    @kim_j started a discussion on commit 862d7cbe Aug 06, 2021
    Last updated by onuma Aug 06, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ShowPushMessageDailogActivity.java
    175 169 handler.post(new Runnable() {
    176 170 @Override
    177 171 public void run() {
    172 String dialogMessage = null;
    173 if (isMeetingRoomConnected) {
    174 dialogMessage = getRString(R.string.chat_open_fail_meeting_connected);
    175 }
    176 if (isCollabration) {
    177 dialogMessage = getRString(R.string.chat_open_fail_collaborattion_connected);
    178 }
    • Kim Jinsung @kim_j commented Aug 06, 2021
      Developer

      コラボレーション時にもisMeetingRoomConnectedがtrueになるので、 isCollabrationからチェックを行ったほうがよいかと思われます。 if (isCollabration) {

      } else if (isMeetingRoomConnected) { }

      コラボレーション時にも`isMeetingRoomConnected`がtrueになるので、 `isCollabration`からチェックを行ったほうがよいかと思われます。 if (isCollabration) { } else if (isMeetingRoomConnected) { }
    • onuma @onuma commented Aug 06, 2021
      Master

      確認して修正します。

      確認して修正します。
    Please register or sign in to reply
  • Kim Jinsung @kim_j

    assigned to @onuma

    Aug 06, 2021

    assigned to @onuma

    assigned to @onuma
    Toggle commit list
  • onuma @onuma

    added 1 commit

    • 1dca7c2a - 遷移させないチェックの順番を、協業中、会議室中の順番に変更した。

    Compare with previous version

    Aug 06, 2021

    added 1 commit

    • 1dca7c2a - 遷移させないチェックの順番を、協業中、会議室中の順番に変更した。

    Compare with previous version

    added 1 commit * 1dca7c2a - 遷移させないチェックの順番を、協業中、会議室中の順番に変更した。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/197/diffs?diff_id=6828&start_sha=862d7cbe15154df9a2fa74901dc291820228d34b)
    Toggle commit list
  • onuma @onuma

    marked the task @kim_j as completed

    Aug 06, 2021

    marked the task @kim_j as completed

    marked the task **@kim_j** as completed
    Toggle commit list
  • onuma @onuma

    assigned to @kim_j

    Aug 06, 2021

    assigned to @kim_j

    assigned to @kim_j
    Toggle commit list
  • onuma @onuma

    merged

    Aug 06, 2021

    merged

    merged
    Toggle commit list
  • onuma @onuma

    mentioned in commit ad70fe02

    Aug 06, 2021

    mentioned in commit ad70fe02

    mentioned in commit ad70fe02fc556ac665a51290885488a6e4494a62
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% 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
Kim Jinsung
Assignee
Kim Jinsung @kim_j
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: abook_android/abook_check!197
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.