Merge pull request #784 from Microsoft/release/demo_v1.8.0

Use new SDK in demo app
microsoft · Aug 20, 2018 · 9235a41 · 9235a41
2 parents 4b6c390 + c2a87a8
commit 9235a41
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 293 deletions.
diff --git a/apps/sasquatch/build.gradle b/apps/sasquatch/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     projectDependencyImplementation project(':sdk:appcenter-push')
     projectDependencyImplementation project(':sdk:appcenter-rum')
 
-    def appCenterSdkVersion = "1.7.0"
+    def appCenterSdkVersion = "1.8.0"
     //noinspection GradleDependency
     jcenterDependencyImplementation "com.microsoft.appcenter:appcenter-analytics:${appCenterSdkVersion}"
     //noinspection GradleDependency

diff --git a/...ncy/java/com/microsoft/appcenter/sasquatch/activities/AuthenticationProviderActivity.java b/...ncy/java/com/microsoft/appcenter/sasquatch/activities/AuthenticationProviderActivity.java
diff --git a/...ncy/java/com/microsoft/appcenter/sasquatch/activities/CommonSchemaPropertiesActivity.java b/...ncy/java/com/microsoft/appcenter/sasquatch/activities/CommonSchemaPropertiesActivity.java
diff --git a/...Dependency/java/com/microsoft/appcenter/sasquatch/activities/EventPropertiesActivity.java b/...Dependency/java/com/microsoft/appcenter/sasquatch/activities/EventPropertiesActivity.java
diff --git a/...jcenterDependency/java/com/microsoft/appcenter/sasquatch/activities/MSALoginActivity.java b/...jcenterDependency/java/com/microsoft/appcenter/sasquatch/activities/MSALoginActivity.java
diff --git a/...ities/AuthenticationProviderActivity.java → ...ities/AuthenticationProviderActivity.java b/...ities/AuthenticationProviderActivity.java → ...ities/AuthenticationProviderActivity.java
diff --git a/...ities/CommonSchemaPropertiesActivity.java → ...ities/CommonSchemaPropertiesActivity.java b/...ities/CommonSchemaPropertiesActivity.java → ...ities/CommonSchemaPropertiesActivity.java
@@ -21,9 +21,6 @@
 
 public class CommonSchemaPropertiesActivity extends AppCompatActivity {
 
-    /* TODO Remove this check after SDK release. */
-    static final boolean IS_SUPPORTED = true;
-
     private Spinner mCommonSchemaPropertiesSpinner;
 
     private EditText mCommonSchemaPropertyValue;

diff --git a/apps/sasquatch/src/main/java/com/microsoft/appcenter/sasquatch/activities/EventActivity.java b/apps/sasquatch/src/main/java/com/microsoft/appcenter/sasquatch/activities/EventActivity.java
@@ -78,19 +78,15 @@ public void onClick(View v) {
         mOverrideCommonSchemaButton = findViewById(R.id.override_cs_button);
 
         /* Init override common schema properties button. */
-        if (CommonSchemaPropertiesActivity.IS_SUPPORTED) {
-            mOverrideCommonSchemaButton.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    final Intent intent = new Intent(EventActivity.this, CommonSchemaPropertiesActivity.class);
-                    intent.putExtra(ActivityConstants.EXTRA_TARGET_SELECTED, mTransmissionTargetSpinner.getSelectedItemPosition());
-                    startActivity(intent);
-                }
-            });
-        } else {
-            mOverrideCommonSchemaButton.setVisibility(View.GONE);
-        }
+        mOverrideCommonSchemaButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                final Intent intent = new Intent(EventActivity.this, CommonSchemaPropertiesActivity.class);
+                intent.putExtra(ActivityConstants.EXTRA_TARGET_SELECTED, mTransmissionTargetSpinner.getSelectedItemPosition());
+                startActivity(intent);
+            }
+        });
 
         /* Test start from library. */
         AppCenter.startFromLibrary(this, Analytics.class);
@@ -134,9 +130,7 @@ private void updateButtonStates(AnalyticsTransmissionTarget target) {
         } else {
             mTransmissionEnabledCheckBox.setVisibility(View.VISIBLE);
             mConfigureTargetPropertiesButton.setVisibility(View.VISIBLE);
-            if (CommonSchemaPropertiesActivity.IS_SUPPORTED) {
-                mOverrideCommonSchemaButton.setVisibility(View.VISIBLE);
-            }
+            mOverrideCommonSchemaButton.setVisibility(View.VISIBLE);
             boolean enabled = target.isEnabledAsync().get();
             mTransmissionEnabledCheckBox.setChecked(enabled);
             if (enabled) {

diff --git a/...h/activities/EventPropertiesActivity.java → ...h/activities/EventPropertiesActivity.java b/...h/activities/EventPropertiesActivity.java → ...h/activities/EventPropertiesActivity.java
diff --git a/...asquatch/activities/MSALoginActivity.java → ...asquatch/activities/MSALoginActivity.java b/...asquatch/activities/MSALoginActivity.java → ...asquatch/activities/MSALoginActivity.java
@@ -44,9 +44,6 @@
 
 import static com.microsoft.appcenter.sasquatch.activities.MainActivity.LOG_TAG;
 
-/**
- * TODO move to main source folder after SDK release (and delete jCenter version).
- */
 public class MSALoginActivity extends AppCompatActivity {
 
     private static final String URL_PREFIX = "https://login.live.com/oauth20_";

diff --git a/apps/sasquatch/src/main/java/com/microsoft/appcenter/sasquatch/features/TestFeatures.java b/apps/sasquatch/src/main/java/com/microsoft/appcenter/sasquatch/features/TestFeatures.java
@@ -2,7 +2,6 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 
@@ -20,8 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.microsoft.appcenter.sasquatch.activities.MainActivity.LOG_TAG;
-
 public final class TestFeatures {
 
     private static List<TestFeatureModel> sTestFeatureModels;
@@ -35,14 +32,7 @@ public static void initialize(Activity parentActivity) {
         sTestFeatureModels.add(new TestFeature(R.string.title_event, R.string.description_event, EventActivity.class));
         sTestFeatureModels.add(new TestFeature(R.string.title_page, R.string.description_page, PageActivity.class));
         sTestFeatureModels.add(new TestFeature(R.string.title_generate_page_log, R.string.description_generate_page_log, DummyActivity.class));
-        try {
-            Class<?> authClass = Class.forName("com.microsoft.appcenter.analytics.AuthenticationProvider");
-            if (authClass != null) {
-                sTestFeatureModels.add(new TestFeature(R.string.title_auth, R.string.description_auth, AuthenticationProviderActivity.class));
-            }
-        } catch (Exception e) {
-            Log.i(LOG_TAG, "Authentication not yet available in this flavor.");
-        }
+        sTestFeatureModels.add(new TestFeature(R.string.title_auth, R.string.description_auth, AuthenticationProviderActivity.class));
         sTestFeatureModels.add(new TestFeatureTitle(R.string.crashes_title));
         sTestFeatureModels.add(new TestFeature(R.string.title_crashes, R.string.description_crashes, CrashActivity.class));
         sTestFeatureModels.add(new TestFeature(R.string.title_error, R.string.description_error, ManagedErrorActivity.class));