thedevstack/PiratX-NoCleanFork
2
0
Fork 0
forked from mirror/monocles_chat
Code Issues 5 Pull requests Wiki Activity

make domain selection available from invitation links

Browse source 
fixes https://github.com/kriztan/Pix-Art-Messenger/issues/505
This commit is contained in:
Christian Schneppe 2020-10-17 09:40:53 +02:00
parent 44a6e801ea
commit 40866a0274
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
View file

@ -73,6 +73,11 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher, Ad
Collections.sort(domains, String::compareToIgnoreCase);
final ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_selectable_list_item, domains);
int defaultServer = adapter.getPosition("blabber.im");
if (this.preAuth != null && domain != null) {
binding.server.setEnabled(false);
binding.useOwn.setEnabled(false);
binding.useOwn.setChecked(true);
}
binding.useOwn.setOnCheckedChangeListener(this);
binding.server.setAdapter(adapter);
binding.server.setSelection(defaultServer);
@ -191,7 +196,9 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher, Ad
}
private void updateFullJidInformation(String username) {
if (this.preAuth == null) {
this.domain = binding.server.getSelectedItem().toString();
}
if (username.trim().isEmpty()) {
binding.fullJid.setVisibility(View.INVISIBLE);
} else {

3
src/main/java/eu/siacs/conversations/ui/ScanActivity.java
View file

@ -75,7 +75,8 @@ public final class ScanActivity extends Activity implements SurfaceTextureListen
private static final long VIBRATE_DURATION = 50L;
private static final long AUTO_FOCUS_INTERVAL_MS = 2500L;
private static boolean DISABLE_CONTINUOUS_AUTOFOCUS = Build.MODEL.equals("GT-I9100") // Galaxy S2
private static boolean DISABLE_CONTINUOUS_AUTOFOCUS =
Build.MODEL.equals("GT-I9100") // Galaxy S2
|| Build.MODEL.equals("SGH-T989") // Galaxy S2
|| Build.MODEL.equals("SGH-T989D") // Galaxy S2 X
|| Build.MODEL.equals("SAMSUNG-SGH-I727") // Galaxy S2 Skyrocket