Merge pull request #478 from a93h/master

Should Resolve Most App Compliance Issues
simple-last-fm-scrobbler · Aug 27, 2019 · bd5a389 · bd5a389
2 parents 16f905c + 9b32fec
commit bd5a389
Show file tree

Hide file tree

Showing 63 changed files with 785 additions and 1,013 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,10 +10,10 @@ script: "./gradlew clean assembleDebug"
 
 env:
   global:
-    - ANDROID_API=25
+    - ANDROID_API=26
     - ANDROID_BUILD_TOOLS=28.0.3
     - HIGHEST_API=29
-    - LOWEST_API=9
+    - LOWEST_API=14
 
 android:
   components:

diff --git a/README.md b/README.md
@@ -96,6 +96,8 @@ Before the release of a new version of SLS, it will be available here to test fo
  * Read Notifications to Scrobble Music Also
  * Use Android audio focus detection to manage scrobbling.
  * Slow overhaul of the app to keep simplicity and allow for dynamic feature/functionality addition.
+ * Replace legacy user/pass with OAuth dance
+ * Possibly style intents and notifications similar to [https://github.com/peterjosling/scroball](https://github.com/peterjosling/scroball)
 
 3. #### Core Feature Requests
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 26
     defaultConfig {
         applicationId "com.adam.aslfms"
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 26
         versionCode=49
         versionName="1.5.8"
 
@@ -36,8 +36,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:25.4.0'
-    implementation 'com.android.support:support-compat:25.4.0'
-    implementation 'com.android.support:design:25.4.0'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:support-compat:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
     //compile 'info.guardianproject.netcipher:netcipher:1.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,15 +10,15 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
         android:allowBackup="true"
         android:description="@string/about_text"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
-
-        <!-- the start/launch activity -->
+        <!-- begin the start/launch activity -->
         <activity
             android:name=".SettingsActivity"
             android:icon="@drawable/ic_icon_full"
@@ -29,7 +29,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
+        <!-- end the start/launch activity -->
         <!-- other activities -->
         <activity
             android:name=".UserCredsListActivity"
@@ -75,29 +75,22 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".SettingsActivity" />
         </activity>
-
-        <activity android:name=".AppleMusicOptionsActivity"
-            android:parentActivityName=".SettingsActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".SettingsActivity" />
-        </activity>
-
-        <activity android:name=".ViewCorrectionRulesActivity"
+        <activity
+            android:name=".ViewCorrectionRulesActivity"
             android:parentActivityName=".SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".SettingsActivity" />
         </activity>
-
-        <activity android:name=".ChangeThemeActivity"
+        <activity
+            android:name=".ChangeThemeActivity"
             android:parentActivityName=".SettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".SettingsActivity" />
         </activity>
-
-        <!-- the services -->
+        <!-- end other activities -->
+        <!-- begin the services -->
         <service
             android:name=".service.ScrobblingService"
             android:enabled="true"
@@ -111,30 +104,44 @@
                 <action android:name="com.adam.aslfms.service.copy" />
             </intent-filter>
         </service>
-        <service android:name=".service.NotificationBarService"
+        <service
+            android:name=".service.NotificationBarService"
             android:enabled="true"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.adam.aslfms.service.notificationbarupdate" />
+                <action android:name="com.adam.aslfms.service.notificationwake" />
             </intent-filter>
         </service>
         <service
-            android:name=".service.ForegroundHide"
+            android:name=".service.ControllerReceiverService"
             android:enabled="true"
-            android:exported="true" />
-        <service
-            android:name=".service.applemusic.NotificationService"
-            android:label="AppleNotificationListener"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
-            android:process=":remote"
+            android:exported="true"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService" />
+            </intent-filter>
+        </service>
+        <!-- end the services -->
+        <!-- begin the receivers -->
+                <receiver
+            android:name=".receiver.BootReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.service.notification.NotificationListenerService"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="com.adam.aslfms.notificationreceiver" />
+                <action android:name="com.adam.aslfms.notificationreceiverwake" />
             </intent-filter>
-        </service>
-
-        <!-- the receivers -->
+        </receiver>
+        <receiver
+            android:name=".receiver.GenericControllerReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.adam.aslfms.receiver.controller" />
+            </intent-filter>
+        </receiver>
         <receiver
             android:name=".receiver.AndroidMusicReceiver"
             android:enabled="true"
@@ -322,16 +329,19 @@
                 <action android:name="com.android.mediacenter.metachanged" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".receiver.OrangeSqueezeReceiver"
+        <receiver
+            android:name=".receiver.OrangeSqueezeReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
+
                 <!-- https://www.orangebikelabs.com/products/orangesqueeze/broadcast-intents -->
                 <!-- ISSUE! SEE playername intent, hence, won't be taking the time to track multiple players -->
                 <action android:name="com.orangebikelabs.orangesqueeze.metachanged" />
                 <action android:name="com.orangebikelabs.orangesqueeze.playstatechanged" />
             </intent-filter>
         </receiver>
+        <!-- end the receiver -->
     </application>
 
 </manifest>
diff --git a/app/src/main/assets/changelog.txt b/app/src/main/assets/changelog.txt
@@ -1,8 +1,12 @@
 Visit,
-https://github.com/tgwizard/sls
+https://github.com/simple-last-fm-scrobbler/sls
 For more details.
 
 - 1.5.8 (2018-6-24)
+  * Themes
+  * Many Apps Supported (API 21+)
+  * Notification Listener
+  * Notification Fixes
   * Fixes (thanks to G00fY2)
   * Features (thanks to 4-Eyes)
   * Bugs & Languages fixes thanks to many

diff --git a/app/src/main/java/com/adam/aslfms/AboutDialog.java b/app/src/main/java/com/adam/aslfms/AboutDialog.java
@@ -1,7 +1,7 @@
 /**
  * This file is part of Simple Last.fm Scrobbler.
  * <p>
- * https://github.com/tgwizard/sls
+ * https://github.com/simple-last-fm-scrobbler/sls
  * <p>
  * Copyright 2011 Simple Last.fm Scrobbler Team
  * <p>

diff --git a/app/src/main/java/com/adam/aslfms/AppleMusicOptionsActivity.java b/app/src/main/java/com/adam/aslfms/AppleMusicOptionsActivity.java
diff --git a/app/src/main/java/com/adam/aslfms/EditUserCredentials.java b/app/src/main/java/com/adam/aslfms/EditUserCredentials.java
@@ -1,7 +1,7 @@
 /**
  * This file is part of Simple Last.fm Scrobbler.
  * <p>
- * https://github.com/tgwizard/sls
+ * https://github.com/simple-last-fm-scrobbler/sls
  * <p>
  * Copyright 2011 Simple Last.fm Scrobbler Team
  * <p>

diff --git a/app/src/main/java/com/adam/aslfms/MusicAppsActivity.java b/app/src/main/java/com/adam/aslfms/MusicAppsActivity.java
@@ -1,7 +1,7 @@
 /**
  * This file is part of Simple Last.fm Scrobbler.
  * <p>
- * https://github.com/tgwizard/sls
+ * https://github.com/simple-last-fm-scrobbler/sls
  * <p>
  * Copyright 2011 Simple Last.fm Scrobbler Team
  * <p>

diff --git a/app/src/main/java/com/adam/aslfms/OptionsActivity.java b/app/src/main/java/com/adam/aslfms/OptionsActivity.java
@@ -1,7 +1,7 @@
 /**
  * This file is part of Simple Last.fm Scrobbler.
  * <p/>
- * https://github.com/tgwizard/sls
+ * https://github.com/simple-last-fm-scrobbler/sls
  * <p/>
  * Copyright 2011 Simple Last.fm Scrobbler Team
  * <p/>

diff --git a/app/src/main/java/com/adam/aslfms/SeekBarPreference.java b/app/src/main/java/com/adam/aslfms/SeekBarPreference.java
@@ -1,7 +1,7 @@
 /**
  * This file is part of Simple Last.fm Scrobbler.
  * <p>
- * https://github.com/tgwizard/sls
+ * https://github.com/simple-last-fm-scrobbler/sls
  * <p>
  * Copyright 2011 Simple Last.fm Scrobbler Team
  * <p>