removed lvl, libs up-to-date, minor fixes

akkalomator · Mar 25, 2018 · a4dc9cb · a4dc9cb
1 parent 5e14a78
commit a4dc9cb
Show file tree

Hide file tree

Showing 33 changed files with 127 additions and 3,098 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "biz.dealnote.messenger"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 40106
-        versionName '4_0_1'
+        versionCode 40200
+        versionName '4_0_2'
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -143,7 +143,6 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.1.9'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation files('libs/YouTubeAndroidPlayerApi.jar')
-    implementation project(':lvl')
     implementation project(':mvpcore')
     implementation 'com.squareup.retrofit2:retrofit:2.2.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.2.0'
@@ -152,7 +151,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
     implementation "com.google.firebase:firebase-crash:$firebaseLibraryVersion"
     implementation "com.google.firebase:firebase-database:$firebaseLibraryVersion"
-    implementation 'com.google.android.exoplayer:exoplayer:2.6.0'
+    implementation 'com.google.android.exoplayer:exoplayer:2.7.1'
     implementation "com.android.support:exifinterface:$supportLibraryVersion"
 }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -199,10 +199,6 @@
             android:launchMode="singleTask"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen" />
 
-        <service
-            android:name=".service.CheckLicenseService"
-            android:exported="false" />
-
         <!-- Profile phone Activity -->
         <!-- Shortcut launcher Activity -->
         <!-- Search interface -->

diff --git a/app/src/main/java/biz/dealnote/messenger/activity/MainActivity.java b/app/src/main/java/biz/dealnote/messenger/activity/MainActivity.java
diff --git a/app/src/main/java/biz/dealnote/messenger/media/exo/ExoEventAdapter.java b/app/src/main/java/biz/dealnote/messenger/media/exo/ExoEventAdapter.java
@@ -13,7 +13,7 @@
  */
 public class ExoEventAdapter implements Player.EventListener {
     @Override
-    public void onTimelineChanged(Timeline timeline, Object manifest) {
+    public void onTimelineChanged(Timeline timeline, Object manifest, int reason) {
 
     }
 

diff --git a/app/src/main/java/biz/dealnote/messenger/player/MusicPlaybackService.java b/app/src/main/java/biz/dealnote/messenger/player/MusicPlaybackService.java
@@ -1242,8 +1242,6 @@ void setDataSource(final String path) {
             intent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, mService.get().getPackageName());
             mService.get().sendBroadcast(intent);
 
-            //return true;
-
             resetBufferPercent();
             mService.get().notifyChange(PLAYSTATE_CHANGED);
         }

diff --git a/app/src/main/java/biz/dealnote/messenger/plugins/AudioPluginConnector.java b/app/src/main/java/biz/dealnote/messenger/plugins/AudioPluginConnector.java
@@ -9,10 +9,11 @@
 
 import biz.dealnote.messenger.exception.NotFoundException;
 import biz.dealnote.messenger.model.Audio;
-import biz.dealnote.messenger.util.Logger;
 import biz.dealnote.messenger.util.Utils;
 import io.reactivex.Single;
 
+import static biz.dealnote.messenger.util.Objects.isNull;
+
 /**
  * Created by admin on 2/3/2018.
  * Phoenix-for-VK
@@ -48,7 +49,14 @@ public Single<List<Audio>> get(int ownerId, int offset) {
                         break;
                     }
 
-                    checkAudioPluginError(cursor);
+                    try {
+                        checkAudioPluginError(cursor);
+                    } catch (Exception e) {
+                        cursor.close();
+                        emitter.onError(e);
+                        return;
+                    }
+
 
                     int audioId = cursor.getInt(cursor.getColumnIndex("audio_id"));
                     int ownerId1 = cursor.getInt(cursor.getColumnIndex("owner_id"));
@@ -91,7 +99,7 @@ private static void checkAudioPluginError(Cursor cursor) throws AudioPluginExcep
 
     @Override
     public Single<String> findAudioUrl(int audioId, int ownerId) {
-        return Single.fromCallable(() -> {
+        return Single.create(emitter -> {
             Uri uri = new Uri.Builder()
                     .scheme("content")
                     .authority(AUTHORITY)
@@ -106,17 +114,16 @@ public Single<String> findAudioUrl(int audioId, int ownerId) {
             if (cursor != null) {
                 while (cursor.moveToNext()) {
                     url = cursor.getString(cursor.getColumnIndex("url"));
-                    Logger.d("Audios", "audioId: " + audioId);
                 }
 
                 cursor.close();
             }
 
-            if(url == null){
-                throw new NotFoundException();
+            if (isNull(url)) {
+                emitter.onError(new NotFoundException());
+            } else {
+                emitter.onSuccess(url);
             }
-
-            return url;
         });
     }
 

diff --git a/app/src/main/java/biz/dealnote/messenger/service/CheckLicenseService.java b/app/src/main/java/biz/dealnote/messenger/service/CheckLicenseService.java
diff --git a/lvl/.gitignore b/lvl/.gitignore
diff --git a/lvl/build.gradle b/lvl/build.gradle
diff --git a/lvl/src/main/AndroidManifest.xml b/lvl/src/main/AndroidManifest.xml
diff --git a/lvl/src/main/java/com/google/android/vending/licensing/AESObfuscator.java b/lvl/src/main/java/com/google/android/vending/licensing/AESObfuscator.java