gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-13 05:17:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename callbackevents to topic/subscribers

Browse Source
This commit is contained in:
topjohnwu
2017-08-04 00:12:11 +08:00
parent 2ecbca303b
commit 8e7b8825f5
16 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View File

@@ -15,9 +15,9 @@ import android.widget.Toast;
import com.topjohnwu.magisk.components.Activity;
import com.topjohnwu.magisk.database.SuDatabaseHelper;
import com.topjohnwu.magisk.utils.CallbackEvent;
import com.topjohnwu.magisk.utils.Logger;
import com.topjohnwu.magisk.utils.Shell;
import com.topjohnwu.magisk.utils.Topic;
import com.topjohnwu.magisk.utils.Utils;
import java.util.Locale;
@@ -25,7 +25,7 @@ import java.util.Locale;
import butterknife.BindView;
import butterknife.ButterKnife;
public class SettingsActivity extends Activity implements CallbackEvent.Listener {
public class SettingsActivity extends Activity implements Topic.Subscriber {
@BindView(R.id.toolbar) Toolbar toolbar;
@@ -58,18 +58,18 @@ public class SettingsActivity extends Activity implements CallbackEvent.Listener
}
@Override
public void onTrigger(CallbackEvent event) {
public void onTopicPublished(Topic topic) {
recreate();
}
@Override
public CallbackEvent[] getRegisterEvents() {
return new CallbackEvent[] { getApplicationContext().reloadActivity };
public Topic[] getSubscription() {
return new Topic[] { getApplicationContext().reloadActivity };
}
public static class SettingsFragment extends PreferenceFragment
implements SharedPreferences.OnSharedPreferenceChangeListener,
CallbackEvent.Listener {
Topic.Subscriber {
private SharedPreferences prefs;
private PreferenceScreen prefScreen;
@@ -162,13 +162,13 @@ public class SettingsActivity extends Activity implements CallbackEvent.Listener
public void onResume() {
super.onResume();
prefs.registerOnSharedPreferenceChangeListener(this);
registerEvents();
subscribeTopics();
}
@Override
public void onPause() {
prefs.unregisterOnSharedPreferenceChangeListener(this);
unregisterEvents();
unsubscribeTopics();
super.onPause();
}
@@ -182,7 +182,7 @@ public class SettingsActivity extends Activity implements CallbackEvent.Listener
enabled = prefs.getBoolean("dark_theme", false);
if (magiskManager.isDarkTheme != enabled) {
magiskManager.isDarkTheme = enabled;
magiskManager.reloadActivity.trigger(false);
magiskManager.reloadActivity.publish(false);
}
break;
case "disable":
@@ -243,7 +243,7 @@ public class SettingsActivity extends Activity implements CallbackEvent.Listener
break;
case "locale":
magiskManager.setLocale();
magiskManager.reloadActivity.trigger(false);
magiskManager.reloadActivity.publish(false);
break;
}
setSummary();
@@ -265,13 +265,13 @@ public class SettingsActivity extends Activity implements CallbackEvent.Listener
}
@Override
public void onTrigger(CallbackEvent event) {
public void onTopicPublished(Topic topic) {
setLocalePreference((ListPreference) findPreference("locale"));
}
@Override
public CallbackEvent[] getRegisterEvents() {
return new CallbackEvent[] { magiskManager.localeDone };
public Topic[] getSubscription() {
return new Topic[] { magiskManager.localeDone };
}
}