Browse Source

Merge pull request #522 from fid-jose/dev

Show realm in HTTP auth dialog
master
Anthony Restaino 8 years ago committed by GitHub
parent
commit
fb84baa956
  1. 4
      app/src/main/java/acr/browser/lightning/view/LightningWebClient.java
  2. 1
      app/src/main/res/values/strings.xml

4
app/src/main/java/acr/browser/lightning/view/LightningWebClient.java

@ -26,6 +26,7 @@ import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@ -127,11 +128,14 @@ public class LightningWebClient extends WebViewClient {
final String host, final String realm) { final String host, final String realm) {
AlertDialog.Builder builder = new AlertDialog.Builder(mActivity); AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
final TextView realmLabel = new TextView(mActivity);
final EditText name = new EditText(mActivity); final EditText name = new EditText(mActivity);
final EditText password = new EditText(mActivity); final EditText password = new EditText(mActivity);
LinearLayout passLayout = new LinearLayout(mActivity); LinearLayout passLayout = new LinearLayout(mActivity);
passLayout.setOrientation(LinearLayout.VERTICAL); passLayout.setOrientation(LinearLayout.VERTICAL);
realmLabel.setText(mActivity.getString(R.string.label_realm, realm));
passLayout.addView(realmLabel);
passLayout.addView(name); passLayout.addView(name);
passLayout.addView(password); passLayout.addView(password);

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

@ -143,6 +143,7 @@
<string name="action_allow">Allow</string> <string name="action_allow">Allow</string>
<string name="action_dont_allow">Don\'t Allow</string> <string name="action_dont_allow">Don\'t Allow</string>
<string name="title_sign_in">Sign In</string> <string name="title_sign_in">Sign In</string>
<string name="label_realm">Server message: %s</string>
<string name="hint_username">Username</string> <string name="hint_username">Username</string>
<string name="hint_password">Password</string> <string name="hint_password">Password</string>
<string name="search_suggestions">Search Suggestions</string> <string name="search_suggestions">Search Suggestions</string>

Loading…
Cancel
Save