BlazeK1ng420/discord-jadx
1
0
Fork 0
forked from Juby210/discord-jadx
Code Issues Pull requests Projects Releases Wiki Activity

102.8 - Beta (102108)

Browse source
This commit is contained in:
Juby210 2021-11-16 01:10:31 +01:00
parent 93fe00f602
commit 0e3a45de24
12 changed files with 42 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -10,8 +10,8 @@ android {
applicationId 'com.discord'
minSdkVersion 21
targetSdkVersion 30
versionCode 102107
versionName "102.7 - Beta"
versionCode 102108
versionName "102.8 - Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

2
app/src/main/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102107" android:versionName="102.7 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102108" android:versionName="102.8 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
<uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>

9
app/src/main/java/com/discord/rtcconnection/RtcConnection.java
View file

@ -41,6 +41,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CopyOnWriteArrayList;
import kotlin.NoWhenBranchMatchedException;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;
@ -89,7 +90,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
public final String f2194c0;
public final String k;
public final String l;
public final List<c> m;
public final CopyOnWriteArrayList<c> m;
public c.a.q.o0.d n;
public boolean o;
public final Backoff p;
@ -539,8 +540,8 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
String uuid = UUID.randomUUID().toString();
m.checkNotNullExpressionValue(uuid, "UUID.randomUUID().toString()");
this.l = uuid;
ArrayList arrayList = new ArrayList();
this.m = arrayList;
CopyOnWriteArrayList<c> copyOnWriteArrayList = new CopyOnWriteArrayList<>();
this.m = copyOnWriteArrayList;
this.p = new Backoff(1000, 10000, 0, false, null, 28, null);
StateChange stateChange = new StateChange(new State.d(false), null);
this.r = stateChange;
@ -566,7 +567,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage
this.H = subscription;
r("Created RtcConnection. GuildID: " + l + " ChannelID: " + j2);
networkMonitor.observeIsConnected().S(1).W(new p(this), new q(this));
arrayList.add(new r(this));
copyOnWriteArrayList.add(new r(this));
this.L = new h0(this);
this.M = new b0(this);
}

14
app/src/main/java/com/discord/stores/StoreChannels.java
View file

