CHANGELOG v0.0.6-alpha

- fix issues with the installer - add "allow sources"-notice to updater
bttv-android · Feb 18, 2021 · 9b721ff · 9b721ff
1 parent 7680d58
commit 9b721ff
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# BTTV-android ![GitHub](https://img.shields.io/github/license/bttv-android/bttv?style=flat-square) ![bttv version](https://img.shields.io/badge/current%20version-v0.0.5-blue?style=flat-square) ![build on](https://img.shields.io/badge/build%20on-v10.1.0-blueviolet?style=flat-square)
+# BTTV-android ![GitHub](https://img.shields.io/github/license/bttv-android/bttv?style=flat-square) ![bttv version](https://img.shields.io/badge/current%20version-v0.0.6-blue?style=flat-square) ![build on](https://img.shields.io/badge/build%20on-v10.1.0-blueviolet?style=flat-square)
 
 A mod of the Twitch Android Mobile App adding BetterTTV and FrankerFaceZ emotes
 

diff --git a/monke.patch b/monke.patch
@@ -1,37 +1,41 @@
 diff --git a/AndroidManifest.xml b/AndroidManifest.xml
-index 471846e9e..25c110206 100644
+index 471846e9e..5bb1d0d4f 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
 @@ -1,2 +1,2 @@
 -<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="tv.twitch.android.app" platformBuildVersionCode="29" platformBuildVersionName="10">
-+<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android"  android:versionCode="0051000010" android:versionName="0.0.5-alpha" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="tv.twitch.bttvandroid.app" platformBuildVersionCode="29" platformBuildVersionName="10">
++<?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android"  android:versionCode="0061000010" android:versionName="0.0.6-alpha" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="tv.twitch.bttvandroid.app" platformBuildVersionCode="29" platformBuildVersionName="10">
      <uses-feature android:name="android.hardware.type.pc" android:required="false"/>
-@@ -115,3 +115,3 @@
+@@ -9,2 +9,3 @@
+     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
++    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:required="false"/>
+@@ -115,3 +116,3 @@
          <service android:name="tv.twitch.android.shared.app.indexing.AppIndexingUpdateService" android:permission="android.permission.BIND_JOB_SERVICE"/>
 -        <provider android:authorities="tv.twitch.android.app.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
 +        <provider android:authorities="tv.twitch.bttvandroid.app.provider" android:exported="false" android:grantUriPermissions="true" android:name="androidx.core.content.FileProvider">
              <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
-@@ -172,3 +172,3 @@
+@@ -172,3 +173,3 @@
          <activity android:exported="false" android:name="com.google.android.gms.common.api.GoogleApiActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
 -        <provider android:authorities="tv.twitch.android.app.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
 +        <provider android:authorities="tv.twitch.bttvandroid.app.firebaseinitprovider" android:directBootAware="true" android:exported="false" android:initOrder="100" android:name="com.google.firebase.provider.FirebaseInitProvider"/>
          <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementReceiver"/>
-@@ -176,3 +176,3 @@
+@@ -176,3 +177,3 @@
          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
 -        <provider android:authorities="tv.twitch.android.app.mobileadsinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.android.gms.ads.MobileAdsInitProvider"/>
 +        <provider android:authorities="tv.twitch.bttvandroid.app.mobileadsinitprovider" android:exported="false" android:initOrder="100" android:name="com.google.android.gms.ads.MobileAdsInitProvider"/>
          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.ads.AdService"/>
-@@ -200,3 +200,3 @@
+@@ -200,3 +201,3 @@
          <service android:exported="false" android:name="com.amazon.avod.identity.AVODMAPBroadcastProcessingJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
 -        <provider android:authorities="tv.twitch.android.app.mlsInitializationProvider" android:enabled="true" android:exported="false" android:name="com.amazon.mls.config.internal.sushi.background.ProcessLifecycleTrackerInitialization"/>
 +        <provider android:authorities="tv.twitch.bttvandroid.app.mlsInitializationProvider" android:enabled="true" android:exported="false" android:name="com.amazon.mls.config.internal.sushi.background.ProcessLifecycleTrackerInitialization"/>
          <service android:name="com.amazon.mls.config.internal.sushi.uploader.BackupUploaderService" android:permission="android.permission.BIND_JOB_SERVICE"/>
-@@ -207,2 +207,10 @@
+@@ -207,2 +208,10 @@
          <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
 +        <activity android:name="bttv.UpdaterActivity" />
 +        <provider 
 +            android:name="androidx.core.content.FileProvider"
