narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

remove channel discovery from Google Play build flavor

Browse source
This commit is contained in:
Daniel Gultsch 2023-08-08 10:39:36 +02:00
parent 7a9f18f223
commit b4a07d0093
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/services/AbstractQuickConversationsService.java
View file

@ -1,6 +1,7 @@
package eu.siacs.conversations.services;
import android.content.Intent;
import android.os.Build;
import eu.siacs.conversations.BuildConfig;
@ -25,6 +26,10 @@ public abstract class AbstractQuickConversationsService {
return "conversations".equals(BuildConfig.FLAVOR_mode);
}
public static boolean isPlayStoreFlavor() {
return "playstore".equals(BuildConfig.FLAVOR_distribution);
}
public abstract void signalAccountStateChange();
public abstract boolean isSynchronizing();

1
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
View file

@ -134,6 +134,7 @@ public class SettingsActivity extends XmppActivity implements OnSharedPreference
changeOmemoSettingSummary();
if (QuickConversationsService.isQuicksy()
|| QuickConversationsService.isPlayStoreFlavor()
|| Strings.isNullOrEmpty(Config.CHANNEL_DISCOVERY)) {
final PreferenceCategory groupChats =
(PreferenceCategory) mSettingsFragment.findPreference("group_chats");

8
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -323,7 +323,11 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
}
switch (actionItem.getId()) {
case R.id.discover_public_channels:
if (QuickConversationsService.isPlayStoreFlavor()) {
throw new IllegalStateException("Channel discovery is not available on Google Play flavor");
} else {
startActivity(new Intent(this, ChannelDiscoveryActivity.class));
}
break;
case R.id.join_public_channel:
showJoinConferenceDialog(prefilled);
@ -349,6 +353,9 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
final Menu menu = popupMenu.getMenu();
for (int i = 0; i < menu.size(); i++) {
final MenuItem menuItem = menu.getItem(i);
if (QuickConversationsService.isPlayStoreFlavor() && menuItem.getItemId() == R.id.discover_public_channels) {
continue;
}
final SpeedDialActionItem actionItem = new SpeedDialActionItem.Builder(menuItem.getItemId(), menuItem.getIcon())
.setLabel(menuItem.getTitle() != null ? menuItem.getTitle().toString() : null)
.setFabImageTintColor(ContextCompat.getColor(this, R.color.white))
@ -800,6 +807,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
if (grantResults.length > 0)
if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
ScanActivity.onRequestPermissionResult(this, requestCode, grantResults);