mirror/UrlChecker
0
0
Fork 0
mirror of https://github.com/TrianguloY/UrlChecker.git synced 2024-09-19 20:02:16 +02:00
Code

Changed EditFlags logic to one GlobalData per MainDialog instance

Browse Source
This commit is contained in:
Pablo Ortigosa 2023-03-03 20:54:45 +00:00
parent 0881f81f0a
commit cbe7e7a913
6 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/trianguloy/urlchecker/dialogs/MainDialog.java
View File

@ -23,6 +23,7 @@ import com.trianguloy.urlchecker.modules.companions.GlobalData;
import com.trianguloy.urlchecker.url.UrlData;
import com.trianguloy.urlchecker.utilities.AndroidSettings;
import com.trianguloy.urlchecker.utilities.AndroidUtils;
import com.trianguloy.urlchecker.utilities.GlobalDataContainer;
import com.trianguloy.urlchecker.utilities.Inflater;
import java.util.ArrayList;
@ -31,7 +32,7 @@ import java.util.List;
/**
* The main dialog, when opening a url
*/
public class MainDialog extends Activity {
public class MainDialog extends Activity implements GlobalDataContainer {
/**
* Maximum number of updates to avoid loops
@ -123,8 +124,6 @@ public class MainDialog extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
GlobalData.resetInstance();
AndroidSettings.setTheme(this, true);
AndroidSettings.setLocale(this);
requestWindowFeature(Window.FEATURE_NO_TITLE);
@ -249,6 +248,12 @@ public class MainDialog extends Activity {
return null;
}
private final GlobalData gd = new GlobalData();
@Override
public GlobalData getGlobalData() {
return gd;
}
/* ------------------- its a secret! ------------------- */
/**

22
app/src/main/java/com/trianguloy/urlchecker/modules/companions/GlobalData.java
View File

@ -6,26 +6,6 @@ import java.util.HashMap;
import java.util.Map;
public class GlobalData {
// FIXME kill on finish? or even before calling main dialog
private static GlobalData instance = null;
private GlobalData(){
}
public static GlobalData getInstance(){
instance = instance == null ? new GlobalData() : instance;
return instance;
}
// FIXME if URLCheck shares to itself it will reset the previous instance
// maybe create an ID based on the activity object id/memory address
public static void resetInstance(){
instance = null;
}
// ------------------- extra data -------------------
/**
* Any key-value modules can set, will be kept with automatic updates
*/
@ -42,7 +22,7 @@ public class GlobalData {
@Override
public String toString() {
return "GlobalData{" + extraData + '}';
return super.toString()+"{" + extraData + '}';
}
}

4
app/src/main/java/com/trianguloy/urlchecker/modules/list/DebugModule.java
View File

@ -9,9 +9,9 @@ import com.trianguloy.urlchecker.dialogs.MainDialog;
import com.trianguloy.urlchecker.modules.AModuleConfig;
import com.trianguloy.urlchecker.modules.AModuleData;
import com.trianguloy.urlchecker.modules.AModuleDialog;
import com.trianguloy.urlchecker.modules.companions.GlobalData;
import com.trianguloy.urlchecker.services.CustomTabs;
import com.trianguloy.urlchecker.url.UrlData;
import com.trianguloy.urlchecker.utilities.GlobalDataContainer;
import java.util.List;
@ -80,7 +80,7 @@ class DebugDialog extends AModuleDialog {
// show current url data
urlData.toString(),
// show global data
GlobalData.getInstance().toString())
((GlobalDataContainer) getActivity()).getGlobalData().toString())
));
}
}

36
app/src/main/java/com/trianguloy/urlchecker/modules/list/FlagsModule.java
View File

