Merge branch 'master' into 'master'

Update Quasseldroid to v1.0.2, update Info

See merge request fdroid/fdroiddata!4111
This commit is contained in:
Marcus 2018-12-19 21:14:14 +00:00
commit c62d62299f
4 changed files with 27 additions and 159 deletions

View file

@ -3,124 +3,54 @@ Categories:
License: GPL-3.0-only
SourceCode: https://git.kuschku.de/justJanne/QuasselDroid-ng
IssueTracker: https://git.kuschku.de/justJanne/QuasselDroid-ng/issues
Donate: https://www.patreon.com/justjanne
Name: Quasseldroid
Summary: Client for Quassel IRC
Description: |-
Quassel is a distributed, decentralized IRC client. This app is a pure Java
client for the Quassel core.
Chat comfortably. Everywhere.
REQUIRES A QUASSEL CORE DOES NOT WORK AS STANDALONE IRC CLIENT!
'''REQUIRES A QUASSEL CORE DOES NOT WORK AS STANDALONE IRC CLIENT'''
* Use IRC on the go thanks to the Quassel core, youll never miss anything
* Always have your entire chat history available just scroll up to load older messages, the core keeps them for you
* Be notified when someone messages you even if you had no connection in the meantime
'''Requirements:'''
You need to have an account on a Quassel core to use this app. If you have none, you can either set a core up yourself, or check if you can get an account on someone elses core.
This app only works with cores that run at least Quassel v0.10, for all features to be available youll need Quassel v0.13
To learn about how to set up a quassel core, see the wiki at http://bugs.quassel-irc.org/projects/quassel-irc/wiki
'''Contact:'''
You can find us in #quasseldroid on Freenode, or contact us under support@kuschku.de
RepoType: git
Repo: https://git.kuschku.de/justJanne/QuasselDroid-ng.git
Repo: https://git.kuschku.de/justjanne/QuasselDroid-ng/
Builds:
- versionName: 0.9.8
versionCode: 84
commit: v0.9.8
subdir: QuasselDroid
patch:
- gradle.patch
- manifest.patch
- splash.patch
gradle:
- yes
rm:
- QuasselDroid/libs/crittercism_v3_0_7_sdkonly.jar
- QuasselDroid/src/main/res/values/keys.xml
- res/values/keys.xml
- versionName: 0.10.0
versionCode: 86
commit: v0.10.0
subdir: QuasselDroid
patch:
- manifest.patch
- splash.patch
gradle:
- yes
rm:
- QuasselDroid/libs/crittercism_v3_0_7_sdkonly.jar
- QuasselDroid/src/main/res/values/keys.xml
- res/values/keys.xml
prebuild: sed -i -e '/libs\/crittercism_v3_0_7_sdkonly.jar/d' build.gradle
- versionName: 0.10.1
versionCode: 87
commit: v0.10.1
subdir: QuasselDroid
patch:
- manifest.patch
- splash.patch
gradle:
- yes
rm:
- QuasselDroid/libs/crittercism_v3_0_7_sdkonly.jar
- QuasselDroid/src/main/res/values/keys.xml
- res/values/keys.xml
prebuild: sed -i -e '/libs\/crittercism_v3_0_7_sdkonly.jar/d' build.gradle
- versionName: 0.11.3
versionCode: 106
commit: v0.11.3
subdir: QuasselDroid
patch:
- manifest.patch
gradle:
- yes
rm:
- QuasselDroid/libs/crittercism_v3_0_7_sdkonly.jar
- QuasselDroid/src/main/res/values/keys.xml
- res/values/keys.xml
prebuild: sed -i -e '/libs\/crittercism_v3_0_7_sdkonly.jar/d' build.gradle
- versionName: 0.11.4
versionCode: 110
commit: v0.11.4
subdir: QuasselDroid
gradle:
- yes
rm:
- QuasselDroid/libs/*
- res/values/keys.xml
- versionName: 0.11.5
versionCode: 111
commit: eb64d72f39f99d630d8ef74394310d6cd473badb
subdir: QuasselDroid
- versionName: v1.0.0
versionCode: 985
commit: v1.0.0
gradle:
- yes
- versionName: 0.11.7
versionCode: 142
commit: v0.11.7
subdir: QuasselDroid
- versionName: v1.0.1
versionCode: 988
commit: v1.0.1
gradle:
- yes
- versionName: 0.11.7
versionCode: 160
commit: v0.11.8
subdir: QuasselDroid
- versionName: v1.0.2
versionCode: 989
commit: v1.0.2
gradle:
- yes
- versionName: v0.5.0
versionCode: 853
commit: v0.5.0
subdir: app
gradle:
- yes
scandelete:
- buildSrc/build/
- buildSrc/.gradle/
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: v0.5.0
CurrentVersionCode: 853
CurrentVersion: v1.0.2
CurrentVersionCode: 989

View file

@ -1,21 +0,0 @@
diff --git a/QuasselDroid/build.gradle b/QuasselDroid/build.gradle
index 2ba1274..1962d7f 100644
--- a/QuasselDroid/build.gradle
+++ b/QuasselDroid/build.gradle
@@ -14,7 +14,6 @@ repositories {
dependencies {
compile group: 'com.squareup', name: 'otto', version: '1.3.4'
- compile files('libs/crittercism_v3_0_7_sdkonly.jar')
compile project(':ActionBarSherlock')
compile 'com.android.support:support-v4:19.0.+'
}
@@ -24,7 +23,7 @@ if(project.hasProperty("Android.signing")
}
android {
compileSdkVersion 19
- buildToolsVersion "19.0.0"
+ buildToolsVersion "19.1.0"
defaultConfig {
minSdkVersion 7

View file

@ -1,16 +0,0 @@
diff --git a/QuasselDroid/src/main/AndroidManifest.xml b/QuasselDroid/src/main/AndroidManifest.xml
index 843905e..823a27a 100644
--- a/QuasselDroid/src/main/AndroidManifest.xml
+++ b/QuasselDroid/src/main/AndroidManifest.xml
@@ -48,9 +48,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <!-- Start of Crittercism.com Code -->
- <activity android:name="com.crittercism.NotificationActivity" />
- <!-- End of Crittercism.com Code -->
</application>
-</manifest>
\ No newline at end of file
+</manifest>

View file

@ -1,25 +0,0 @@
diff --git a/QuasselDroid/src/main/java/com/iskrembilen/quasseldroid/gui/SplashActivity.java b/QuasselDroid/src/main/java/com/iskrembilen/quasseldroid/gui/SplashActivity.java
index 8518b2d..d795808 100644
--- a/QuasselDroid/src/main/java/com/iskrembilen/quasseldroid/gui/SplashActivity.java
+++ b/QuasselDroid/src/main/java/com/iskrembilen/quasseldroid/gui/SplashActivity.java
@@ -11,7 +11,6 @@ import android.os.IBinder;
import android.util.Log;
import com.actionbarsherlock.app.SherlockActivity;
-import com.crittercism.app.Crittercism;
import com.iskrembilen.quasseldroid.R;
import com.iskrembilen.quasseldroid.events.ConnectionChangedEvent;
import com.iskrembilen.quasseldroid.events.ConnectionChangedEvent.Status;
@@ -30,12 +29,6 @@ public class SplashActivity extends SherlockActivity {
protected void onCreate(Bundle savedInstanceState) {
setTheme(ThemeUtil.theme);
super.onCreate(savedInstanceState);
- //Init crittercism
- boolean isDebugBuild = (0 != (getApplicationInfo().flags &= ApplicationInfo.FLAG_DEBUGGABLE));
- if (!isDebugBuild && getResources().getBoolean(R.bool.use_crittercism)) {
- Log.i(TAG, "Enabling Crittercism");
- Crittercism.init(getApplicationContext(), getResources().getString(R.string.crittercism_api_key));
- }
setContentView(R.layout.splash);
getSupportActionBar().hide();
}