Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

F droid #440

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

F droid #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
195debd
remove crashlytics
naman14 Oct 31, 2016
c07c12d
derp
naman14 Oct 31, 2016
5c5f2ec
derp
naman14 Oct 31, 2016
6027119
rebase on 0.21b
naman14 Oct 31, 2016
3406f4e
rebase v14
naman14 Oct 31, 2016
1b29581
Merge branch 'master' of https://github.com/naman14/Timber into f-droid
naman14 Nov 14, 2016
926127c
fix conflict
naman14 Nov 14, 2016
76cb974
Merge branch 'master' of https://github.com/naman14/Timber into f-droid
naman14 Nov 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: 'io.fabric'

android {
compileSdkVersion 24
Expand All @@ -21,7 +20,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
debug {
ext.enableCrashlytics = false
versionNameSuffix "-debug"
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
Expand All @@ -36,7 +34,6 @@ android {

repositories {
jcenter()
maven { url 'https://maven.fabric.io/public' }
}

dependencies {
Expand All @@ -62,9 +59,6 @@ dependencies {
compile('com.github.naman14:app-theme-engine:0.5.2@aar') {
transitive = true
}
compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
transitive = true;
}
compile 'com.anjlab.android.iab.v3:library:1.0.+'


Expand Down
10 changes: 0 additions & 10 deletions app/src/main/java/com/naman14/timber/TimberApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,11 @@
import android.app.Application;

import com.afollestad.appthemeengine.ATE;
import com.crashlytics.android.Crashlytics;
import com.crashlytics.android.core.CrashlyticsCore;
import com.naman14.timber.permissions.Nammu;
import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
import com.nostra13.universalimageloader.utils.L;

import io.fabric.sdk.android.Fabric;

public class TimberApp extends Application {


Expand All @@ -40,12 +36,6 @@ public void onCreate() {
super.onCreate();
mInstance = this;

//disable crashlytics for debug builds
Crashlytics crashlyticsKit = new Crashlytics.Builder()
.core(new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build())
.build();
Fabric.with(this, crashlyticsKit);

ImageLoaderConfiguration localImageLoaderConfiguration = new ImageLoaderConfiguration.Builder(this).build();
ImageLoader.getInstance().init(localImageLoaderConfiguration);
L.writeLogs(false);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/naman14/timber/activities/DonateActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) {
progressBar = (ProgressBar) findViewById(R.id.progressBar);
status = (TextView) findViewById(R.id.donation_status);

bp = new BillingProcessor(this, getString(R.string.play_billing_license_key), this);
bp = new BillingProcessor(this, "PLAY_LICENSE_KEY", this);

}

Expand Down
5 changes: 1 addition & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
buildscript {
repositories {
jcenter()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'io.fabric.tools:gradle:1.+'

// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
Expand Down