--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 Tobias Brunner
+ Copyright (C) 2012 Giuliano Grassi
+ Copyright (C) 2012 Ralf Sager
+ Hochschule fuer Technik Rapperswil
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+-->
+<LinearLayout
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:orientation="vertical"
+ android:padding="5dp"
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/profile_username_label"
+ android:textStyle="bold" />
+
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:id="@+id/username"
+ android:enabled="false"
+ android:inputType="none" />
+
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/profile_password_label"
+ android:textStyle="bold" />
+
+ <EditText
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:id="@+id/password"
+ android:inputType="textPassword|textNoSuggestions"
+ android:singleLine="true" />
+
+</LinearLayout>
import android.app.ActionBar;
import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AlertDialog.Builder;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
import android.net.VpnService;
import android.os.AsyncTask;
import android.os.Bundle;
+import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
+import android.view.View;
import android.view.Window;
+import android.widget.EditText;
public class MainActivity extends Activity implements OnVpnProfileSelectedListener
{
{
Intent intent = new Intent(this, CharonVpnService.class);
intent.putExtra(VpnProfileDataSource.KEY_ID, activeProfile.getId());
+ /* submit the password as the profile might not store one */
+ intent.putExtra(VpnProfileDataSource.KEY_PASSWORD, activeProfile.getPassword());
this.startService(intent);
}
break;
public void onVpnProfileSelected(VpnProfile profile)
{
activeProfile = profile;
- prepareVpnService();
+ if (activeProfile.getPassword() == null)
+ {
+ new LoginDialog().show(getFragmentManager(), "LoginDialog");
+ }
+ else
+ {
+ prepareVpnService();
+ }
}
/**
setProgressBarIndeterminateVisibility(false);
}
}
+
+ private class LoginDialog extends DialogFragment
+ {
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState)
+ {
+ LayoutInflater inflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ View view = inflater.inflate(R.layout.login_dialog, null);
+ EditText username = (EditText)view.findViewById(R.id.username);
+ username.setText(activeProfile.getUsername());
+ final EditText password = (EditText)view.findViewById(R.id.password);
+
+ Builder adb = new AlertDialog.Builder(MainActivity.this);
+ adb.setView(view);
+ adb.setTitle(getString(R.string.login_title));
+ adb.setPositiveButton(R.string.login_confirm, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int whichButton)
+ {
+ activeProfile.setPassword(password.getText().toString().trim());
+ prepareVpnService();
+ }
+ });
+ adb.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which)
+ {
+ dismiss();
+ }
+ });
+ return adb.create();
+ }
+ }
}