mirror of
https://github.com/playmusicexporter/playmusicexporter
synced 2024-04-29 01:16:42 +00:00
Added countly for crash reporting/analytics. Updated library versions.
This commit is contained in:
parent
2f7369abd8
commit
a76cf7e3e4
|
@ -27,7 +27,7 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:2.3.0'
|
classpath 'com.android.tools.build:gradle:2.4.0-alpha3'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
#Sun Jan 22 21:19:51 CET 2017
|
#Tue Mar 28 12:22:37 CEST 2017
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
|
||||||
|
|
|
@ -24,6 +24,16 @@
|
||||||
|
|
||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
|
|
||||||
|
buildscript {
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
url "http://dl.bintray.com/countly/maven"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 25
|
compileSdkVersion 25
|
||||||
buildToolsVersion "25.0.2"
|
buildToolsVersion "25.0.2"
|
||||||
|
@ -58,9 +68,10 @@ dependencies {
|
||||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
compile project(':framework')
|
compile project(':framework')
|
||||||
compile project(':playmusiclib')
|
compile project(':playmusiclib')
|
||||||
compile 'com.android.support:appcompat-v7:25.2.0'
|
compile 'com.android.support:appcompat-v7:25.3.1'
|
||||||
compile 'com.android.support:support-v4:25.2.0'
|
compile 'com.android.support:support-v4:25.3.1'
|
||||||
compile 'com.android.support:design:25.2.0'
|
compile 'com.android.support:design:25.3.1'
|
||||||
compile 'com.android.support:support-vector-drawable:25.2.0'
|
compile 'com.android.support:support-vector-drawable:25.3.1'
|
||||||
compile 'com.github.paolorotolo:appintro:4.1.0'
|
compile 'com.github.paolorotolo:appintro:4.1.0'
|
||||||
|
compile 'ly.count.android:sdk:16.12.2'
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,8 +24,9 @@
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK"/>
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
|
@ -51,7 +52,7 @@
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".activities.Intro"
|
android:name=".activities.Intro"
|
||||||
android:label="Play Music Exporter Intro"/>
|
android:label="Play Music Exporter Intro" />
|
||||||
|
|
||||||
<service android:name=".services.ExportService" />
|
<service android:name=".services.ExportService" />
|
||||||
<service android:name=".services.ExportAllService" />
|
<service android:name=".services.ExportAllService" />
|
||||||
|
|
|
@ -43,9 +43,10 @@ import android.widget.EditText;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import de.arcus.framework.logger.Logger;
|
import de.arcus.framework.logger.Logger;
|
||||||
import de.arcus.framework.crashhandler.CrashHandler;
|
|
||||||
import de.arcus.playmusiclib.exceptions.CouldNotOpenDatabaseException;
|
import de.arcus.playmusiclib.exceptions.CouldNotOpenDatabaseException;
|
||||||
import de.arcus.playmusiclib.exceptions.NoSuperUserException;
|
import de.arcus.playmusiclib.exceptions.NoSuperUserException;
|
||||||
|
import ly.count.android.sdk.Countly;
|
||||||
|
import ly.count.android.sdk.DeviceId;
|
||||||
import re.jcg.playmusicexporter.R;
|
import re.jcg.playmusicexporter.R;
|
||||||
import re.jcg.playmusicexporter.fragments.MusicTrackListFragment;
|
import re.jcg.playmusicexporter.fragments.MusicTrackListFragment;
|
||||||
import re.jcg.playmusicexporter.fragments.MusicContainerListFragment;
|
import re.jcg.playmusicexporter.fragments.MusicContainerListFragment;
|
||||||
|
@ -108,8 +109,9 @@ public class MusicContainerListActivity extends AppCompatActivity
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
//Adds the crash handler to this class
|
Countly.sharedInstance().init(this, getString(R.string.countly_url), getString(R.string.countly_token), null, DeviceId.Type.OPEN_UDID);
|
||||||
CrashHandler.addCrashHandler(this);
|
Countly.sharedInstance().enableCrashReporting();
|
||||||
|
|
||||||
|
|
||||||
PlayMusicExporterPreferences.init(this);
|
PlayMusicExporterPreferences.init(this);
|
||||||
if (!PlayMusicExporterPreferences.getSetupDone()) {
|
if (!PlayMusicExporterPreferences.getSetupDone()) {
|
||||||
|
@ -195,11 +197,11 @@ public class MusicContainerListActivity extends AppCompatActivity
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Loads the PlayMusicExporter lib and shows the list
|
* Loads the PlayMusicExporter lib and shows the list
|
||||||
*/
|
*/
|
||||||
private void loadPlayMusicExporter()
|
private void loadPlayMusicExporter() {
|
||||||
{
|
|
||||||
// Gets the running instance
|
// Gets the running instance
|
||||||
mPlayMusicManager = PlayMusicManager.getInstance();
|
mPlayMusicManager = PlayMusicManager.getInstance();
|
||||||
|
|
||||||
|
@ -261,7 +263,7 @@ public class MusicContainerListActivity extends AppCompatActivity
|
||||||
MusicContainerListFragment musicTrackListFragment = (MusicContainerListFragment) getSupportFragmentManager()
|
MusicContainerListFragment musicTrackListFragment = (MusicContainerListFragment) getSupportFragmentManager()
|
||||||
.findFragmentById(R.id.fragment_main);
|
.findFragmentById(R.id.fragment_main);
|
||||||
|
|
||||||
switch(mViewType) {
|
switch (mViewType) {
|
||||||
case Album:
|
case Album:
|
||||||
// Load all albums to the list
|
// Load all albums to the list
|
||||||
AlbumDataSource dataSourceAlbum = new AlbumDataSource(mPlayMusicManager);
|
AlbumDataSource dataSourceAlbum = new AlbumDataSource(mPlayMusicManager);
|
||||||
|
@ -331,24 +333,21 @@ public class MusicContainerListActivity extends AppCompatActivity
|
||||||
MenuItem itemRefreshLibrary = menu.findItem(R.id.action_refresh);
|
MenuItem itemRefreshLibrary = menu.findItem(R.id.action_refresh);
|
||||||
itemRefreshLibrary.setOnMenuItemClickListener(item ->
|
itemRefreshLibrary.setOnMenuItemClickListener(item ->
|
||||||
{
|
{
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
mPlayMusicManager.reloadDatabase();
|
mPlayMusicManager.reloadDatabase();
|
||||||
mPlayMusicManager = null;
|
mPlayMusicManager = null;
|
||||||
loadPlayMusicExporter();
|
loadPlayMusicExporter();
|
||||||
Toast.makeText( this, R.string.database_reloaded, Toast.LENGTH_SHORT).show();
|
Toast.makeText(this, R.string.database_reloaded, Toast.LENGTH_SHORT).show();
|
||||||
}
|
} catch (NoSuperUserException | CouldNotOpenDatabaseException e) {
|
||||||
catch (NoSuperUserException | CouldNotOpenDatabaseException e)
|
Toast.makeText(this, R.string.dialog_superuser_access_denied_title, Toast.LENGTH_SHORT).show();
|
||||||
{
|
|
||||||
Toast.makeText( this, R.string.dialog_superuser_access_denied_title, Toast.LENGTH_SHORT).show();
|
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
// Finds the search item and create the search view
|
// Finds the search item and create the search view
|
||||||
MenuItem itemSearch = menu. findItem(R.id.action_search);
|
MenuItem itemSearch = menu.findItem(R.id.action_search);
|
||||||
mSearchView = (SearchView)MenuItemCompat.getActionView(itemSearch);
|
mSearchView = (SearchView) MenuItemCompat.getActionView(itemSearch);
|
||||||
|
|
||||||
if (mSearchView != null) {
|
if (mSearchView != null) {
|
||||||
// Sets the search listener
|
// Sets the search listener
|
||||||
|
@ -376,4 +375,16 @@ public class MusicContainerListActivity extends AppCompatActivity
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStart() {
|
||||||
|
super.onStart();
|
||||||
|
Countly.sharedInstance().onStart(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onStop() {
|
||||||
|
Countly.sharedInstance().onStop();
|
||||||
|
super.onStop();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import android.util.Log;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import ly.count.android.sdk.Countly;
|
||||||
import re.jcg.playmusicexporter.settings.PlayMusicExporterPreferences;
|
import re.jcg.playmusicexporter.settings.PlayMusicExporterPreferences;
|
||||||
import re.jcg.playmusicexporter.utils.MusicPathBuilder;
|
import re.jcg.playmusicexporter.utils.MusicPathBuilder;
|
||||||
import de.arcus.playmusiclib.PlayMusicManager;
|
import de.arcus.playmusiclib.PlayMusicManager;
|
||||||
|
@ -75,6 +76,7 @@ public class ExportAllService extends IntentService {
|
||||||
try {
|
try {
|
||||||
if (lPlayMusicManager.exportMusicTrack(lTrack, lUri, lPath, PlayMusicExporterPreferences.getFileOverwritePreference())) {
|
if (lPlayMusicManager.exportMusicTrack(lTrack, lUri, lPath, PlayMusicExporterPreferences.getFileOverwritePreference())) {
|
||||||
Log.i(TAG, "Exported Music Track: " + getStringForTrack(lTrack));
|
Log.i(TAG, "Exported Music Track: " + getStringForTrack(lTrack));
|
||||||
|
Countly.sharedInstance().recordEvent("Exported Song", 1);
|
||||||
} else {
|
} else {
|
||||||
Log.i(TAG, "Failed to export Music Track: " + getStringForTrack(lTrack));
|
Log.i(TAG, "Failed to export Music Track: " + getStringForTrack(lTrack));
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,6 +31,7 @@ import android.os.Bundle;
|
||||||
import android.support.v4.app.NotificationCompat;
|
import android.support.v4.app.NotificationCompat;
|
||||||
|
|
||||||
import de.arcus.framework.logger.Logger;
|
import de.arcus.framework.logger.Logger;
|
||||||
|
import ly.count.android.sdk.Countly;
|
||||||
import re.jcg.playmusicexporter.R;
|
import re.jcg.playmusicexporter.R;
|
||||||
import de.arcus.playmusiclib.PlayMusicManager;
|
import de.arcus.playmusiclib.PlayMusicManager;
|
||||||
import de.arcus.playmusiclib.datasources.MusicTrackDataSource;
|
import de.arcus.playmusiclib.datasources.MusicTrackDataSource;
|
||||||
|
@ -200,7 +201,9 @@ public class ExportService extends IntentService {
|
||||||
updateNotification();
|
updateNotification();
|
||||||
|
|
||||||
// Exports the song
|
// Exports the song
|
||||||
if(!playMusicManager.exportMusicTrack(mTrackCurrent, uri, path, PlayMusicExporterPreferences.getFileOverwritePreference())) {
|
if (playMusicManager.exportMusicTrack(mTrackCurrent, uri, path, PlayMusicExporterPreferences.getFileOverwritePreference())) {
|
||||||
|
Countly.sharedInstance().recordEvent("Exported Song", 1);
|
||||||
|
} else {
|
||||||
// Export failed
|
// Export failed
|
||||||
mTracksFailed ++;
|
mTracksFailed ++;
|
||||||
}
|
}
|
||||||
|
|
5
playmusicexporter/src/main/res/values/constants.xml
Normal file
5
playmusicexporter/src/main/res/values/constants.xml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string name="countly_url">https://countly.jcg.re/</string>
|
||||||
|
<string name="countly_token">82a1d9405388c4dd73dc9835f84c59cf4274086d</string>
|
||||||
|
</resources>
|
Loading…
Reference in a new issue