From e2de9d2ffedf835d794b80faab1a87e67531916d Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 27 Sep 2018 14:58:07 +0200 Subject: [PATCH] use correct send and attach buttons --- res/drawable-hdpi/ic_send_sms_white_24dp.png | Bin 757 -> 754 bytes res/drawable-mdpi/ic_send_sms_white_24dp.png | Bin 485 -> 496 bytes res/drawable-xhdpi/ic_send_sms_white_24dp.png | Bin 956 -> 988 bytes .../ic_send_sms_white_24dp.png | Bin 1558 -> 1633 bytes .../ic_send_sms_white_24dp.png | Bin 1455 -> 1466 bytes res/layout/conversation_input_panel.xml | 2 +- res/values/strings.xml | 1 + .../securesms/ConversationActivity.java | 18 +--- .../securesms/TransportOptions.java | 87 ++---------------- .../securesms/components/SendButton.java | 18 ++-- 10 files changed, 20 insertions(+), 106 deletions(-) diff --git a/res/drawable-hdpi/ic_send_sms_white_24dp.png b/res/drawable-hdpi/ic_send_sms_white_24dp.png index 129a0235c5c7925d73cb13156b3694db00ff2145..6e3e2e69d2e346589e8a998b0e64cb29a0910240 100644 GIT binary patch delta 731 zcmV<10wn$Q1@Z-uBYyw_VoOIv0RM-N%)bBt010qNS#tmY3ljhU3ljkVnw%H_000Mc zNliru;t3lJB06>S#4rE=0)t6JK~zY`rIf#G6hR!t-|Srya$L;i4r7ocY7j*0lp^Br#ZtWx&!xtOSWs35bx!!q!q7V`6O7+<)zSEOvHw_uRc7xtZd2 z+2g}|@B3!NInGKF0Y-x?7Wl<7(*wh3Z~%N~h1mgNe547$F3Zde0OJXkzZ?Rv$I6jm z+yk0~Sg&k_Q%8U?k98Xl`@zG$m2r%3K|>VkBM=()4pn z%8+OCfc4w~P?C7yQnG}!Xu92^MM#*chNb1IvCdo@j6mWtyZolNWqr>cMK&eLczaW- zYC=`jRZ~q3)m71i##B{B6_qurVU4Kdjf5&o+Si6Q^ncmdjwPd_aUIu;PU?i_G_4Do zQb~A})v%;jx?}cZMPs_Cx@wwKL*uGzTs2iy)u@Ivl%>lESs4YAwzaO8h9sj~T~bL0 z-f~6R<|aYRFT3A)g=(oR374En5==c=8I>e`&|~vF&exFW-Nd@_7nRcbL-dA)$YZqA zwyS(CXn%IQoh=q!dqfI_>-D@#ph!uWrzDGtqP`0>b5DPw5T{ z>qv=Q9vMUaT@r>JtXC96qBHg0Wnxh0Es06?T+~@5Z&@m6e9Bl_(WTVYp9H%Yx1^Jb zEa*O#CZV_UjvEO?-3+CKKEv`SJK|^vQZJx*YE&gY`Nl4#A-#g)zs_QTEv~gg`UPEQ zhpTyzenAbFMvy<~UO^^;7+cgB(>|NbO759Jl8P|>tf2E})8%WT_8*S*SRtYz_;~;T N002ovPDHLkV1ke$RlNWJ delta 734 zcmV<40wMkK1@#4xBYy(CNkl?J+<`d?U{(I?>DEKXTmTu`xW0i!+aBjc}5O? zaH@GH0CR!LzcTQXGbR~kH{?oHbasaMCjn*!RkMh&ADuRCXMd*i70QS!8`#gz9LE5t zU-3Y6B5`)61;zx^S8r#jWH1bDxYkHO+oDkERy*b|&PoR$jkcsLd<2Gd_LH+LI5KQ< z9}+=EhP7fQo^B2ys@6i4#>B7A8FB#h*V{2Dn%4_?vlI$tSR!5les+$9x?r)~tNX#< z#-=Lv+1chx;(wXbqE@not?cG7r@C0j9Uk?fw|(kMKl!6Oe5~0ymaDCdEK`}&ayGQP zqg>%WUnme!{sniLF@9oN>)X-3j(47pJ3ZkIpZLL_vLqOlLJ1zTS-VEt7)e!k!6W2x zTf|TibcVt|3Po$QVnq_jleX^uKFR~CX82QykP19#{eSSyGB&cNS-LUP_!6Z=iIazH z7`~XtZA$Q!Lqb!BzFt9@x}gn;PI}GaP5k8{FM}hRgmy;W1|?3`ZQKvm+evuC()C%t z1Lgj)Z~(bTB^x%*eb(gZ(9XrQrO@m1ewn1I<9hcSgz9XtJ1Bu zXezv--7QfjKpjBy^ZSzt7Ow5L=BzB6UpXh-Fr=%iKH06J9eZ@IWMv(^`;Y1*M* zZ~dxQV#jXW1&L=4ibK(M^o6Or{miGrLpJz7Bv(2*7`e7ee5rO6WfRX^FM&(~Xl8vW zWD=sKkknC}V&WoG_&hoqS<%sfhSpD}>KTvB?K%&-&;8=!UJp4eOdpN@1B0)%`qNz4 Qf&c&j07*qoM6N<$g2nZ1i2wiq diff --git a/res/drawable-mdpi/ic_send_sms_white_24dp.png b/res/drawable-mdpi/ic_send_sms_white_24dp.png index 74ac8833e70a85183b8e13e5afa45a1e8ec902be..834c579c0b69d64fbbee97e5f03d360436cd020a 100644 GIT binary patch delta 471 zcmV;|0Vw|E1MmZoBYyw_VoOIv0RM-N%)bBt010qNS#tmY3ljhU3ljkVnw%H_000Mc zNliru;t3lJAu><`AHe_s0f9+GK~y-)jg&oW6j2n0pF6vohz5l~nt&LD_zhxVZ>0tc z8{;3yFR`?=5&Xb^pp_Pyh}fjDO=l6(*jdJq-I@EO*gKQE%YTfSbISWZ=e+lxGlLu6 z1F$gABMR2}67hIS*iNN`?-z6JtrPpT4pa*Ch?9B!60G+u6U&BcvigaV*s-Re9}xh z7k{4>lL0TXU8=>8GRsL$1AI=~T6^A@4piC_7u~l^Gf+)7XqP77dYWuw!$B7?J>F8k zHI<9BU7f&?W1fYNQ*nqPp7jq1b>&m3MTmAv3xfsBRJKQlmJhc>cmgzK4I@lXJYE0* N002ovPDHLkV1mYy(G&mx delta 460 zcmV;-0W<#a1LXsdBYy#`NklnpE!>FO%8 z-I|%1nVDl|W)SSpGDxF2e&YXpZ}rUv-+D6?xX}%vGiZ?M;e}31UKeprZ!dOAa+m!w zaK4k0X`-}}`gADiCQ1-%(o5|~{zN8&MwEClK|A~l^f9v4|?7w{?e$2u{KE%B_jB@tn`H@ z{f#uk5*zGv&~ay7l!`JrnB`Y@mz73nom>uP`nX=>M(d<5$z-aXs#c!ns}TIENf))s_gbm%k%`U1)31kb(10&O@ID%gk*=Zy_3+oB!a!@TZ_WzS zi-B>XwAT6CP~c(DdCD`MFvcbixS=?P=pWo>hfG?lQQ&>2Tr7@DE=WWx+*V9)c60E& zgnEr)82pMH5OK^sWyAk4rCRyM>urA!rJ~}Hi}t&_6h;2_dlfEdLpV?gwQ%j-FGvAV zbXZmChI+XA!zVIzwz@sEkC(jV4R0358{YP4Ill~0SEQXB$xOC?q$jwWVKM>uB8nV-cvk+Vih~PMZ8N`)8K!1sfi8Ev?5`xop&YMM@ zs;)~{cXg%v9B7*Es`sh$ez!u4Is%}8*({ybU%I5lnL%Xqo20*WL5F7q(btM3Nq2Q| zCJR(CDV-m=vDMIv%oFYk1%0TW;1tJ5wDW|@d zcar3R(mh>%%zrvj0D50iBrAFG{7D`UA_IC()*GZs$Q3O$hjesblFcCoki@Qk^g&~Y zHd7f*9ijmAiJbNeC#Z&esO1SD3PA7X!dwq>bP~uJ^)pFY53;L|YM(@N`crPi2}VKc zokZWI#Wp$Q<1r8gpzCt#`&4zcAT9&h8wpVWT9efGJAYCnE1Qu?c0Nu;$W^UWLr(gM zFnn3rq3|-~S{`CDE#pN_(dGmp%e3jyq6kUhTPOLGSfQ~`{|@;|T#pcWxZv^l{7D|C5= zE^v(by}b0aK@#RUYw&wOUq zi`N|1A9^sh65^#`4qvctl3+{5D1U;lYPSkyo;0$F3Ch*h4Dh)k z?fb6yT6MNG2W%HwZcyDX8UVDahuTRSS3tnX!P^9IN^g%BZw@etxN+2cyBfFh#TLX* pK3=}*nyI)4%yyYcZ_tE-j{slA14)rMRMP+e002ovPDHLkV1kx7wO9ZE delta 935 zcmV;Y16cgr2fPQ6BYy*fNklu^SArgd{1I3h;S@A;$MBk|YU;y&DMew4^{nKz!B^h=1mOpK~QO2}uGeGTCQn z=EKO~Tu)xxGK<8&dS`BY36PevymbI2G>|}o@xY#xB@SN9u?@zkq5si0(X_~6b z2u3!AnXPDDJKEocuJ^hh1CTF|uUmZJQW`S4NzGvaYk%6zZuWDw3*F^W@A=U0{!w3H zt^`lmAdhh@ANsS0nJ_5AXm!fXJ#Nj|2s-Tvi*_+7dLFRxTS$a?K8CdR`|KDKEi9;? zPiFp@4MohF<2W+7tjbc6nU~-}D-UuS*+eEXa)%NH@x@AuT^{*EVLqu7yyusGuaBH% z>P`rg_O}QqVfDB`P3M3WjL=%{x;3v{p>wS zS)nW|X6F6kw}=vF_rD%RI|Qsfct~bw|{rx3aj+Y#?C6?6rZ7tRGuWs0{-%#JpllA@TqK002ov JPDHLkV1n4;!7=~< diff --git a/res/drawable-xxhdpi/ic_send_sms_white_24dp.png b/res/drawable-xxhdpi/ic_send_sms_white_24dp.png index c0d1416c94246c52852ff4b163d485e82737e229..6ad518c70a4e49a94f89b91b074d4ac41cdba857 100644 GIT binary patch delta 1617 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 DyA-Q! delta 1438 zcmV;P1!4NS3$F{1BYy>UNkl|T5QgTqjeCq@3Ca|m? z6QnVc9F$tPCy2p`h-#Q;O@Q(AA|?lA#90xc4sp5o%5uYr9mtcDau!($U@b~iZJC~6 zCN4z?PAV+X6MsZ<7UeosDR9o6%Ml5)oYR#F4Y zT;sOp!KvXGMv9Vzzf?32ej~J49k6hkm7l%1Q6F)M59lOGOo)R@Gj0p+6 za3(XAX@5M!3uLgKS1F*71C-ItMJ{qlm%eLYss4weFd~U$9CKMpJZbD;Cp*Zao@S16 zgdY0&i+-*tglJ+dx0sQ4x{ZY-l1L_>@HLJ6skk40=0QCS+PIHsqKRe=8`;1n3Mi+H za(<$ZK7Q9^5OtEnSfvI-31tj-v4BOyv7B7Cvww{}G}A&0?euevt6bGBuz%$p!o@0P z_b`zdQb=Vro7qb~`LuG5bDYuWP0CdV*^Co=(_?98h`$-K%u?1tHeupJWrjr-um8Ur64`8v0=37~f zO@Hlrnq`vtW31w4A2+uWMHEp?V}dBaZj;R0e0IBOl+eQ!?ARHims&OnV9;i;`Q!eE z4QUefx=U;cxD#cfp&@*N^}bUj;S`K;u$gLw5N;vaUzLCeYDc`ci|JATZyRF1nUzwr zjo=3lCmHYm_F_ZKOV($2-K+H}@_3mXK7XXi>!Y~O{6FA?&gPQ>&GSs5&!crO&v~{c zp3}pg=9@)jvW|(}cIjc`{`a?gwC`b-&-FG8phw~n$xY0n;Cpvnf1JJ(9Kn(dK}`N(?#>3`AC zd>hZos|K^hBQrfaKtkVmsnk>`a+6z}I#0=;>{Nn#^8Y=3b7a{T_%+3$Yl6}FPiGJjbK#;}tD_Oh3KyrTAV zv*V-$e)CKT@W(A8waVMYJMdGP5APNkHdLsb7CsjTkaLu5XQN2ohKE(>sk;Ox1}4!j zY<`Vs>Vr9|C+0JP3!>m>$8D^UGgT669KaR<^Q+}fl|};O>ya@t3;>(gVSjCSK~3=@ zWgNf^>=LPuOd?dQt%d<4iRLP;3b4(`e6s2+v7rDpUKukD%o_+m7@cnOE44CjB)~&B zuAihduiYC2kiie6shMre2AH6Sd4pHtQGii^QGihZe*klX9pFxnB$P584l!4xtFmt= sF~n?@#{gBRBN7x8mvqexP8N&o-=07*qoM6N<$f-S|cRsaA1 diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml index 041b19e1f..43df1f5dd 100644 --- a/res/layout/conversation_input_panel.xml +++ b/res/layout/conversation_input_panel.xml @@ -211,7 +211,7 @@ android:layout_height="match_parent" android:layout_gravity="center" android:background="@drawable/circle_touch_highlight_background" - android:src="@drawable/ic_add_white_24dp" + android:src="@drawable/ic_attach_white_24dp" android:contentDescription="@string/ConversationActivity_add_attachment" android:nextFocusLeft="@+id/embedded_text_editor" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 44e8df630..5b785e194 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -757,6 +757,7 @@ Show Contacts + Message Delta Chat message Unsecured SMS Unsecured MMS diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java index fa5f81ff1..8d290baa0 100644 --- a/src/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationActivity.java @@ -873,15 +873,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity this.isDefaultSms = isDefaultSms; this.isSecurityInitialized = true; - boolean isMediaMessage = recipient.isMmsGroupRecipient() || attachmentManager.isAttachmentPresent(); - - sendButton.resetAvailableTransports(isMediaMessage); - - if (!isSecureText && !isPushGroupConversation()) sendButton.disableTransport(Type.TEXTSECURE); - if (recipient.isPushGroupRecipient()) sendButton.disableTransport(Type.SMS); - - if (isSecureText || isPushGroupConversation()) sendButton.setDefaultTransport(Type.TEXTSECURE); - else sendButton.setDefaultTransport(Type.SMS); + sendButton.resetAvailableTransports(); + sendButton.setDefaultTransport(Type.TEXTSECURE); calculateCharactersRemaining(); supportInvalidateOptionsMenu(); @@ -1003,7 +996,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private void onSecurityUpdated() { Log.w(TAG, "onSecurityUpdated()"); updateReminders(); - updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId()); } protected void updateReminders() { @@ -1014,11 +1006,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } } - private void updateDefaultSubscriptionId(Optional defaultSubscriptionId) { - Log.w(TAG, "updateDefaultSubscriptionId(" + defaultSubscriptionId.orNull() + ")"); - sendButton.setDefaultSubscriptionId(defaultSubscriptionId); - } - private void initializeViews() { ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar == null) throw new AssertionError(); @@ -1123,7 +1110,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity setBlockedUserState(recipient, isSecureText, isDefaultSms); setGroupShareProfileReminder(recipient); updateReminders(); - updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId()); initializeSecurity(isSecureText, isDefaultSms); invalidateOptionsMenu(); }); diff --git a/src/org/thoughtcrime/securesms/TransportOptions.java b/src/org/thoughtcrime/securesms/TransportOptions.java index 26eb16efc..e2ae76282 100644 --- a/src/org/thoughtcrime/securesms/TransportOptions.java +++ b/src/org/thoughtcrime/securesms/TransportOptions.java @@ -1,17 +1,10 @@ package org.thoughtcrime.securesms; -import android.Manifest; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import org.thoughtcrime.securesms.util.CharacterCalculator; -import org.thoughtcrime.securesms.util.MmsCharacterCalculator; -import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.util.PushCharacterCalculator; -import org.thoughtcrime.securesms.util.SmsCharacterCalculator; -import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat; -import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat; import org.whispersystems.libsignal.util.guava.Optional; import java.util.LinkedList; @@ -27,18 +20,16 @@ public class TransportOptions { private final Context context; private final List enabledTransports; - private Type defaultTransportType = Type.SMS; - private Optional defaultSubscriptionId = Optional.absent(); + private Type defaultTransportType = Type.TEXTSECURE; private Optional selectedOption = Optional.absent(); - public TransportOptions(Context context, boolean media) { + public TransportOptions(Context context) { this.context = context; - this.enabledTransports = initializeAvailableTransports(media); - this.defaultSubscriptionId = new SubscriptionManagerCompat(context).getPreferredSubscriptionId(); + this.enabledTransports = initializeAvailableTransports(); } - public void reset(boolean media) { - List transportOptions = initializeAvailableTransports(media); + public void reset() { + List transportOptions = initializeAvailableTransports(); this.enabledTransports.clear(); this.enabledTransports.addAll(transportOptions); @@ -46,8 +37,7 @@ public class TransportOptions { if (selectedOption.isPresent() && !isEnabled(selectedOption.get())) { setSelectedTransport(null); } else { - this.defaultTransportType = Type.SMS; - this.defaultSubscriptionId = Optional.absent(); + this.defaultTransportType = Type.TEXTSECURE; notifyTransportChangeListeners(); } @@ -61,14 +51,6 @@ public class TransportOptions { } } - public void setDefaultSubscriptionId(Optional subscriptionId) { - this.defaultSubscriptionId = subscriptionId; - - if (!selectedOption.isPresent()) { - notifyTransportChangeListeners(); - } - } - public void setSelectedTransport(@Nullable TransportOption transportOption) { this.selectedOption = Optional.fromNullable(transportOption); notifyTransportChangeListeners(); @@ -81,16 +63,6 @@ public class TransportOptions { public @NonNull TransportOption getSelectedTransport() { if (selectedOption.isPresent()) return selectedOption.get(); - if (defaultSubscriptionId.isPresent()) { - for (TransportOption transportOption : enabledTransports) { - if (transportOption.getType() == defaultTransportType && - (int)defaultSubscriptionId.get() == transportOption.getSimSubscriptionId().or(-1)) - { - return transportOption; - } - } - } - for (TransportOption transportOption : enabledTransports) { if (transportOption.getType() == defaultTransportType) { return transportOption; @@ -120,59 +92,18 @@ public class TransportOptions { this.listeners.add(listener); } - private List initializeAvailableTransports(boolean isMediaMessage) { + private List initializeAvailableTransports() { List results = new LinkedList<>(); - if (isMediaMessage) { - results.addAll(getTransportOptionsForSimCards(context.getString(R.string.ConversationActivity_transport_insecure_mms), - context.getString(R.string.conversation_activity__type_message_mms_insecure), - new MmsCharacterCalculator())); - } else { - results.addAll(getTransportOptionsForSimCards(context.getString(R.string.ConversationActivity_transport_insecure_sms), - context.getString(R.string.conversation_activity__type_message_sms_insecure), - new SmsCharacterCalculator())); - } - - results.add(new TransportOption(Type.TEXTSECURE, R.drawable.ic_send_push_white_24dp, + results.add(new TransportOption(Type.TEXTSECURE, R.drawable.ic_send_sms_white_24dp, context.getResources().getColor(R.color.textsecure_primary), context.getString(R.string.ConversationActivity_transport_signal), - context.getString(R.string.conversation_activity__type_message_push), + context.getString(R.string.conversation_activity__type_message), new PushCharacterCalculator())); return results; } - private @NonNull List getTransportOptionsForSimCards(@NonNull String text, - @NonNull String composeHint, - @NonNull CharacterCalculator characterCalculator) - { - List results = new LinkedList<>(); - SubscriptionManagerCompat subscriptionManager = new SubscriptionManagerCompat(context); - List subscriptions; - - if (Permissions.hasAll(context, Manifest.permission.READ_PHONE_STATE)) { - subscriptions = subscriptionManager.getActiveSubscriptionInfoList(); - } else { - subscriptions = new LinkedList<>(); - } - - if (subscriptions.size() < 2) { - results.add(new TransportOption(Type.SMS, R.drawable.ic_send_sms_white_24dp, - context.getResources().getColor(R.color.grey_600), - text, composeHint, characterCalculator)); - } else { - for (SubscriptionInfoCompat subscriptionInfo : subscriptions) { - results.add(new TransportOption(Type.SMS, R.drawable.ic_send_sms_white_24dp, - context.getResources().getColor(R.color.grey_600), - text, composeHint, characterCalculator, - Optional.of(subscriptionInfo.getDisplayName()), - Optional.of(subscriptionInfo.getSubscriptionId()))); - } - } - - return results; - } - private void notifyTransportChangeListeners() { for (OnTransportChangedListener listener : listeners) { listener.onChange(getSelectedTransport(), selectedOption.isPresent()); diff --git a/src/org/thoughtcrime/securesms/components/SendButton.java b/src/org/thoughtcrime/securesms/components/SendButton.java index 9ef421d2b..8d4bffbe4 100644 --- a/src/org/thoughtcrime/securesms/components/SendButton.java +++ b/src/org/thoughtcrime/securesms/components/SendButton.java @@ -25,26 +25,26 @@ public class SendButton extends ImageButton @SuppressWarnings("unused") public SendButton(Context context) { super(context); - this.transportOptions = initializeTransportOptions(false); + this.transportOptions = initializeTransportOptions(); ViewUtil.mirrorIfRtl(this, getContext()); } @SuppressWarnings("unused") public SendButton(Context context, AttributeSet attrs) { super(context, attrs); - this.transportOptions = initializeTransportOptions(false); + this.transportOptions = initializeTransportOptions(); ViewUtil.mirrorIfRtl(this, getContext()); } @SuppressWarnings("unused") public SendButton(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - this.transportOptions = initializeTransportOptions(false); + this.transportOptions = initializeTransportOptions(); ViewUtil.mirrorIfRtl(this, getContext()); } - private TransportOptions initializeTransportOptions(boolean media) { - TransportOptions transportOptions = new TransportOptions(getContext(), media); + private TransportOptions initializeTransportOptions() { + TransportOptions transportOptions = new TransportOptions(getContext()); transportOptions.addOnTransportChangedListener(this); setOnLongClickListener(this); @@ -71,8 +71,8 @@ public class SendButton extends ImageButton return transportOptions.getSelectedTransport(); } - public void resetAvailableTransports(boolean isMediaMessage) { - transportOptions.reset(isMediaMessage); + public void resetAvailableTransports() { + transportOptions.reset(); } public void disableTransport(TransportOption.Type type) { @@ -83,10 +83,6 @@ public class SendButton extends ImageButton transportOptions.setDefaultTransport(type); } - public void setDefaultSubscriptionId(Optional subscriptionId) { - transportOptions.setDefaultSubscriptionId(subscriptionId); - } - @Override public void onSelected(TransportOption option) { transportOptions.setSelectedTransport(option);