Skip to content

Commit d75256c

Browse files
marcoconti83marcoconti83
committed
Merge branch 'develop' into release
2 parents c11b3d2 + bb69dde commit d75256c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+755
-469
lines changed

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ext {
2222
playServicesVersion = '15.0.1'
2323
audioVersion = System.getenv("AUDIO_VERSION") ?: '1.209.0@aar'
2424
stethoVersion = '1.5.0'
25-
zMessagingVersion = "141.0.2265"
25+
zMessagingVersion = "141.0.2267"
2626
paging_version = "1.0.0"
2727

2828
avsVersion = '4.9.170@aar'
@@ -31,13 +31,13 @@ ext {
3131
avsGroup = 'com.wire'
3232

3333
// proprietary avs artifact configuration
34-
customAvsVersion = '4.9.12@aar'
34+
customAvsVersion = '5.0.7@aar'
3535
customAvsInternalVersion = customAvsVersion
3636
customAvsName = 'avs'
3737
customAvsGroup = 'com.wearezeta.avs'
3838

39-
zMessagingDevVersion = (System.getenv("ZMESSAGING_VERSION") ?: zMessagingVersion) + '-DEV'
40-
zMessagingReleaseVersion = (System.getenv("ZMESSAGING_VERSION") ?: zMessagingVersion) + '@aar'
39+
zMessagingDevVersion = System.getenv("LOCAL_ZMESSAGING_VERSION") ?: ((System.getenv("ZMESSAGING_VERSION") ?: zMessagingVersion) + '-DEV')
40+
zMessagingReleaseVersion = System.getenv("LOCAL_ZMESSAGING_VERSION") ?: ((System.getenv("ZMESSAGING_VERSION") ?: zMessagingVersion) + '@aar')
4141

4242
}
4343

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@
184184
<category android:name="android.intent.category.BROWSABLE" />
185185
<category android:name="android.intent.category.VIEW" />
186186
</intent-filter>
187-
188187
</activity>
189188

190189
<activity

‎app/src/main/java/com/waz/zclient/utils/BackendPicker.java‎

Lines changed: 0 additions & 135 deletions
This file was deleted.

‎app/src/main/res/layout/app_entry_scene.xml‎

Lines changed: 72 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,81 @@
2525
android:layout_height="match_parent"
2626
android:background="@color/teams_background">
2727

28-
<ImageView
29-
android:id="@+id/app_entry_logo_image"
28+
<!-- Wrapper with logo and custom backend info -->
29+
<LinearLayout
3030
android:layout_width="match_parent"
31-
android:layout_height="@dimen/app_entry_logo_height"
32-
android:src="@drawable/wire"
33-
android:tint="@color/teams_headline_text"
31+
android:layout_height="wrap_content"
3432
android:layout_alignParentTop="true"
3533
android:layout_centerHorizontal="true"
36-
android:layout_marginTop="40dp"/>
34+
android:orientation="vertical">
35+
36+
<ImageView
37+
android:id="@+id/app_entry_logo_image"
38+
android:layout_width="match_parent"
39+
android:layout_height="@dimen/app_entry_logo_height"
40+
android:src="@drawable/wire"
41+
android:tint="@color/teams_headline_text"
42+
android:layout_marginTop="40dp"/>
43+
44+
<!-- Wrapper with custom backend hints -->
45+
<LinearLayout
46+
android:id="@+id/app_entry_custom_backend_container"
47+
android:layout_width="match_parent"
48+
android:layout_height="wrap_content"
49+
android:layout_marginTop="40dp"
50+
android:orientation="vertical"
51+
android:visibility="gone">
52+
53+
<com.waz.zclient.ui.text.TypefaceTextView
54+
android:id="@+id/app_entry_custom_backend_title"
55+
android:layout_width="wrap_content"
56+
android:layout_height="wrap_content"
57+
android:layout_gravity="center"
58+
android:layout_marginTop="@dimen/wire__padding__small"
59+
android:gravity="center"
60+
android:textSize="@dimen/wire__text_size__regular"
61+
android:textColor="@color/teams_headline_text"
62+
app:w_font="@string/wire__typeface__medium"
63+
android:text="@string/custom_backend_info_title"/>
64+
65+
<!-- Wrapper with backend server and "show more" -->
66+
<LinearLayout
67+
android:layout_width="wrap_content"
68+
android:layout_height="wrap_content"
69+
android:layout_gravity="center"
70+
android:layout_marginTop="@dimen/wire__padding__8"
71+
android:orientation="horizontal">
72+
73+
<com.waz.zclient.ui.text.TypefaceTextView
74+
android:id="@+id/app_entry_custom_backend_subtitle"
75+
android:layout_width="200dp"
76+
android:layout_height="wrap_content"
77+
android:layout_gravity="center"
78+
android:gravity="center"
79+
android:lines="1"
80+
android:ellipsize="end"
81+
android:textSize="@dimen/wire__text_size__small"
82+
android:textColor="@color/teams_headline_text_pressed"
83+
app:w_font="@string/wire__typeface__medium"/>
84+
85+
<com.waz.zclient.ui.text.TypefaceTextView
86+
android:id="@+id/customBE_show_more_button"
87+
android:layout_width="wrap_content"
88+
android:layout_height="wrap_content"
89+
android:layout_gravity="center"
90+
android:layout_marginStart="@dimen/wire__padding__small"
91+
android:gravity="center"
92+
android:lines="1"
93+
android:textSize="@dimen/wire__text_size__small"
94+
android:textColor="@color/accent_blue"
95+
app:w_font="@string/wire__typeface__medium"
96+
android:text="@string/custom_backend_info_show_more"/>
97+
</LinearLayout>
98+
99+
</LinearLayout>
100+
101+
</LinearLayout>
102+
37103

38104
<!-- Wrapper with: Personal - Pro -->
39105
<LinearLayout

‎app/src/main/res/values/strings.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,6 @@
518518
<string name="pref_about_tos_title">Terms of Use</string>
519519
<string name="pref_about_privacy_policy_title">Privacy Policy</string>
520520
<string name="pref_about_licenses_title">License information</string>
521-
<string name="pref_about_licenses_url">@string/url_third_party_licences</string>
522521
<string name="pref_about_version_title">Version %s</string>
523522
<string name="pref_about_copyright_title">\u00A9 Wire Swiss GmbH</string>
524523

@@ -1294,6 +1293,9 @@
12941293
<string name="reply_message_type_asset">ATTACHMENT</string>
12951294
<string name="reply_message_type_unknown">You cannot see this message.</string>
12961295

1296+
<string name="deep_link_generic_error_title">Invalid link.</string>
1297+
<string name="deep_link_generic_error_message">The link you opened is not valid.</string>
1298+
12971299
<string name="deep_link_conversation_error_title">Wire can\'t open this conversation.</string>
12981300
<string name="deep_link_conversation_error_message">You may not have permission with this account or the person may not be on Wire.</string>
12991301

@@ -1302,6 +1304,26 @@
13021304

13031305
<string name="password_policy_hint">Use at least %1$s characters, with one lowercase letter, one capital letter, a number, and a special character.</string>
13041306

1307+
<!-- Custom Backend -->
1308+
<string name="custom_backend_info_title">Connected to \"%1$s\"</string>
1309+
<string name="custom_backend_info_show_more">SHOW MORE</string>
1310+
1311+
<string name="custom_backend_dialog_ok">OK</string>
1312+
<string name="custom_backend_dialog_cancel">Cancel</string>
1313+
<string name="custom_backend_dialog_connect">Connect</string>
1314+
1315+
<string name="custom_backend_dialog_confirmation_title">Connect to server</string>
1316+
<string name="custom_backend_dialog_confirmation_message">This configuration will connect the app to a third-party server: %1$s</string>
1317+
1318+
<string name="custom_backend_dialog_info_title">You are connected to a third-party server: \"%1$s\"</string>
1319+
1320+
<string name="custom_backend_dialog_network_error_title">The server is not responding</string>
1321+
<string name="custom_backend_dialog_network_error_message">Please check your internet connection, verify the link and try again.</string>
1322+
1323+
<string name="custom_backend_dialog_logged_in_error_title">Can\'t switch servers</string>
1324+
<string name="custom_backend_dialog_logged_in_error_message">You are already logged in.\nTo connect to this server, log out of all accounts and try again.</string>
1325+
1326+
13051327
<!--Two identical strings are needed for German translation-->
13061328
<string name="quote_timestamp_message_time">Original message from %s</string>
13071329
<string name="quote_timestamp_message_date">Original message from %s</string>

‎app/src/main/res/values/strings_no_translate.xml‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -175,36 +175,36 @@
175175
<string translatable="false" name="pref_dev_category_sign_in_account_title">Sign into account</string>
176176
<string translatable="false" name="pref_dev_category_sign_in_account_summary">Sign into another account and switch to that one</string>
177177

178-
<string translatable="false" name="pref_manage_team_url">https://teams.wire.com/login/?utm_source=client_settings&amp;utm_term=android</string>
179-
180-
<string translatable="false" name="pick_user_manage_team_url">https://teams.wire.com/login/?utm_source=client_landing&amp;utm_term=android</string>
181-
182-
<string translatable="false" name="invalid_email_help">https://support.wire.com/hc/en-us/articles/115004082129-My-email-address-is-already-in-use-and-I-cannot-create-an-account-What-can-I-do-</string>
183-
<string translatable="false" name="teams_set_email_about_url">https://support.wire.com/hc/en-us/articles/115004082129</string>
184-
185-
<string translatable="false" name="url_home">https://wire.com</string>
186-
<string translatable="false" name="url_terms_of_service_personal">https://wire.com/legal/terms/personal/</string>
187-
<string translatable="false" name="url_terms_of_service_teams">https://wire.com/legal/terms/teams/</string>
188-
<string translatable="false" name="url_privacy_policy">https://wire.com/legal/privacy/embed/</string>
189-
<string translatable="false" name="url__help">https://support.wire.com</string>
190-
191-
<string translatable="false" name="url_password_reset">https://account.wire.com/forgot/</string>
192-
<string translatable="false" name="url_password_reset_staging">https://wire-account-staging.zinfra.io/forgot/</string>
193-
194-
<string translatable="false" name="url_third_party_licences">https://wire.com/legal/#licenses</string>
195-
<string translatable="false" name="url_otr_learn_why">https://wire.com/privacy/why</string>
196-
<string translatable="false" name="url_otr_learn_how">https://wire.com/privacy/how</string>
197-
<string translatable="false" name="url_otr_decryption_error_1">https://wire.com/privacy/error-1</string>
198-
<string translatable="false" name="url_otr_decryption_error_2">https://wire.com/privacy/error-2</string>
199-
<string translatable="false" name="url_about_teams">https://wire.com/products/pro-secure-team-collaboration/</string>
200-
201-
<string translatable="false" name="url_manage_services">https://teams.wire.com/</string>
202-
<string translatable="false" name="url_manage_services_staging">https://wire-admin-dev.zinfra.io/services/</string>
203-
<string translatable="false" name="usernames__learn_more__link">https://wire.com/support/username/</string>
204-
<string translatable="false" name="pref_support_website_url">https://support.wire.com</string>
205-
<string translatable="false" name="pref_support_contact_url">https://support.wire.com/hc/requests/new</string>
206-
<string translatable="false" name="pref_about_website_url">https://wire.com</string>
207-
178+
<!--
179+
The prefixes |ACCOUNTS|, |TEAMS|, and |WEBSITE| are placeholders for hosts. These are
180+
replaced at runtime with corresponding endpoints defined in the BackendConfig.
181+
Custom whitelabel versions can overwrite these with urls (without prefixes of course).
182+
-->
183+
184+
<string translatable="false" name="url_password_forgot">|ACCOUNTS|/forgot/</string>
185+
186+
<string translatable="false" name="url_pref_manage_team">|TEAMS|/login/?utm_source=client_settings&amp;utm_term=android</string>
187+
<string translatable="false" name="url_start_ui_manage_team">|TEAMS|/login/?utm_source=client_landing&amp;utm_term=android</string>
188+
<string translatable="false" name="url_manage_services">|TEAMS|/services</string>
189+
190+
<string translatable="false" name="url_home">|WEBSITE|</string>
191+
<string translatable="false" name="url_about_website">|WEBSITE|</string>
192+
<string translatable="false" name="url_about_teams">|WEBSITE|/products/pro-secure-team-collaboration/</string>
193+
<string translatable="false" name="url_usernames_learn_more">|WEBSITE|/support/username/</string>
194+
<string translatable="false" name="url_terms_of_service_personal">|WEBSITE|/legal/terms/personal/</string>
195+
<string translatable="false" name="url_terms_of_service_teams">|WEBSITE|/legal/terms/teams/</string>
196+
<string translatable="false" name="url_privacy_policy">|WEBSITE|/legal/privacy/embed/</string>
197+
<string translatable="false" name="url_third_party_licences">|WEBSITE|/legal/#licenses</string>
198+
<string translatable="false" name="url_otr_learn_why">|WEBSITE|/privacy/why</string>
199+
<string translatable="false" name="url_otr_learn_how">|WEBSITE|/privacy/how</string>
200+
<string translatable="false" name="url_otr_decryption_error_1">|WEBSITE|/privacy/error-1</string>
201+
<string translatable="false" name="url_otr_decryption_error_2">|WEBSITE|/privacy/error-2</string>
202+
203+
<string translatable="false" name="url_help">https://support.wire.com</string>
204+
<string translatable="false" name="url_support_website">https://support.wire.com</string>
205+
<string translatable="false" name="url_contact_support">https://support.wire.com/hc/requests/new</string>
206+
<string translatable="false" name="url_invalid_email_help">https://support.wire.com/hc/en-us/articles/115004082129-My-email-address-is-already-in-use-and-I-cannot-create-an-account-What-can-I-do-</string>
207+
<string translatable="false" name="url_teams_set_email_about">https://support.wire.com/hc/en-us/articles/115004082129</string>
208208

209209
</resources>
210210

0 commit comments

Comments
 (0)