Skip to content

Commit b7a4142

Browse files
Revert "Session Replay: Recording on Android (#3552)"
This reverts commit ad80795.
1 parent beb05db commit b7a4142

File tree

7 files changed

+1
-75
lines changed

7 files changed

+1
-75
lines changed

samples/Sentry.Samples.Maui/MauiProgram.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ public static MauiApp CreateMauiApp()
2525
options.Debug = true;
2626
options.SampleRate = 1.0F;
2727

28-
#if ANDROID
29-
// Currently experimental support is only available on Android
30-
options.Native.ExperimentalOptions.SessionReplay.OnErrorSampleRate = 1.0;
31-
options.Native.ExperimentalOptions.SessionReplay.SessionSampleRate = 1.0;
32-
options.Native.ExperimentalOptions.SessionReplay.MaskAllImages = false;
33-
options.Native.ExperimentalOptions.SessionReplay.MaskAllText = false;
34-
#endif
35-
3628
options.SetBeforeScreenshotCapture((@event, hint) =>
3729
{
3830
Console.WriteLine("screenshot about to be captured.");
@@ -41,6 +33,7 @@ public static MauiApp CreateMauiApp()
4133
return true;
4234
});
4335
})
36+
4437
.ConfigureFonts(fonts =>
4538
{
4639
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");

src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<AndroidLibrary Include="$(SentryAndroidSdkDirectory)sentry-$(SentryAndroidSdkVersion).jar" />
3434
<AndroidLibrary Include="$(SentryAndroidSdkDirectory)sentry-android-core-$(SentryAndroidSdkVersion).aar" />
3535
<AndroidLibrary Include="$(SentryAndroidSdkDirectory)sentry-android-ndk-$(SentryAndroidSdkVersion).aar" />
36-
<AndroidLibrary Include="$(SentryAndroidSdkDirectory)sentry-android-replay-$(SentryAndroidSdkVersion).aar" />
3736
<AndroidLibrary Include="..\..\lib\sentry-android-supplemental\bin\sentry-android-supplemental.jar" />
3837
<AndroidNativeLibrary Include="..\..\lib\sentrysupplemental\bin\arm64-v8a\libsentrysupplemental.so" Abi="arm64-v8a" />
3938
<AndroidNativeLibrary Include="..\..\lib\sentrysupplemental\bin\armeabi-v7a\libsentrysupplemental.so" Abi="armeabi-v7a" />
@@ -54,12 +53,6 @@
5453
Condition="!Exists('$(SentryAndroidSdkDirectory)sentry-android-ndk-$(SentryAndroidSdkVersion).aar')"
5554
Retries="3"
5655
/>
57-
<DownloadFile
58-
SourceUrl="https://repo1.maven.org/maven2/io/sentry/sentry-android-replay/$(SentryAndroidSdkVersion)/sentry-android-replay-$(SentryAndroidSdkVersion).aar"
59-
DestinationFolder="$(SentryAndroidSdkDirectory)"
60-
Condition="!Exists('$(SentryAndroidSdkDirectory)sentry-android-replay-$(SentryAndroidSdkVersion).aar')"
61-
Retries="3"
62-
/>
6356
<DownloadFile
6457
SourceUrl="https://repo1.maven.org/maven2/io/sentry/sentry/$(SentryAndroidSdkVersion)/sentry-$(SentryAndroidSdkVersion).jar"
6558
DestinationFolder="$(SentryAndroidSdkDirectory)"

src/Sentry.Bindings.Android/Transforms/Metadata.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@
118118
<remove-node path="/api/package[@name='io.sentry.android.core']/class[@name='TempSensorBreadcrumbsIntegration']" />
119119
<remove-node path="/api/package[@name='io.sentry.android.core.internal.gestures']" />
120120
<remove-node path="/api/package[@name='io.sentry.android.core.performance']" />
121-
<remove-node path="/api/package[@name='io.sentry.android.replay.viewhierarchy']" />
122-
<remove-node path="/api/package[@name='io.sentry.android.replay.util']" />
123121

124122
<remove-node path="/api/package[starts-with(@name,'io.sentry')]/*/method[@name='clone' and count(parameter)=0]" />
125123
<remove-node path="/api/package[starts-with(@name,'io.sentry')]/class/implements[@name='io.sentry.JsonDeserializer']" />

src/Sentry/Platforms/Android/BindableNativeSentryOptions.cs

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// ReSharper disable once CheckNamespace
2-
32
namespace Sentry;
43

54
internal partial class BindableSentryOptions
@@ -35,20 +34,7 @@ public class NativeOptions
3534
public TimeSpan? ReadTimeout { get; set; }
3635
public bool? EnableTracing { get; set; }
3736
public bool? EnableBeforeSend { get; set; }
38-
public NativeExperimentalOptions ExperimentalOptions { get; set; } = new();
39-
40-
internal class NativeExperimentalOptions
41-
{
42-
public NativeSentryReplayOptions SessionReplay { get; set; } = new();
43-
}
4437

45-
internal class NativeSentryReplayOptions
46-
{
47-
public double? OnErrorSampleRate { get; set; }
48-
public double? SessionSampleRate { get; set; }
49-
public bool RedactAllImages { get; set; }
50-
public bool RedactAllText { get; set; }
51-
}
5238
public void ApplyTo(SentryOptions.NativeOptions options)
5339
{
5440
options.AnrEnabled = AnrEnabled ?? options.AnrEnabled;
@@ -75,21 +61,6 @@ public void ApplyTo(SentryOptions.NativeOptions options)
7561
options.ReadTimeout = ReadTimeout ?? options.ReadTimeout;
7662
options.EnableTracing = EnableTracing ?? options.EnableTracing;
7763
options.EnableBeforeSend = EnableBeforeSend ?? options.EnableBeforeSend;
78-
79-
if (ExperimentalOptions.SessionReplay.OnErrorSampleRate is { } errorSampleRate)
80-
{
81-
#pragma warning disable CA1422
82-
options.ExperimentalOptions.SessionReplay.OnErrorSampleRate = errorSampleRate;
83-
#pragma warning restore CA1422
84-
}
85-
if (ExperimentalOptions.SessionReplay.SessionSampleRate is { } sessionSampleRate)
86-
{
87-
#pragma warning disable CA1422
88-
options.ExperimentalOptions.SessionReplay.SessionSampleRate = sessionSampleRate;
89-
#pragma warning restore CA1422
90-
}
91-
ExperimentalOptions.SessionReplay.RedactAllText = options.ExperimentalOptions.SessionReplay.MaskAllText;
92-
ExperimentalOptions.SessionReplay.RedactAllImages = options.ExperimentalOptions.SessionReplay.MaskAllImages;
9364
}
9465
}
9566
}

