mirror/openvpn-android
0
0
Fork 0
mirror of https://github.com/schwabe/ics-openvpn.git synced 2024-09-19 19:42:29 +02:00
Code

Add check to start profile when importing to remote Example

Browse Source
This commit is contained in:
Arne Schwabe 2021-10-04 04:18:35 +02:00
parent 650e238b76
commit d54ba7a09d
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
remoteExample/src/main/java/de/blinkt/openvpn/remote/MainFragment.java
View File

@ -20,6 +20,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.TextView;
import android.widget.Toast;
@ -80,7 +81,7 @@ public class MainFragment extends Fragment implements View.OnClickListener, Hand
private void startEmbeddedProfile(boolean addNew, boolean editable)
private void startEmbeddedProfile(boolean addNew, boolean editable, boolean startAfterAdd)
{
try {
InputStream conf;
@ -105,7 +106,9 @@ public class MainFragment extends Fragment implements View.OnClickListener, Hand
if (addNew) {
String name = editable ? "Profile from remote App" : "Non editable profile";
mService.addNewVPNProfile(name, editable, config.toString());
APIVpnProfile profile = mService.addNewVPNProfile(name, editable, config.toString());
mService.startProfile(profile.mUUID);
} else
mService.startVPN(config.toString());
} catch (IOException | RemoteException e) {
@ -276,21 +279,14 @@ public class MainFragment extends Fragment implements View.OnClickListener, Hand
break;
case R.id.addNewProfile:
try {
prepareStartProfile(PROFILE_ADD_NEW);
} catch (RemoteException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
case R.id.addNewProfileEdit:
int action = (v.getId() == R.id.addNewProfile) ? PROFILE_ADD_NEW : PROFILE_ADD_NEW_EDIT;
try {
prepareStartProfile(PROFILE_ADD_NEW_EDIT);
prepareStartProfile(action);
} catch (RemoteException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
default:
break;
}
@ -310,7 +306,7 @@ public class MainFragment extends Fragment implements View.OnClickListener, Hand
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK) {
if(requestCode==START_PROFILE_EMBEDDED)
startEmbeddedProfile(false, false);
startEmbeddedProfile(false, false, false);
if(requestCode==START_PROFILE_BYUUID)
try {
mService.startProfile(mStartUUID);
@ -326,11 +322,12 @@ public class MainFragment extends Fragment implements View.OnClickListener, Hand
}
}
CheckBox startCB = getView().findViewById(R.id.startafterAdding);
if (requestCode == PROFILE_ADD_NEW) {
startEmbeddedProfile(true, false);
startEmbeddedProfile(true, false, startCB.isSelected());
}
else if (requestCode == PROFILE_ADD_NEW_EDIT) {
startEmbeddedProfile(true, true);
startEmbeddedProfile(true, true, startCB.isSelected());
}
}
};

12
remoteExample/src/main/res/layout/fragment_main.xml
View File

@ -47,12 +47,12 @@
android:layout_alignParentLeft="true"
tools:text="TextView" />
<Button
<Button
android:id="@+id/getMyIP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/startVPN"
android:layout_alignParentLeft="true"
android:text="@string/show_my_ip" />
<Button
@ -92,4 +92,12 @@
android:layout_toRightOf="@+id/addNewProfile"
android:text="@string/addNewEdit" />
<CheckBox
android:id="@+id/startafterAdding"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/startembedded"
android:layout_marginTop="4dp"
android:text="@string/start_profile_after_adding" />
</RelativeLayout>

1
remoteExample/src/main/res/values/strings.xml
View File

@ -17,6 +17,7 @@
<string name="start_embedded">Start embedded profile</string>
<string name="addNew">Add new Profile</string>
<string name="addNewEdit">Add editable profile</string>
<string name="start_profile_after_adding">Start profile after adding</string>
</resources>