awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge branch 'main' into adb/add-transport-list-activity

Browse Source
This commit is contained in:
adb
2025-12-01 23:34:05 +01:00
committed by GitHub
parent 56459e7e7a d4b8e4bafa
commit 7455e56f11
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/EditTransportActivity.java
-5
View File
@@ -36,7 +36,6 @@ import org.thoughtcrime.securesms.connect.DcEventCenter;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.proxy.ProxySettingsActivity;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.IntentUtils;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
@@ -58,8 +57,6 @@ public class EditTransportActivity extends BaseActionBarActivity implements DcEv
PORT,
}
private final DynamicTheme dynamicTheme = new DynamicTheme();
private TextInputEditText emailInput;
private TextInputEditText passwordInput;
@@ -85,7 +82,6 @@ public class EditTransportActivity extends BaseActionBarActivity implements DcEv
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
dynamicTheme.onCreate(this);
rpc = DcHelper.getRpc(this);
accId = DcHelper.getContext(this).getAccountId();
@@ -218,7 +214,6 @@ public class EditTransportActivity extends BaseActionBarActivity implements DcEv
@Override
public void onResume() {
super.onResume();
dynamicTheme.onResume(this);
proxySwitch.setChecked(DcHelper.getInt(this, CONFIG_PROXY_ENABLED) == 1);
}
src/main/java/org/thoughtcrime/securesms/proxy/ProxySettingsActivity.java
-9
View File
@@ -28,7 +28,6 @@ import org.thoughtcrime.securesms.BaseActionBarActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.connect.DcEventCenter;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
@@ -37,14 +36,12 @@ import java.util.LinkedList;
public class ProxySettingsActivity extends BaseActionBarActivity
implements ProxyListAdapter.ItemClickListener, DcEventCenter.DcEventDelegate {
private final DynamicTheme dynamicTheme = new DynamicTheme();
private SwitchCompat proxySwitch;
private ProxyListAdapter adapter;
@Override
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
dynamicTheme.onCreate(this);
setContentView(R.layout.proxy_settings_activity);
ActionBar actionBar = getSupportActionBar();
@@ -89,12 +86,6 @@ public class ProxySettingsActivity extends BaseActionBarActivity
handleOpenProxyUrl();
}
@Override
public void onResume() {
super.onResume();
dynamicTheme.onResume(this);
}
@Override
public void onDestroy() {
super.onDestroy();
src/main/java/org/thoughtcrime/securesms/qr/QrShowActivity.java
-10
View File
@@ -12,14 +12,11 @@ import org.thoughtcrime.securesms.BaseActionBarActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.connect.DcEventCenter;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
public class QrShowActivity extends BaseActionBarActivity {
private final DynamicTheme dynamicTheme = new DynamicTheme();
public final static String CHAT_ID = "chat_id";
DcEventCenter dcEventCenter;
@@ -30,7 +27,6 @@ public class QrShowActivity extends BaseActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
dynamicTheme.onCreate(this);
setContentView(R.layout.activity_qr_show);
fragment = (QrShowFragment)getSupportFragmentManager().findFragmentById(R.id.qrScannerFragment);
@@ -78,12 +74,6 @@ public class QrShowActivity extends BaseActionBarActivity {
return super.onCreateOptionsMenu(menu);
}
@Override
protected void onResume() {
super.onResume();
dynamicTheme.onResume(this);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item);