src/Sentry/Platforms/Android/NativeOptions.cs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// ReSharper disable once CheckNamespace
2-
32
namespace Sentry;
43

54
public partial class SentryOptions
@@ -261,21 +260,5 @@ public void AddInAppInclude(string prefix)
261260
/// be stripped away during the round-tripping between the two SDKs. Use with caution.
262261
/// </remarks>
263262
public bool EnableBeforeSend { get; set; } = false;
264-
public class NativeExperimentalOptions
265-
{
266-
public NativeSentryReplayOptions SessionReplay { get; set; } = new();
267-
}
268-
269-
public class NativeSentryReplayOptions
270-
{
271-
public double? OnErrorSampleRate { get; set; }
272-
public double? SessionSampleRate { get; set; }
273-
public bool MaskAllImages { get; set; } = true;
274-
public bool MaskAllText { get; set; } = true;
275-
}
276-
/// <summary>
277-
/// ExperimentalOptions
278-
/// </summary>
279-
public NativeExperimentalOptions ExperimentalOptions { get; set; } = new();
280263
}
281264
}

src/Sentry/Platforms/Android/SentrySdk.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,6 @@ private static void InitSentryAndroidSdk(SentryOptions options)
132132
options.Native.InAppExcludes?.ForEach(o.AddInAppExclude);
133133
options.Native.InAppIncludes?.ForEach(o.AddInAppInclude);
134134

135-
o.Experimental.SessionReplay.OnErrorSampleRate =
136-
(JavaDouble?)options.Native.ExperimentalOptions.SessionReplay.OnErrorSampleRate;
137-
o.Experimental.SessionReplay.SessionSampleRate =
138-
(JavaDouble?)options.Native.ExperimentalOptions.SessionReplay.SessionSampleRate;
139-
o.Experimental.SessionReplay.SetMaskAllImages(options.Native.ExperimentalOptions.SessionReplay.MaskAllImages);
140-
o.Experimental.SessionReplay.SetMaskAllText(options.Native.ExperimentalOptions.SessionReplay.MaskAllText);
141-
142135
// These options are intentionally set and not exposed for modification
143136
o.EnableExternalConfiguration = false;
144137
o.EnableDeduplication = false;

test/Sentry.Tests/Platforms/Android/BindableNativeOptionsTests.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ namespace Sentry.Tests.Platforms.Android;
55

66
public class BindableNativeOptionsTests : BindableTests<SentryOptions.NativeOptions>
77
{
8-
public BindableNativeOptionsTests()
9-
: base(nameof(BindableSentryOptions.NativeOptions.ExperimentalOptions))
10-
{
11-
}
12-
138
[Fact]
149
public void BindableProperties_MatchOptionsProperties()
1510
{

0 commit comments

Comments
 (0)