Skip to content

Commit

Permalink
This is the first wave of commits, layout has been changed so it can …
Browse files Browse the repository at this point in the history
…be more comfortable for usage under direct sunlight, Settings Drawer and Settings menu have been simplified for comfortable usage. The ads have been removed so

this is completely free and connecting with public servers has been removed. This app is mainly for PTT usage for patroling guards or lone workers. More changes regarding transmit modes, inter-app communication with QR-Patrol are
about to come, as well as new features regarding PTT and change of Input Sample rate, Input sound quality in kbps and maybe some kind of simple certificate management. Also it will be updated to work with android studio 1.0 as it
is the best tool for android development atm. Many thanks to the original Mumble Team and to Andrew Comminos for all the resources provided and for the support.
  • Loading branch information
Theofilos-Chamalis committed Dec 16, 2014
1 parent de44c3c commit f02b2b4
Show file tree
Hide file tree
Showing 382 changed files with 809 additions and 722 deletions.
Empty file modified .gitignore
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions .gitmodules
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "libraries/Jumble"]
path = libraries/Jumble
url = https://www.github.com/Morlunk/Jumble.git
url = https://www.github.com//Jumble.git
[submodule "libraries/NetCipher"]
path = libraries/NetCipher
url = https://github.com/Morlunk/OnionKit.git
url = https://github.com//OnionKit.git
6 changes: 3 additions & 3 deletions .tx/config
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[main]
host = https://www.transifex.com

[plumble.jumble-strings]
[qrptt.jumble-strings]
file_filter = libraries/Jumble/src/main/res/values-<lang>/strings.xml
source_file = libraries/Jumble/src/main/res/values/strings.xml
source_lang = en
type = ANDROID

[plumble.preferencexml]
[qrptt.preferencexml]
file_filter = app/src/main/res/values-<lang>/preference.xml
source_file = app/src/main/res/values/preference.xml
source_lang = en
type = ANDROID

[plumble.stringsxml]
[qrptt.stringsxml]
file_filter = app/src/main/res/values-<lang>/strings.xml
source_file = app/src/main/res/values/strings.xml
source_lang = en
Expand Down
Empty file modified LICENSE
100644 → 100755
Empty file.
18 changes: 9 additions & 9 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Plumble
QRPushToTalk
=======

