mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-03-04 02:38:13 +00:00
Code Issues Releases Wiki Activity

Fixed related search close

Browse source
This commit is contained in:
M66B 2017-07-05 07:02:43 +02:00
parent 994963b281
commit a46f9ec94d
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View file

@ -78,9 +78,6 @@ import com.google.android.gms.ads.AdView;
import com.google.android.gms.ads.MobileAds;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
public class ActivityMain extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Main";
@ -112,6 +109,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
public static final String ACTION_QUEUE_CHANGED = "eu.faircode.netguard.ACTION_QUEUE_CHANGED";
public static final String EXTRA_REFRESH = "Refresh";
public static final String EXTRA_SEARCH = "Search";
public static final String EXTRA_RELATED = "Related";
public static final String EXTRA_APPROVE = "Approve";
public static final String EXTRA_LOGCAT = "Logcat";
public static final String EXTRA_CONNECTED = "Connected";
@ -676,7 +674,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
@Override
public boolean onMenuItemActionCollapse(MenuItem item) {
if (getIntent().hasExtra(EXTRA_SEARCH))
if (getIntent().hasExtra(EXTRA_SEARCH) && !getIntent().getBooleanExtra(EXTRA_RELATED, false))
finish();
return true;
}

1
app/src/main/java/eu/faircode/netguard/AdapterRule.java
View file

@ -439,6 +439,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> im
public void onClick(View view) {
Intent main = new Intent(context, ActivityMain.class);
main.putExtra(ActivityMain.EXTRA_SEARCH, Integer.toString(rule.info.applicationInfo.uid));
main.putExtra(ActivityMain.EXTRA_RELATED, true);
context.startActivity(main);
}
});