-+            android:authorities="tv.twitch.bttv-android.app.provider"
++            android:authorities="tv.twitch.bttvandroid.app.provider"
 +            android:exported="false"
 +            android:grantUriPermissions="true" >
 +            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths"></meta-data>
@@ -111,10 +115,10 @@ HcmV?d00001
 
 diff --git a/res/layout/bttv_updater_activity.xml b/res/layout/bttv_updater_activity.xml
 new file mode 100644
-index 000000000..631e667f1
+index 000000000..f74a60e25
 --- /dev/null
 +++ b/res/layout/bttv_updater_activity.xml
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,59 @@
 +<?xml version="1.0" encoding="utf-8"?>
 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 +    xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -130,7 +134,7 @@ index 000000000..631e667f1
 +        android:layout_height="wrap_content"
 +        android:layout_marginStart="20dp"
 +        android:layout_marginLeft="20dp"
-+        android:layout_marginTop="20dp"
++        android:layout_marginTop="30dp"
 +        android:layout_marginEnd="20dp"
 +        android:layout_marginRight="20dp"
 +        android:layout_marginBottom="5dp"
@@ -139,6 +143,18 @@ index 000000000..631e667f1
 +        android:textStyle="bold" />
 +
 +    <TextView
++        android:layout_width="match_parent"
++        android:layout_height="wrap_content"
++        android:layout_marginStart="20dp"
++        android:layout_marginLeft="20dp"
++        android:layout_marginTop="10dp"
++        android:layout_marginEnd="20dp"
++        android:layout_marginRight="20dp"
++        android:layout_marginBottom="5dp"
++        android:text="If this is the first time you use the updater, allow  installations from this source when the wizard asks you for it."
++        android:textStyle="italic" />
++
++    <TextView
 +        android:id="@+id/bttv_updater_activity_body"
 +        android:layout_width="match_parent"
 +        android:layout_height="0dp"
@@ -163,12 +179,12 @@ index 000000000..631e667f1
 +        android:layout_marginBottom="30dp" />
 +</LinearLayout>
 diff --git a/res/layout/settings_logout_footer.xml b/res/layout/settings_logout_footer.xml
-index e5846b005..8cee35daa 100644
+index e5846b005..b14268886 100644
 --- a/res/layout/settings_logout_footer.xml
 +++ b/res/layout/settings_logout_footer.xml
 @@ -4,2 +4,3 @@
      <ImageView android:layout_gravity="center_horizontal" android:id="@id/app_settings_icon" android:padding="@dimen/default_margin" android:layout_width="@dimen/settings_footer_logo_size" android:layout_height="@dimen/settings_footer_logo_size" android:src="@drawable/ic_twitch_glitch_uv" />
-+    <TextView android:textColor="@color/text_alt" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="BTTV v0.0.5" />
++    <TextView android:textColor="@color/text_alt" android:gravity="center" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="BTTV v0.0.6" />
      <TextView android:textColor="@color/text_alt" android:gravity="center" android:id="@id/app_settings_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/version_label" />
 diff --git a/res/mipmap-anydpi-v26/ic_launcher.xml b/res/mipmap-anydpi-v26/ic_launcher.xml
 index 3b06a9d16..202eb42e8 100644

diff --git a/source/bttv/Data.java b/source/bttv/Data.java
@@ -10,7 +10,7 @@
 import android.util.Log;
 
 public class Data {
-    public static final String bttvVersion = "v0.0.5-alpha";
+    public static final String bttvVersion = "v0.0.6-alpha";
 
     public static int currentBroadcasterId = -1;
     public static Context ctx;

diff --git a/source/bttv/UpdaterActivity.java b/source/bttv/UpdaterActivity.java
@@ -80,8 +80,8 @@ public void run() {
                     sink.writeAll(response.body().source());
                     sink.close();
 
-                    Intent intent = new Intent("android.intent.action.VIEW");
-                    Uri uri = FileProvider.getUriForFile(UpdaterActivity.this, "tv.twitch.bttv-android.app.provider",
+                    Intent intent = new Intent("android.intent.action.INSTALL_PACKAGE");
+                    Uri uri = FileProvider.getUriForFile(UpdaterActivity.this, "tv.twitch.bttvandroid.app.provider",
                             downloadedFile);
                     intent.setDataAndType(uri, "application/vnd.android.package-archive");
                     intent.setFlags(0x10000001);