Plumble is a robust GPLv3 Mumble client for Android that uses the [Jumble](https://github.com/Morlunk/Jumble) protocol implementation.
QRPushToTalk is a robust GPLv3 Mumble client for Android that uses the [Jumble](https://github.com/terracom/Jumble) protocol implementation.

<a href="https://play.google.com/store/apps/details?id=com.morlunk.mumbleclient">
<a href="https://play.google.com/store/apps/details?id=com.terracom.mumbleclient">
<img alt="Get it on Google Play" src="https://developer.android.com/images/brand/en_generic_rgb_wo_45.png" />
</a>
<a href="https://f-droid.org/repository/browse/?fdid=com.morlunk.mumbleclient">
<a href="https://f-droid.org/repository/browse/?fdid=com.terracom.mumbleclient">
<img alt="Get it on F-Droid" src="https://f-droid.org/wiki/images/c/c4/F-Droid-button_available-on.png" height="45" />
</a>

Expand All @@ -22,7 +22,7 @@ It's that simple!
Inter-process communication
---------------------------

Documentation on integrating your app with Plumble's IPC features [here](https://github.com/Morlunk/Plumble/wiki/Inter-process-communication).
Documentation on integrating your app with QRPushToTalk's IPC features [here](https://github.com/terracom/QRPushToTalk/wiki/Inter-process-communication).

Contributing
============
Expand All @@ -37,18 +37,18 @@ Please use Transifex for translations, not pull requests.
Testing
-------

[Help test the latest Plumble nightly builds here.](https://www.morlunk.com/jenkins/) File issue reports with Nightly version number.
[Help test the latest QRPushToTalk nightly builds here.](https://www.terracom.com/jenkins/) File issue reports with Nightly version number.

Translation
-----------

Contribute translations to Plumble using [Transifex](https://www.transifex.com/projects/p/plumble/)!
Contribute translations to QRPushToTalk using [Transifex](https://www.transifex.com/projects/p/qrptt/)!

Donate
------

Plumble is a lot of work to develop! All donations are appreciated, via the paid version on Google Play or here.
QRPushToTalk is a lot of work to develop! All donations are appreciated, via the paid version on Google Play or here.

[Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ALTS7G56K2CGS)

[Bitcoin](bitcoin:1ySD4UzFDtPLq9agRg9eiFtWmz6DJ7bBf?label=Plumble%20Donations) (1ySD4UzFDtPLq9agRg9eiFtWmz6DJ7bBf)
[Bitcoin](bitcoin:1ySD4UzFDtPLq9agRg9eiFtWmz6DJ7bBf?label=QRPushToTalk%20Donations) (1ySD4UzFDtPLq9agRg9eiFtWmz6DJ7bBf)
12 changes: 6 additions & 6 deletions app/build.gradle
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,22 @@ android {
defaultConfig {
minSdkVersion 9
targetSdkVersion 21
applicationId "com.morlunk.mumbleclient"
applicationId "com.terracom.mumbleclient"
versionCode 72
versionName "3.2.0"
testPackageName "com.morlunk.mumbleclient.test"
versionName "1.0.0"
testPackageName "com.terracom.mumbleclient.test"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
buildConfigField "boolean", "DONATE_NAG", "false"
}

productFlavors {

official {
applicationId "com.morlunk.mumbleclient"
applicationId "com.terracom.mumbleclient"
}

free {
applicationId "com.morlunk.mumbleclient.free"
applicationId "com.terracom.mumbleclient.free"
buildConfigField "boolean", "DONATE_NAG", "true"
}

Expand All @@ -92,7 +92,7 @@ android {
versionCode 0
versionName "Unknown Nightly"
}
applicationId "com.morlunk.mumbleclient.jenkins"
applicationId "com.terracom.mumbleclient.jenkins"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.morlunk.mumbleclient.test;
package com.terracom.mumbleclient.test;

import android.test.AndroidTestCase;

import com.morlunk.mumbleclient.db.PlumbleSQLiteDatabase;
import com.terracom.mumbleclient.db.QRPushToTalkSQLiteDatabase;

import java.util.UUID;

/**
* Test case designed to test operations of Plumble's database.
* Test case designed to test operations of QRPushToTalk's database.
* A new DB is created and destroyed with each test call.
* Created by andrew on 19/08/14.
*/
public class PlumbleSQLTestCase extends AndroidTestCase {
public class QRPushToTalkSQLTestCase extends AndroidTestCase {
/** Database name used in the active test. */
private String mDatabaseName;
/** Database for the active test. */
private PlumbleSQLiteDatabase mDatabase;
private QRPushToTalkSQLiteDatabase mDatabase;

@Override
protected void setUp() throws Exception {
super.setUp();
mDatabaseName = UUID.randomUUID().toString() + ".db";
mDatabase = new PlumbleSQLiteDatabase(getContext(), mDatabaseName);
mDatabase = new QRPushToTalkSQLiteDatabase(getContext(), mDatabaseName);
mDatabase.open();
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/free/AndroidManifest.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

<application>
<provider
android:name="com.morlunk.mumbleclient.channel.ChannelSearchProvider"
android:authorities="com.morlunk.mumbleclient.free.channel.ChannelSearchProvider"
android:name="com.terracom.mumbleclient.channel.ChannelSearchProvider"
android:authorities="com.terracom.mumbleclient.free.channel.ChannelSearchProvider"
android:exported="false" />
</application>

Expand Down
Binary file modified app/src/free/ic_launcher-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/free/res/drawable-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/free/res/drawable-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/free/res/drawable-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/free/res/drawable-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/free/res/drawable-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/free/res/values/strings.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
-->

<resources>
<string name="app_name">Plumble Free</string>
<string name="app_name">QR PushToTalk</string>
</resources>
2 changes: 1 addition & 1 deletion app/src/free/res/xml/searchable.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<searchable xmlns:android="http://schemas.android.com/apk/res/android"
android:label="@string/app_name"
android:hint="@string/searchHint"
android:searchSuggestAuthority="com.morlunk.mumbleclient.free.channel.ChannelSearchProvider"
android:searchSuggestAuthority="com.terracom.mumbleclient.free.channel.ChannelSearchProvider"
android:searchSuggestSelection=" ?"
android:searchSuggestThreshold="1"
android:searchSuggestIntentAction="android.intent.action.SEARCH"
Expand Down
29 changes: 0 additions & 29 deletions app/src/jenkins/AndroidManifest.xml

This file was deleted.

Binary file removed app/src/jenkins/ic_launcher-web.png
Binary file not shown.
Binary file removed app/src/jenkins/res/drawable-hdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/jenkins/res/drawable-mdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/jenkins/res/drawable-xhdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/jenkins/res/drawable-xxhdpi/ic_launcher.png
Binary file not shown.
21 changes: 0 additions & 21 deletions app/src/jenkins/res/values/strings.xml

This file was deleted.

28 changes: 0 additions & 28 deletions app/src/jenkins/res/xml/searchable.xml

This file was deleted.

20 changes: 10 additions & 10 deletions app/src/main/AndroidManifest.xml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.morlunk.mumbleclient" >
package="com.terracom.mumbleclient" >

<uses-feature
android:name="android.hardware.microphone"
Expand All @@ -37,44 +37,44 @@
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Plumble" >
android:theme="@style/Theme.QRPushToTalk" >
<activity android:name=".wizard.WizardActivity" />
<activity
android:name=".preference.Preferences"
android:parentActivityName=".app.PlumbleActivity" >
android:parentActivityName=".app.QRPushToTalkActivity" >
<intent-filter>
<action android:name="com.morlunk.mumbleclient.app.PREFS_GENERAL" />
<action android:name="com.terracom.mumbleclient.app.PREFS_GENERAL" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="com.morlunk.mumbleclient.app.PREFS_AUTHENTICATION" />
<action android:name="com.terracom.mumbleclient.app.PREFS_AUTHENTICATION" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="com.morlunk.mumbleclient.app.PREFS_AUDIO" />
<action android:name="com.terracom.mumbleclient.app.PREFS_AUDIO" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="com.morlunk.mumbleclient.app.PREFS_APPEARANCE" />
<action android:name="com.terracom.mumbleclient.app.PREFS_APPEARANCE" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="com.morlunk.mumbleclient.app.PREFS_ABOUT" />
<action android:name="com.terracom.mumbleclient.app.PREFS_ABOUT" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<service
android:name=".service.PlumbleService"
android:name=".service.QRPushToTalkService"
android:enabled="true" />

<activity
android:name=".app.PlumbleActivity"
android:name=".app.QRPushToTalkActivity"
android:label="@string/app_name"
android:launchMode="singleTop" >
<intent-filter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.morlunk.mumbleclient;
package com.terracom.mumbleclient;

public class Constants {
public static final String TAG = "Plumble";
public static final String TAG = "QRPushToTalk";
}
Loading

0 comments on commit f02b2b4

Please sign in to comment.