From b7d83c7a1fa4dba01af8aa2a81d3966910aa1d29 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 30 Jul 2018 16:13:37 -0400 Subject: [PATCH] Make libpaste a source dependency. --- build.gradle | 4 - res/layout/fragment_submit_log.xml | 81 +++ res/layout/share_intent_list.xml | 30 ++ res/layout/share_intent_row.xml | 41 ++ res/values/colors.xml | 2 + res/values/strings.xml | 13 + .../securesms/LogSubmitActivity.java | 2 +- .../logsubmit/ShareIntentListAdapter.java | 66 +++ .../logsubmit/SubmitLogFragment.java | 462 ++++++++++++++++++ .../securesms/logsubmit/util/Scrubber.java | 64 +++ 10 files changed, 760 insertions(+), 5 deletions(-) create mode 100644 res/layout/fragment_submit_log.xml create mode 100755 res/layout/share_intent_list.xml create mode 100755 res/layout/share_intent_row.xml create mode 100644 src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java create mode 100644 src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java create mode 100644 src/org/thoughtcrime/securesms/logsubmit/util/Scrubber.java diff --git a/build.gradle b/build.gradle index ea98b9b5c0..9ab1aea7e0 100644 --- a/build.gradle +++ b/build.gradle @@ -76,9 +76,6 @@ dependencies { compile 'com.google.android.exoplayer:exoplayer:r2.3.1' - compile('org.whispersystems:libpastelog:1.1.2') { - exclude group: 'com.squareup.okhttp3', module: 'okhttp' - } compile 'org.whispersystems:signal-service-android:2.7.6' compile 'org.whispersystems:webrtc-android:M68' @@ -172,7 +169,6 @@ dependencyVerification { 'com.google.android.gms:play-services-places:abf3a4a3b146ec7e6e753be62775e512868cf37d6f88ffe2d81167b33b57132b', 'com.google.android.gms:play-services-maps:45e8021e7ddac4a44a82a0e9698991389ded3023d35c58f38dbd86d54211ec0e', 'com.google.android.exoplayer:exoplayer:955085aa611a8f7cf6c61b88ae03d1a392f4ad94c9bfbc153f3dedb9ffb14718', - 'org.whispersystems:libpastelog:fe56b4db9ec743c8b565e3e4caa9228fafe132dc0bf82000d6e359b97a81177c', 'org.whispersystems:signal-service-android:823eed29e64fb0aa30d2078cb5ec0245e2a0713a4028121329c5c28788ef27f8', 'org.whispersystems:webrtc-android:66cb312eb024eaf6aa93e662d37d0c46632e049d47a2dcc9c291207589ee7a43', 'me.leolin:ShortcutBadger:e3cb3e7625892129b0c92dd5e4bc649faffdd526d5af26d9c45ee31ff8851774', diff --git a/res/layout/fragment_submit_log.xml b/res/layout/fragment_submit_log.xml new file mode 100644 index 0000000000..df4d77849d --- /dev/null +++ b/res/layout/fragment_submit_log.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + +