CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Move prefs-related activities to prefs package

Browse Source
This commit is contained in:
emanuele-f 2023-03-16 11:13:17 +01:00
parent 065ce710a9
commit 2b87ca5e0d
10 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/AndroidManifest.xml
View File

@ -52,8 +52,8 @@
android:launchMode="singleTop"
android:exported="true" />
<activity
android:name=".activities.EditCtrlPermissions"
android:parentActivityName=".activities.SettingsActivity" />
android:name=".activities.prefs.EditCtrlPermissions"
android:parentActivityName=".activities.prefs.SettingsActivity" />
<activity
android:name=".activities.OnBoardingActivity" />
@ -74,17 +74,17 @@
android:launchMode="singleTop"
android:parentActivityName=".activities.MainActivity"/>
<activity
android:name=".activities.SettingsActivity"
android:name=".activities.prefs.SettingsActivity"
android:launchMode="singleTop"
android:parentActivityName=".activities.MainActivity" />
<activity
android:name=".activities.VpnExemptionsActivity"
android:name=".activities.prefs.VpnExemptionsActivity"
android:launchMode="singleTop"
android:parentActivityName=".activities.SettingsActivity" />
android:parentActivityName=".activities.prefs.SettingsActivity" />
<activity
android:name=".activities.PortMapActivity"
android:name=".activities.prefs.PortMapActivity"
android:launchMode="singleTop"
android:parentActivityName=".activities.SettingsActivity" />
android:parentActivityName=".activities.prefs.SettingsActivity" />
<activity
android:name=".activities.AboutActivity"
android:launchMode="singleTop"

2
app/src/main/java/com/emanuelef/remote_capture/activities/BaseActivity.java
View File

@ -11,7 +11,7 @@ import com.emanuelef.remote_capture.Utils;
import java.util.List;
class BaseActivity extends AppCompatActivity {
public class BaseActivity extends AppCompatActivity {
private boolean mBackAction = false;
@Override

1
app/src/main/java/com/emanuelef/remote_capture/activities/MainActivity.java
View File

@ -61,6 +61,7 @@ import com.emanuelef.remote_capture.BuildConfig;
import com.emanuelef.remote_capture.CaptureHelper;
import com.emanuelef.remote_capture.Log;
import com.emanuelef.remote_capture.MitmReceiver;
import com.emanuelef.remote_capture.activities.prefs.SettingsActivity;
import com.emanuelef.remote_capture.fragments.ConnectionsFragment;
import com.emanuelef.remote_capture.fragments.StatusFragment;
import com.emanuelef.remote_capture.interfaces.AppStateListener;

3
app/src/main/java/com/emanuelef/remote_capture/activities/EditCtrlPermissions.java → app/src/main/java/com/emanuelef/remote_capture/activities/prefs/EditCtrlPermissions.java
View File

@ -17,7 +17,7 @@
* Copyright 2020-21 - Emanuele Faranda
*/
package com.emanuelef.remote_capture.activities;
package com.emanuelef.remote_capture.activities.prefs;
import android.os.Bundle;
import android.view.ActionMode;
import android.view.Menu;
@ -30,6 +30,7 @@ import android.widget.TextView;
import com.emanuelef.remote_capture.PCAPdroid;
import com.emanuelef.remote_capture.R;
import com.emanuelef.remote_capture.activities.BaseActivity;
import com.emanuelef.remote_capture.adapters.CtrlPermissionsAdapter;
import com.emanuelef.remote_capture.model.CtrlPermissions;

5
app/src/main/java/com/emanuelef/remote_capture/activities/PortMapActivity.java → app/src/main/java/com/emanuelef/remote_capture/activities/prefs/PortMapActivity.java
View File

@ -17,12 +17,13 @@
* Copyright 2020-22 - Emanuele Faranda
*/
package com.emanuelef.remote_capture.activities;
package com.emanuelef.remote_capture.activities.prefs;
import android.os.Bundle;
import com.emanuelef.remote_capture.R;
import com.emanuelef.remote_capture.fragments.PortMapFragment;
import com.emanuelef.remote_capture.activities.BaseActivity;
import com.emanuelef.remote_capture.fragments.prefs.PortMapFragment;
public class PortMapActivity extends BaseActivity {
@Override

9
app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java → app/src/main/java/com/emanuelef/remote_capture/activities/prefs/SettingsActivity.java
View File

@ -17,7 +17,7 @@
* Copyright 2020-21 - Emanuele Faranda
*/
package com.emanuelef.remote_capture.activities;
package com.emanuelef.remote_capture.activities.prefs;
import android.content.Context;
import android.content.Intent;
@ -44,8 +44,11 @@ import com.emanuelef.remote_capture.Log;
import com.emanuelef.remote_capture.PCAPdroid;
import com.emanuelef.remote_capture.Utils;
import com.emanuelef.remote_capture.MitmAddon;
import com.emanuelef.remote_capture.fragments.DnsSettings;
import com.emanuelef.remote_capture.fragments.GeoipSettings;
import com.emanuelef.remote_capture.activities.BaseActivity;
import com.emanuelef.remote_capture.activities.MainActivity;
import com.emanuelef.remote_capture.activities.MitmSetupWizard;
import com.emanuelef.remote_capture.fragments.prefs.DnsSettings;
import com.emanuelef.remote_capture.fragments.prefs.GeoipSettings;
import com.emanuelef.remote_capture.model.Prefs;
import com.emanuelef.remote_capture.R;

3
app/src/main/java/com/emanuelef/remote_capture/activities/VpnExemptionsActivity.java → app/src/main/java/com/emanuelef/remote_capture/activities/prefs/VpnExemptionsActivity.java
View File

@ -17,7 +17,7 @@
* Copyright 2020-22 - Emanuele Faranda
*/
package com.emanuelef.remote_capture.activities;
package com.emanuelef.remote_capture.activities.prefs;
import android.content.Context;
import android.content.SharedPreferences;
@ -30,6 +30,7 @@ import androidx.preference.PreferenceManager;
import com.emanuelef.remote_capture.Log;
import com.emanuelef.remote_capture.R;
import com.emanuelef.remote_capture.activities.BaseActivity;
import com.emanuelef.remote_capture.fragments.AppsToggles;
import com.emanuelef.remote_capture.model.AppDescriptor;
import com.emanuelef.remote_capture.model.Prefs;

2
app/src/main/java/com/emanuelef/remote_capture/fragments/DnsSettings.java → app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/DnsSettings.java
View File

@ -17,7 +17,7 @@
* Copyright 2020-22 - Emanuele Faranda
*/
package com.emanuelef.remote_capture.fragments;
package com.emanuelef.remote_capture.fragments.prefs;
import android.os.Bundle;
import androidx.annotation.Nullable;

2
app/src/main/java/com/emanuelef/remote_capture/fragments/GeoipSettings.java → app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/GeoipSettings.java
View File

@ -17,7 +17,7 @@
* Copyright 2020-22 - Emanuele Faranda
*/
package com.emanuelef.remote_capture.fragments;
package com.emanuelef.remote_capture.fragments.prefs;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;

2
app/src/main/java/com/emanuelef/remote_capture/fragments/PortMapFragment.java → app/src/main/java/com/emanuelef/remote_capture/fragments/prefs/PortMapFragment.java
View File

@ -17,7 +17,7 @@
* Copyright 2020-22 - Emanuele Faranda
*/
package com.emanuelef.remote_capture.fragments;
package com.emanuelef.remote_capture.fragments.prefs;
import android.content.Context;
import android.content.SharedPreferences;