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
  • !105

Merged
Opened Apr 12, 2021 by Lee Munkyeong@lee-mk 2 of 2 tasks completed2/2 tasks
  • Report abuse
Report abuse

オフライン対応

  • @miura-t
  • @lee-dh
Edited Apr 13, 2021 by Lee Munkyeong
  • Discussion 10
  • Commits 4
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
    790 return profileUrl;
    791 }
    792 };
    793
    794 public String getFileUrlPath(String fileUrlPath) {
    795 if (!fileUrlPath.contains("fileName=")) {
    796 return fileUrlPath;
    797 }
    798 String fileName = fileUrlPath.split("fileName=")[1].split("&")[0];
    799 String filePath = ABookCommConstants.FILE_SAVE_PATH + fileName;
    800 File file = new File(filePath);
    801 if (file.exists()) {
    802 String replaceTarget = "https" + fileUrlPath.split("https")[1].split("\"")[0];
    803 String uri = file.toURI().toString();
    804 String resultPath = fileUrlPath;
    805 while(resultPath.contains(replaceTarget)) {
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] please give a space before (

      Edited Apr 12, 2021
      [nits] please give a space before `(`
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#9dade916e7e6e24d1df91b7df12a428931b7a74c_805_805)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/BitmapUtil.java
    433 435
    434 436 return bitmapList;
    435 437 }
    438
    439 public static Bitmap convert(String base64Str) throws IllegalArgumentException
    440 {
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] please in same line { with function name

      Edited Apr 12, 2021
      [nits] please in same line `{` with function name
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#865d88dc7c1c7dee965d0a75b8545508bbf56b33_440_439)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/util/BitmapUtil.java
    433 435
    434 436 return bitmapList;
    435 437 }
    438
    439 public static Bitmap convert(String base64Str) throws IllegalArgumentException
    440 {
    441 byte[] decodedBytes = Base64.decode(
    442 base64Str.substring(base64Str.indexOf(",") + 1),
    443 Base64.DEFAULT
    444 );
    445
    446 return BitmapFactory.decodeByteArray(decodedBytes, 0, decodedBytes.length);
    447 }
    448
    449 public static String convert(Bitmap bitmap)
    450 {
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] please in same line { with function name

      Edited Apr 12, 2021
      [nits] please in same line `{` with function name
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#865d88dc7c1c7dee965d0a75b8545508bbf56b33_450_448)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
    376 386
    377 387 mChatWebView.setWebViewClient(new WebViewClient() {
    378 388 @Override
    389 public void onLoadResource(WebView view, String url) {
    390
    391 if(url.contains("profileFileName")) {
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] give a space before (

      Edited Apr 12, 2021
      [nits] give a space before `(`
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_391_391)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
    376 386
    377 387 mChatWebView.setWebViewClient(new WebViewClient() {
    378 388 @Override
    389 public void onLoadResource(WebView view, String url) {
    390
    391 if(url.contains("profileFileName")) {
    392 Uri uri = Uri.parse(url);
    393 String fileName = uri.getQueryParameter("profileFileName");
    394 String filePath = getFilesDir().getAbsolutePath() + "/" + fileName;
    395 Logger.i(TAG, filePath);
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] please user logger.d instead of logger.i if it doesnt intended

      Edited Apr 12, 2021
      [nits] please user logger.d instead of logger.i if it doesnt intended
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_395_395)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
    389 public void onLoadResource(WebView view, String url) {
    390
    391 if(url.contains("profileFileName")) {
    392 Uri uri = Uri.parse(url);
    393 String fileName = uri.getQueryParameter("profileFileName");
    394 String filePath = getFilesDir().getAbsolutePath() + "/" + fileName;
    395 Logger.i(TAG, filePath);
    396
    397 File file = new File(filePath);
    398 NetworkTask networkTask = new NetworkTask(url, filePath);
    399 networkTask.execute();
    400 } else if (url.contains("/file/getImage")) {
    401 Uri uri = Uri.parse(url);
    402 String fileName = uri.getQueryParameter("fileName");
    403 String filePath = getFilesDir().getAbsolutePath() + "/" + fileName;
    404 Logger.i(TAG, filePath);
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] please user logger.d instead of logger.i if it doesnt intended

      Edited Apr 12, 2021
      [nits] please user logger.d instead of logger.i if it doesnt intended
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_404_404)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
    1225
    1226 private String url;
    1227 private String filePath;
    1228 private ContentValues values;
    1229 private Bitmap mBitmap;
    1230 public NetworkTask(String url, String filePath) {
    1231
    1232 this.url = url;
    1233 this.filePath = filePath;
    1234 }
    1235
    1236
    1237 @Override
    1238 protected Bitmap doInBackground(Void... params) {
    1239 try {
    1240 mBitmap =BitmapFactory.decodeStream((InputStream) new URL(url).getContent());
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] indent?

      Edited Apr 12, 2021
      [nits] indent?
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_1240_1240)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
    1246
    1247 @Override
    1248 protected void onPostExecute(Bitmap resultBitmap) {
    1249 super.onPostExecute(resultBitmap);
    1250 try {
    1251 if (resultBitmap == null) {
    1252 return;
    1253 }
    1254 File f = new File(filePath);
    1255
    1256 f.createNewFile();
    1257
    1258 Bitmap bitmap = resultBitmap;
    1259
    1260 ByteArrayOutputStream bos = new ByteArrayOutputStream();
    1261 bitmap.compress(Bitmap.CompressFormat.PNG, 0 , bos);
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits]

      // not preferred
      bitmap.compress(Bitmap.CompressFormat.PNG, 0 , bos);
      // preferred
      bitmap.compress(Bitmap.CompressFormat.PNG, 0, bos);
      
      Edited Apr 12, 2021
      [nits] ```java // not preferred bitmap.compress(Bitmap.CompressFormat.PNG, 0 , bos); // preferred bitmap.compress(Bitmap.CompressFormat.PNG, 0, bos); ```
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_1261_1261)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
    1247 @Override
    1248 protected void onPostExecute(Bitmap resultBitmap) {
    1249 super.onPostExecute(resultBitmap);
    1250 try {
    1251 if (resultBitmap == null) {
    1252 return;
    1253 }
    1254 File f = new File(filePath);
    1255
    1256 f.createNewFile();
    1257
    1258 Bitmap bitmap = resultBitmap;
    1259
    1260 ByteArrayOutputStream bos = new ByteArrayOutputStream();
    1261 bitmap.compress(Bitmap.CompressFormat.PNG, 0 , bos);
    1262 byte[] bitmapdata = bos.toByteArray();
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] bitmapdata -> bitmapData

      Edited Apr 12, 2021
      [nits] `bitmapdata` -> `bitmapData`
    • Lee Munkyeong @lee-mk

      changed this line in version 2 of the diff

      Apr 12, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c#13bb3577d9f8893bdbdac5e5e2d0bdfd8d98dc92_1262_1261)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on the diff Apr 12, 2021
    Resolved by Lee Munkyeong Apr 12, 2021
    ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookCommConstants.java
    85 85 Integer ALL = 2;
    86 86 }
    87 interface MESSAGE_TYPE {
    88 Integer TEXT = 0;
    89 Integer PHOTO = 1;
    90 Integer VIDEO = 2;
    91 Integer SYSTEM = 4;
    92 }
    87 93 Integer GROUP_REQUEST_ALL = 0;
    88 94 }
    89 95
    90 96 interface SIZE {
    91 97 Integer MAX_FAVORITE_COUNT = 100;
    92 98 }
    99
    100 String FILE_SAVE_PATH = "/data/user/0/jp.co.agentec.abookplus.check/files/";
    • Kim Peace @kim-p commented Apr 12, 2021
      Master

      [nits] please user real package path for here

      Edited Apr 12, 2021
      [nits] please user real package path for here
    Please register or sign in to reply
  • Lee Munkyeong @lee-mk

    added 1 commit

    • e8610a8a - コードレビュー対応。

    Compare with previous version

    Apr 12, 2021

    added 1 commit

    • e8610a8a - コードレビュー対応。

    Compare with previous version

    added 1 commit * e8610a8a - コードレビュー対応。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5856&start_sha=4a7691613ef87dc1051aead1815cce4e6407689c)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 7 commits

    • e8610a8a...43e99294 - 6 commits from branch features/abcomm_sp6
    • cde1494f - Merge branch 'features/abcomm_sp6' of…

    Compare with previous version

    Apr 12, 2021

    added 7 commits

    • e8610a8a...43e99294 - 6 commits from branch features/abcomm_sp6
    • cde1494f - Merge branch 'features/abcomm_sp6' of…

    Compare with previous version

    added 7 commits * e8610a8a...43e99294 - 6 commits from branch `features/abcomm_sp6` * cde1494f - Merge branch 'features/abcomm_sp6' of… [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5857&start_sha=e8610a8a97c64f17c2522104adc523f84d32b9a0)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    resolved all discussions

    Apr 12, 2021

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Takatoshi Miura @miura-t

    marked the task @miura-t as completed

    Apr 12, 2021

    marked the task @miura-t as completed

    marked the task **@miura-t** as completed
    Toggle commit list
  • Takatoshi Miura @miura-t

    assigned to @lee-dh

    Apr 12, 2021

    assigned to @lee-dh

    assigned to @lee-dh
    Toggle commit list
  • Lee Daehyun @lee-dh

    marked the task @lee-dh as completed

    Apr 13, 2021

    marked the task @lee-dh as completed

    marked the task **@lee-dh** as completed
    Toggle commit list
  • Lee Daehyun @lee-dh

    assigned to @lee-mk

    Apr 13, 2021

    assigned to @lee-mk

    assigned to @lee-mk
    Toggle commit list
  • Lee Munkyeong @lee-mk

    added 1 commit

    • 3855619c - offline対応。

    Compare with previous version

    Apr 13, 2021

    added 1 commit

    • 3855619c - offline対応。

    Compare with previous version

    added 1 commit * 3855619c - offline対応。 [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/105/diffs?diff_id=5860&start_sha=cde1494f055eaa4eedfc23684913bdd709964a99)
    Toggle commit list
  • Lee Munkyeong @lee-mk

    changed the description

    Apr 13, 2021

    changed the description

    changed the description
    Toggle commit list
  • Lee Munkyeong @lee-mk

    merged

    Apr 13, 2021

    merged

    merged
    Toggle commit list
  • Lee Munkyeong @lee-mk

    mentioned in commit b5e324fe

    Apr 13, 2021

    mentioned in commit b5e324fe

    mentioned in commit b5e324fe34a8f63832c0098bcfc5cfcf86edfe9a
    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
Lee Munkyeong
Assignee
Lee Munkyeong @lee-mk
Assign to
None
Milestone
None
Assign milestone
Time tracking
4
4 participants
Reference: abook_android/abook_check!105
×

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.