@ -160,6 +160,20 @@ public final class StoreChannels extends StoreV2 {
}
}
public final Channel findChannelById(long j) {
if (this.threadsByIdSnapshot.containsKey(Long.valueOf(j))) {
return this.threadsByIdSnapshot.get(Long.valueOf(j));
}
Iterator<T> it = this.channelsByGuildSnapshot.values().iterator();
while (it.hasNext()) {
Map map = (Map) it.next();
if (map.containsKey(Long.valueOf(j))) {
return (Channel) map.get(Long.valueOf(j));
}
}
return null;
}
@StoreThread
public final Channel findChannelByIdInternal$app_productionBetaRelease(long j) {
if (this.threadsById.containsKey(Long.valueOf(j))) {

6
app/src/main/java/com/discord/utilities/channel/ChannelSelector$findAndSet$1.java
View file

@ -25,9 +25,9 @@ public final class ChannelSelector$findAndSet$1 extends o implements Function0<C
@Override // kotlin.jvm.functions.Function0
/* renamed from: invoke */
public final Channel mo1invoke() {
Channel findChannelByIdInternal$app_productionBetaRelease = this.this$0.getStream().getChannels$app_productionBetaRelease().findChannelByIdInternal$app_productionBetaRelease(this.$channelId);
if (findChannelByIdInternal$app_productionBetaRelease != null && PermissionUtils.INSTANCE.hasAccess(findChannelByIdInternal$app_productionBetaRelease, this.this$0.getStream().getPermissions$app_productionBetaRelease().getPermissionsByChannel().get(Long.valueOf(this.$channelId)))) {
return findChannelByIdInternal$app_productionBetaRelease;
Channel findChannelById = this.this$0.getStream().getChannels$app_productionBetaRelease().findChannelById(this.$channelId);
if (findChannelById != null && PermissionUtils.INSTANCE.hasAccess(findChannelById, this.this$0.getStream().getPermissions$app_productionBetaRelease().getPermissionsByChannel().get(Long.valueOf(this.$channelId)))) {
return findChannelById;
}
Context context = this.$context;
if (context != null) {

4
app/src/main/java/com/discord/widgets/chat/input/AppFlexInputViewModel$onGiftButtonClicked$1.java
View file

@ -28,8 +28,8 @@ public final class AppFlexInputViewModel$onGiftButtonClicked$1 extends o impleme
public final boolean invoke(FragmentActivity fragmentActivity) {
m.checkNotNullParameter(fragmentActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
StoreStream.Companion companion = StoreStream.Companion;
Channel findChannelByIdInternal$app_productionBetaRelease = companion.getChannels().findChannelByIdInternal$app_productionBetaRelease(companion.getChannelsSelected().getId());
WidgetSettingsGifting.Companion.launch(fragmentActivity, new Traits.Location((findChannelByIdInternal$app_productionBetaRelease == null || findChannelByIdInternal$app_productionBetaRelease.f() != 0) ? Traits.Location.Page.GUILD_CHANNEL : "DM Channel", Traits.Location.Section.CHANNEL_TEXT_AREA, "Button Icon", "gift", null, 16, null));
Channel findChannelById = companion.getChannels().findChannelById(companion.getChannelsSelected().getId());
WidgetSettingsGifting.Companion.launch(fragmentActivity, new Traits.Location((findChannelById == null || findChannelById.f() != 0) ? Traits.Location.Page.GUILD_CHANNEL : "DM Channel", Traits.Location.Section.CHANNEL_TEXT_AREA, "Button Icon", "gift", null, 16, null));
StoreNotices.markSeen$default(companion.getNotices(), "CHAT_GIFTING_NOTICE", 0, 2, null);
return true;
}

8
app/src/main/java/com/discord/widgets/chat/input/sticker/StickerPickerViewModel.java
View file

@ -1154,12 +1154,12 @@ public class StickerPickerViewModel extends AppViewModel<ViewState> {
public final boolean onStickerSelected(Sticker sticker) {
long id2;
Channel findChannelByIdInternal$app_productionBetaRelease;
Channel findChannelById;
m.checkNotNullParameter(sticker, "sticker");
if ((getViewState() instanceof ViewState.Stickers) && (findChannelByIdInternal$app_productionBetaRelease = this.channelStore.findChannelByIdInternal$app_productionBetaRelease((id2 = this.channelSelectedStore.getId()))) != null) {
if ((getViewState() instanceof ViewState.Stickers) && (findChannelById = this.channelStore.findChannelById((id2 = this.channelSelectedStore.getId()))) != null) {
Long l = this.permissionStore.getPermissionsByChannel().get(Long.valueOf(id2));
boolean hasAccessWrite = PermissionUtils.INSTANCE.hasAccessWrite(findChannelByIdInternal$app_productionBetaRelease, l);
StickerUtils.StickerSendability stickerSendability = StickerUtils.INSTANCE.getStickerSendability(sticker, this.userStore.getMe(), findChannelByIdInternal$app_productionBetaRelease, l);
boolean hasAccessWrite = PermissionUtils.INSTANCE.hasAccessWrite(findChannelById, l);
StickerUtils.StickerSendability stickerSendability = StickerUtils.INSTANCE.getStickerSendability(sticker, this.userStore.getMe(), findChannelById, l);
if (stickerSendability == StickerUtils.StickerSendability.SENDABLE_WITH_PREMIUM) {
this.eventSubject.j.onNext(Event.ShowStickerPremiumUpsell.INSTANCE);
return false;

6
app/src/main/java/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.java
View file

@ -287,9 +287,9 @@ public final class WidgetChannelPinnedMessages extends AppFragment {
public final Observable<Model> get(Context context, long j) {
m.checkNotNullParameter(context, "context");
StoreStream.Companion companion = StoreStream.Companion;
Channel findChannelByIdInternal$app_productionBetaRelease = companion.getChannels().findChannelByIdInternal$app_productionBetaRelease(j);
if (findChannelByIdInternal$app_productionBetaRelease != null) {
Observable<R> Y = companion.getPinnedMessages().observeForChannel(j).Y(new WidgetChannelPinnedMessages$Model$Companion$get$1(findChannelByIdInternal$app_productionBetaRelease, context));
Channel findChannelById = companion.getChannels().findChannelById(j);
if (findChannelById != null) {
Observable<R> Y = companion.getPinnedMessages().observeForChannel(j).Y(new WidgetChannelPinnedMessages$Model$Companion$get$1(findChannelById, context));
m.checkNotNullExpressionValue(Y, "getPinnedMessages().obse… }\n }");
return Y;
}

6
app/src/main/java/com/discord/widgets/guilds/join/ChannelViewHolder.java
View file

@ -44,9 +44,9 @@ public final class ChannelViewHolder extends BaseChannelViewHolder {
textView.setText(channelData.getWelcomeChannel().b());
TextView textView2 = this.binding.e;
m.checkNotNullExpressionValue(textView2, "binding.guildWelcomeChannelName");
Channel findChannelByIdInternal$app_productionBetaRelease = StoreStream.Companion.getChannels().findChannelByIdInternal$app_productionBetaRelease(channelData.getWelcomeChannel().a());
if (findChannelByIdInternal$app_productionBetaRelease != null) {
str = ChannelUtils.c(findChannelByIdInternal$app_productionBetaRelease);
Channel findChannelById = StoreStream.Companion.getChannels().findChannelById(channelData.getWelcomeChannel().a());
if (findChannelById != null) {
str = ChannelUtils.c(findChannelById);
}
textView2.setText(String.valueOf(str));
this.binding.b.setOnClickListener(new ChannelViewHolder$bind$1(channelItem));

2
app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
View file

@ -346,7 +346,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
TextView textView = binding.f;
m.checkNotNullExpressionValue(textView, "appInfoHeader");
String string = getString(R.string.app_information);
textView.setText(string + " - 102.7 - Beta (102107)");
textView.setText(string + " - 102.8 - Beta (102108)");
binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);

6
app/src/main/java/com/discord/widgets/stickers/WidgetStickerSheet.java
View file

@ -56,11 +56,11 @@ public final class WidgetStickerSheet extends AppBottomSheet {
}
public final void show(FragmentManager fragmentManager, Sticker sticker, long j) {
Channel findChannelByIdInternal$app_productionBetaRelease;
Channel findChannelById;
m.checkNotNullParameter(fragmentManager, "fragmentManager");
m.checkNotNullParameter(sticker, "sticker");
if (sticker.k() == StickerType.STANDARD && (findChannelByIdInternal$app_productionBetaRelease = StoreStream.Companion.getChannels().findChannelByIdInternal$app_productionBetaRelease(j)) != null) {
String str = findChannelByIdInternal$app_productionBetaRelease.f() == 0 ? "DM Channel" : Traits.Location.Page.GUILD_CHANNEL;
if (sticker.k() == StickerType.STANDARD && (findChannelById = StoreStream.Companion.getChannels().findChannelById(j)) != null) {
String str = findChannelById.f() == 0 ? "DM Channel" : Traits.Location.Page.GUILD_CHANNEL;
WidgetStickerSheet widgetStickerSheet = new WidgetStickerSheet();
Bundle bundle = new Bundle();
bundle.putSerializable("com.discord.intent.extra.EXTRA_STICKER", sticker);

2
app/src/main/res/values/strings.xml
View file

@ -1505,7 +1505,7 @@
<string name="color_picker_title">Select a color</string>
<string name="color_picker_transparency">Transparency</string>
<string name="color_picker_use_default">Use Default</string>
<string name="res_2131887585_com_crashlytics_android_build_id">f16b366e8d0f446d8dfd549fdec79087</string>
<string name="res_2131887585_com_crashlytics_android_build_id">9829ea7736fa44f496b851ce59dbaf13</string>
<string name="coming_soon">Coming Soon</string>
<string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
<string name="command_accessibility_desc_app_item">{applicationName} application</string>