@ -2,7 +2,6 @@ package com.trianguloy.urlchecker.modules.list;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
@ -19,10 +18,10 @@ import com.trianguloy.urlchecker.dialogs.MainDialog;
import com.trianguloy.urlchecker.modules.AModuleConfig;
import com.trianguloy.urlchecker.modules.AModuleData;
import com.trianguloy.urlchecker.modules.AModuleDialog;
import com.trianguloy.urlchecker.modules.companions.GlobalData;
import com.trianguloy.urlchecker.url.UrlData;
import com.trianguloy.urlchecker.utilities.DrawableButtonUtils;
import com.trianguloy.urlchecker.utilities.GenericPref;
import com.trianguloy.urlchecker.utilities.GlobalDataContainer;
import com.trianguloy.urlchecker.utilities.Inflater;
import java.lang.reflect.Field;
@ -107,7 +106,6 @@ class FlagsDialog extends AModuleDialog {
private Collection<String> getDeclaredFlags(){
Collection<String> manualFlags = new ArrayList<>();
// https://github.com/MuntashirAkon/AppManager/blob/19782da4c8556c817ba5795554a1cc21f38af13a/app/src/main/java/io/github/muntashirakon/AppManager/intercept/ActivityInterceptor.java#L92
manualFlags.add("FLAG_GRANT_READ_URI_PERMISSION");
manualFlags.add("FLAG_GRANT_WRITE_URI_PERMISSION");
@ -168,7 +166,7 @@ class FlagsDialog extends AModuleDialog {
flagNameText.setDropDownAnchor(R.id.addFlagLayout);
// FIXME better search, currently it is an autofill, not a search
// FIXME sometimes its hidden behind keyboard
String defaultFlagsStr = defaultFlagsPref.get();
if (defaultFlagsStr != null){
setFlags(toInteger(defaultFlagsStr));
@ -178,7 +176,7 @@ class FlagsDialog extends AModuleDialog {
add.setOnClickListener(v -> {
Integer flag = flagMap.get(flagNameText.getText().toString());
if (flag != null){
setFlags(getParsedFlags() | flag);
setFlags(getFlagsNonNull() | flag);
} else {
Toast.makeText(getActivity(), R.string.mFlags_invalid, Toast.LENGTH_LONG).show();
}
@ -205,7 +203,7 @@ class FlagsDialog extends AModuleDialog {
});
edit.setOnLongClickListener(v -> {
// Resets the flags
setFlags(getActivity().getIntent().getFlags());
setFlags(null);
// Update views
setUrl(getUrl());
return true;
@ -220,7 +218,7 @@ class FlagsDialog extends AModuleDialog {
private void updateLayout(){
box.removeAllViews();
int flags = getParsedFlags();
int flags = getFlagsNonNull();
flagsHexText.setText(toHexString(flags));
List<String> decodedFlags = decodeFlags(flags);
@ -240,7 +238,7 @@ class FlagsDialog extends AModuleDialog {
button.setText(R.string.remove);
// Apply mask to remove flag
button.setOnClickListener(v -> {
setFlags(getParsedFlags() & ~flagMap.get(flag));
setFlags(getFlagsNonNull() & ~flagMap.get(flag));
// Update views
setUrl(getUrl());
});
@ -289,26 +287,34 @@ class FlagsDialog extends AModuleDialog {
* Retrieves the flags from GlobalData, if it is not defined it will return null
* Intended for use in other modules
*/
public static Integer getFlags(){
return toInteger(GlobalData.getInstance().getData(FlagsDialog.FLAGS));
public static Integer getFlagsNullable(GlobalDataContainer instance){
return toInteger(instance.getGlobalData().getData(FlagsDialog.FLAGS));
}
/**
* Loads the flags from GlobalData, if none were found it gets the flags from the intent that
* started this activity
*/
private int getParsedFlags(){
Integer flags = toInteger(GlobalData.getInstance().getData(FLAGS));
private int getFlagsNonNull(){
return getFlagsOrDefault((GlobalDataContainer) getActivity(), getActivity().getIntent().getFlags());
}
/**
* Loads the flags from GlobalData, if none were found it gets the flags from default
* Can be used by other modules
*/
public static int getFlagsOrDefault(GlobalDataContainer instance, int defaultFlags){
Integer flags = toInteger(instance.getGlobalData().getData(FLAGS));
return flags == null?
getActivity().getIntent().getFlags() :
defaultFlags :
flags;
}
/**
* Stores the flags in GlobalData
*/
private void setFlags(int flags){
GlobalData.getInstance().putData(FLAGS, toHexString(flags));
private void setFlags(Integer flags){
((GlobalDataContainer) getActivity()).getGlobalData().putData(FLAGS, flags == null ? null : toHexString(flags));
}
}

4
app/src/main/java/com/trianguloy/urlchecker/modules/list/OpenModule.java
View File

@ -18,11 +18,11 @@ import com.trianguloy.urlchecker.modules.AModuleData;
import com.trianguloy.urlchecker.modules.AModuleDialog;
import com.trianguloy.urlchecker.modules.ModuleManager;
import com.trianguloy.urlchecker.modules.companions.CTabs;
import com.trianguloy.urlchecker.modules.companions.GlobalData;
import com.trianguloy.urlchecker.modules.companions.LastOpened;
import com.trianguloy.urlchecker.url.UrlData;
import com.trianguloy.urlchecker.utilities.AndroidUtils;
import com.trianguloy.urlchecker.utilities.GenericPref;
import com.trianguloy.urlchecker.utilities.GlobalDataContainer;
import com.trianguloy.urlchecker.utilities.PackageUtils;
import com.trianguloy.urlchecker.utilities.UrlUtils;
@ -254,7 +254,7 @@ class OpenDialog extends AModuleDialog {
if (ModuleManager.getEnabledPrefOfModule(new FlagsModule(), getActivity()).get()){
// Get flags from flags module
Integer flags = FlagsDialog.getFlags();
Integer flags = FlagsDialog.getFlagsNullable((GlobalDataContainer) getActivity());
if (flags != null){
intent.setFlags(flags);
}

7
app/src/main/java/com/trianguloy/urlchecker/utilities/GlobalDataContainer.java Normal file
View File

@ -0,0 +1,7 @@
package com.trianguloy.urlchecker.utilities;
import com.trianguloy.urlchecker.modules.companions.GlobalData;
public interface GlobalDataContainer {
GlobalData getGlobalData();
}