Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit 82ac093

Browse files
kunall17niftynei
authored andcommitted
Show dialog to confirm for http in production builds
1 parent 2ae2c8f commit 82ac093

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

app/src/main/java/com/zulip/android/activities/LoginActivity.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.zulip.android.activities;
22

33
import android.app.ProgressDialog;
4+
import android.content.DialogInterface;
45
import android.content.Intent;
56
import android.content.IntentSender.SendIntentException;
67
import android.net.Uri;
78
import android.os.Bundle;
89
import android.support.v4.app.FragmentActivity;
10+
import android.support.v7.app.AlertDialog;
911
import android.support.v7.app.AppCompatActivity;
1012
import android.support.v7.widget.Toolbar;
1113
import android.util.Log;
@@ -143,6 +145,7 @@ private void checkForError() {
143145
Uri serverUri = Uri.parse(serverURL);
144146

145147
if (!BuildConfig.DEBUG && serverUri.getScheme().equals("http")) { //Production build and not https
148+
showHTTPDialog(serverURL);
146149
} else {
147150
}
148151
}
@@ -163,6 +166,26 @@ private void checkForError() {
163166
mServerEditText.setEnabled(false);
164167
((ZulipApp) getApplication()).setServerURL(serverUri.toString());
165168
return true;
169+
private void showHTTPDialog(final String serverURL) {
170+
new AlertDialog.Builder(this)
171+
.setTitle(R.string.http_or_https)
172+
.setMessage(R.string.http_message)
173+
.setPositiveButton(R.string.use_https, new DialogInterface.OnClickListener() {
174+
public void onClick(DialogInterface dialog, int which) {
175+
dialog.dismiss();
176+
}
177+
})
178+
.setNeutralButton(R.string.use_http, new DialogInterface.OnClickListener() {
179+
public void onClick(DialogInterface dialog, int which) {
180+
dialog.dismiss();
181+
}
182+
})
183+
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
184+
@Override
185+
public void onClick(DialogInterface dialog, int i) {
186+
dialog.dismiss();
187+
}
188+
}).show();
166189
}
167190
168191
private void handleSignInResult(GoogleSignInResult result) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,8 @@
7676
<string name="menu_filter">Filter</string>
7777
<string name="menu_today">Today</string>
7878
<string name="empty_list">Sorry, no messages here.</string>
79+
<string name="http_or_https">HTTP/HTTPS</string>
80+
<string name="http_message">HTTP is insecure, and we recommend using it only for testing the Zulip Android app against a development environment. Are you sure you want to use HTTP?</string>
81+
<string name="use_https">Use HTTPS</string>
82+
<string name="use_http">Use HTTP</string>
7983
</resources>

0 commit comments

Comments
 (0)