denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Add disconnect button to dialog if already connected to profile

Browse Source
This commit is contained in:
Tobias Brunner
2017-09-04 10:41:30 +02:00
parent 037b353d2c
commit 1926efadde
1 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/ui/MainActivity.java
+38 -15
View File
@@ -474,30 +474,28 @@ public class MainActivity extends AppCompatActivity implements OnVpnProfileSelec
button = R.string.disconnect; button = R.string.disconnect;
} }
return new AlertDialog.Builder(getActivity()) DialogInterface.OnClickListener connectListener = new DialogInterface.OnClickListener()
.setIcon(icon)
.setTitle(String.format(getString(title), profileInfo.getString(PROFILE_NAME)))
.setMessage(message)
.setPositiveButton(button, new DialogInterface.OnClickListener()
{ {
@Override @Override
public void onClick(DialogInterface dialog, int whichButton) public void onClick(DialogInterface dialog, int which)
{ {
MainActivity activity = (MainActivity)getActivity(); MainActivity activity = (MainActivity)getActivity();
if (profileInfo.getBoolean(PROFILE_DISCONNECT)) activity.startVpnProfile(profileInfo);
}
};
DialogInterface.OnClickListener disconnectListener = new DialogInterface.OnClickListener()
{ {
@Override
public void onClick(DialogInterface dialog, int which)
{
MainActivity activity = (MainActivity)getActivity();
if (activity.mService != null) if (activity.mService != null)
{ {
activity.mService.disconnect(); activity.mService.disconnect();
} }
} }
else };
{ DialogInterface.OnClickListener cancelListener = new DialogInterface.OnClickListener()
activity.startVpnProfile(profileInfo);
}
}
})
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener()
{ {
@Override @Override
public void onClick(DialogInterface dialog, int which) public void onClick(DialogInterface dialog, int which)
@@ -509,7 +507,32 @@ public class MainActivity extends AppCompatActivity implements OnVpnProfileSelec
getActivity().finish(); getActivity().finish();
} }
} }
}).create(); };
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
.setIcon(icon)
.setTitle(String.format(getString(title), profileInfo.getString(PROFILE_NAME)))
.setMessage(message);
if (profileInfo.getBoolean(PROFILE_DISCONNECT))
{
builder.setPositiveButton(button, disconnectListener);
}
else
{
builder.setPositiveButton(button, connectListener);
}
if (profileInfo.getBoolean(PROFILE_RECONNECT))
{
builder.setNegativeButton(R.string.disconnect, disconnectListener);
builder.setNeutralButton(android.R.string.cancel, cancelListener);
}
else
{
builder.setNegativeButton(android.R.string.cancel, cancelListener);
}
return builder.create();
} }
} }