Migrate to AndroidX

kaltura · Jan 7, 2019 · 69d34cf · 69d34cf
1 parent 61d0182
commit 69d34cf
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 60 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "com.kaltura.kalturadeviceinfo"
@@ -37,12 +37,12 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.9.3'
     implementation 'com.google.android.exoplayer:exoplayer-dash:2.9.3'
     implementation 'com.google.android.exoplayer:exoplayer-hls:2.9.3'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.3'
 //    compile 'com.google.android.gms:play-services-safetynet:11.6.2'
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.kaltura.kalturadeviceinfo">
 
     <uses-permission
@@ -11,11 +12,12 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
@@ -29,7 +31,7 @@
         </activity>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="com.kaltura.kalturadeviceinfo.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/app/src/main/java/com/kaltura/kalturadeviceinfo/Collector.java b/app/src/main/java/com/kaltura/kalturadeviceinfo/Collector.java
@@ -11,7 +11,7 @@
 import android.media.MediaDrm;
 import android.media.UnsupportedSchemeException;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
@@ -36,7 +36,6 @@
 import java.util.Random;
 import java.util.TimeZone;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -244,16 +243,13 @@ private JSONObject widevineModularDrmInfo() throws JSONException {
 
         final JSONArray mediaDrmEvents = new JSONArray();
 
-        mediaDrm.setOnEventListener(new MediaDrm.OnEventListener() {
-            @Override
-            public void onEvent(@NonNull MediaDrm md, byte[] sessionId, int event, int extra, byte[] data) {
-                try {
-                    String encodedData = data == null ? null : Base64.encodeToString(data, Base64.NO_WRAP);
-
-                    mediaDrmEvents.put(new JSONObject().put("event", event).put("extra", extra).put("data", encodedData));
-                } catch (JSONException e) {
-                    Log.e(TAG, "JSONError", e);
-                }
+        mediaDrm.setOnEventListener((md, sessionId, event, extra, data) -> {
+            try {
+                String encodedData = data == null ? null : Base64.encodeToString(data, Base64.NO_WRAP);
+
+                mediaDrmEvents.put(new JSONObject().put("event", event).put("extra", extra).put("data", encodedData));
+            } catch (JSONException e) {
+                Log.e(TAG, "JSONError", e);
             }
         });
 

diff --git a/app/src/main/java/com/kaltura/kalturadeviceinfo/MainActivity.java b/app/src/main/java/com/kaltura/kalturadeviceinfo/MainActivity.java
@@ -1,21 +1,19 @@
 package com.kaltura.kalturadeviceinfo;
 
-import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.media.MediaDrm;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.RequiresApi;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.FileProvider;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.RequiresApi;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.content.FileProvider;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Base64;
 import android.util.Log;
 import android.view.View;
@@ -36,7 +34,7 @@ public class MainActivity extends AppCompatActivity {
     String report;
 
     private void showReport(String report) {
-        TextView reportView = (TextView) findViewById(R.id.textView);
+        TextView reportView = findViewById(R.id.textView);
         assert reportView != null;
         reportView.setText(report);
     }
@@ -45,21 +43,15 @@ private void showReport(String report) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         // Collect data
         new CollectorTask().execute(false);
 
         FloatingActionButton fab = findViewById(R.id.fab);
         assert fab != null;
-        fab.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                showActionsDialog();
-            }
-        });
+        fab.setOnClickListener(view -> showActionsDialog());
 
     }
 
@@ -111,12 +103,6 @@ private void startProvision() {
         new ProvisionTask(this).execute();
     }
 
-    private void provisionFailed(Exception e) {
-    }
-
-    private void provisionSuccessful() {
-    }
-
     private void shareReport() {
         String subject = "Kaltura Device Info - Report" + Build.BRAND + "/" + Build.MODEL + "/" + Build.VERSION.RELEASE + "/" + Build.VERSION.SDK_INT;
         Intent shareIntent = intentWithText(subject, report);

diff --git a/app/src/main/java/com/kaltura/kalturadeviceinfo/PlayerActivity.java b/app/src/main/java/com/kaltura/kalturadeviceinfo/PlayerActivity.java
@@ -7,11 +7,10 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.app.NavUtils;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
-import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
 
@@ -25,28 +24,20 @@
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.drm.HttpMediaDrmCallback;
 import com.google.android.exoplayer2.drm.UnsupportedDrmException;
-import com.google.android.exoplayer2.source.ExtractorMediaSource;
-import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.dash.DashMediaSource;
 import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.ui.DebugTextViewHelper;
 import com.google.android.exoplayer2.ui.PlayerView;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.util.Util;
 
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.Writer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 /**
  * An example full-screen activity that shows and hides the system UI (i.e.

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -8,28 +8,28 @@
     android:fitsSystemWindows="true"
     tools:context="com.kaltura.kalturadeviceinfo.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         android:src="@android:drawable/ic_menu_more"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/gradle.properties b/gradle.properties
@@ -16,3 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true