Skip to content

Commit 1c75a2a

Browse files
author
Anastasia Senyushina
authored
Merge pull request #1579 from microsoft/release/demo_v4.4.0
Use new SDK V4.4.0 in demo app
2 parents 20fb419 + 05f80fb commit 1c75a2a

File tree

6 files changed

+7
-16
lines changed

6 files changed

+7
-16
lines changed

apps/sasquatch/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ dependencies {
8888
projectDependencyImplementation project(':sdk:appcenter-analytics')
8989
projectDependencyImplementation project(':sdk:appcenter-crashes')
9090

91-
def appCenterSdkVersion = "4.3.1"
91+
def appCenterSdkVersion = "4.4.0"
9292
mavenCentralDependencyImplementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
9393
mavenCentralDependencyImplementation "com.microsoft.appcenter:appcenter-crashes:${appCenterSdkVersion}"
9494

apps/sasquatch/src/androidTest/java/com/microsoft/appcenter/sasquatch/activities/AnalyticsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class AnalyticsTest {
4141
/**
4242
* The same setting as SDK that is package private. Module default batching interval.
4343
*/
44-
private static final int DEFAULT_TRIGGER_INTERVAL = 3000;
44+
private static final int DEFAULT_TRIGGER_INTERVAL = 5000;
4545

4646
@Rule
4747
public final ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(MainActivity.class);

apps/sasquatch/src/androidTest/java/com/microsoft/appcenter/sasquatch/activities/utils/EspressoUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
public final class EspressoUtils {
3131

3232
public static final int CHECK_DELAY = 50;
33-
public static final int TOAST_DELAY = 2000;
33+
public static final int TOAST_DELAY = 3000;
3434

3535
private EspressoUtils() {
3636
}

apps/sasquatch/src/main/java/com/microsoft/appcenter/analytics/AnalyticsPrivateHelper.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@ private AnalyticsPrivateHelper() {
1616
}
1717

1818
public static void setListener(AnalyticsListener listener) {
19-
20-
/* TODO Change this when Analytics.setListener is package accessibility in jCenter. */
21-
// Analytics.setListener(listener);
2219
try {
23-
Method method = Analytics.class.getDeclaredMethod("setListener", AnalyticsListener.class);
24-
method.setAccessible(true);
25-
method.invoke(null, listener);
20+
Analytics.setListener(listener);
2621
} catch (Exception e) {
2722
e.printStackTrace();
2823
}

apps/sasquatch/src/main/java/com/microsoft/appcenter/sasquatch/activities/MainActivity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,14 @@ static void startAppCenter(Application application, String startTypeString) {
115115

116116
/* Set session generation value. */
117117
boolean isManualSessionTrackerEnabled = sSharedPreferences.getBoolean(application.getString(R.string.appcenter_analytics_session_tracker_state_key), false);
118-
119-
// TODO uncomment after release
120118
if (isManualSessionTrackerEnabled) {
121-
// Analytics.enableManualSessionTracker();
119+
Analytics.enableManualSessionTracker();
122120
}
123121

124122
/* Set country code. */
125123
String countryCode = MainActivity.sSharedPreferences.getString(application.getString(R.string.country_code_key), null);
126124
if (countryCode != null) {
127-
// TODO uncomment after release
128-
// AppCenter.setCountryCode(countryCode);
125+
AppCenter.setCountryCode(countryCode);
129126
}
130127

131128
/* Set the track explicitly only if we set it in settings, to test the initial public by default at first launch. */

apps/sasquatch/src/main/java/com/microsoft/appcenter/sasquatch/activities/SettingsActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,7 @@ public boolean isEnabled() {
295295

296296
@Override
297297
public boolean onPreferenceClick(Preference preference) {
298-
// TODO uncomment after release
299-
// Analytics.startSession();
298+
Analytics.startSession();
300299
return true;
301300
}
302301
});

0 commit comments

Comments
 (0)