diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 index 3cf6b43c..3ba89d6b --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/.tx/config b/.tx/config old mode 100644 new mode 100755 index f8ad7e54..4db9e448 --- a/.tx/config +++ b/.tx/config @@ -1,19 +1,19 @@ [main] host = https://www.transifex.com -[plumble.jumble-strings] +[qrptt.jumble-strings] file_filter = libraries/Jumble/src/main/res/values-/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-/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-/strings.xml source_file = app/src/main/res/values/strings.xml source_lang = en diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 2572c40a..34b8f585 --- a/README.md +++ b/README.md @@ -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. - + Get it on Google Play - + Get it on F-Droid @@ -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 ============ @@ -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) diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 index ad9de271..0760fd06 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,10 +63,10 @@ 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" } @@ -74,11 +74,11 @@ android { 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" } @@ -92,7 +92,7 @@ android { versionCode 0 versionName "Unknown Nightly" } - applicationId "com.morlunk.mumbleclient.jenkins" + applicationId "com.terracom.mumbleclient.jenkins" } } diff --git a/app/src/androidTest/java/com/morlunk/mumbleclient/test/PlumbleSQLTestCase.java b/app/src/androidTest/java/com/terracom/mumbleclient/test/QRPushToTalkSQLTestCase.java old mode 100644 new mode 100755 similarity index 86% rename from app/src/androidTest/java/com/morlunk/mumbleclient/test/PlumbleSQLTestCase.java rename to app/src/androidTest/java/com/terracom/mumbleclient/test/QRPushToTalkSQLTestCase.java index eab94ec9..39517d5a --- a/app/src/androidTest/java/com/morlunk/mumbleclient/test/PlumbleSQLTestCase.java +++ b/app/src/androidTest/java/com/terracom/mumbleclient/test/QRPushToTalkSQLTestCase.java @@ -15,30 +15,30 @@ * along with this program. If not, see . */ -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(); } diff --git a/app/src/free/AndroidManifest.xml b/app/src/free/AndroidManifest.xml old mode 100644 new mode 100755 index a5c240e9..4a08444b --- a/app/src/free/AndroidManifest.xml +++ b/app/src/free/AndroidManifest.xml @@ -21,8 +21,8 @@ diff --git a/app/src/free/ic_launcher-web.png b/app/src/free/ic_launcher-web.png index 2c5f2c05..549bf2a3 100644 Binary files a/app/src/free/ic_launcher-web.png and b/app/src/free/ic_launcher-web.png differ diff --git a/app/src/free/res/drawable-hdpi/ic_launcher.png b/app/src/free/res/drawable-hdpi/ic_launcher.png index e10f2837..1aa5a73f 100644 Binary files a/app/src/free/res/drawable-hdpi/ic_launcher.png and b/app/src/free/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/free/res/drawable-mdpi/ic_launcher.png b/app/src/free/res/drawable-mdpi/ic_launcher.png index ee7e5ae0..5b73656f 100644 Binary files a/app/src/free/res/drawable-mdpi/ic_launcher.png and b/app/src/free/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/free/res/drawable-xhdpi/ic_launcher.png b/app/src/free/res/drawable-xhdpi/ic_launcher.png index b7e1b806..bbc883dc 100644 Binary files a/app/src/free/res/drawable-xhdpi/ic_launcher.png and b/app/src/free/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/free/res/drawable-xxhdpi/ic_launcher.png b/app/src/free/res/drawable-xxhdpi/ic_launcher.png index be40bd6a..5b09306c 100644 Binary files a/app/src/free/res/drawable-xxhdpi/ic_launcher.png and b/app/src/free/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/free/res/drawable-xxxhdpi/ic_launcher.png b/app/src/free/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..c9c53f29 Binary files /dev/null and b/app/src/free/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/app/src/free/res/values/strings.xml b/app/src/free/res/values/strings.xml old mode 100644 new mode 100755 index 133dbeea..bf840e4c --- a/app/src/free/res/values/strings.xml +++ b/app/src/free/res/values/strings.xml @@ -17,5 +17,5 @@ --> - Plumble Free + QR PushToTalk \ No newline at end of file diff --git a/app/src/free/res/xml/searchable.xml b/app/src/free/res/xml/searchable.xml old mode 100644 new mode 100755 index c3924994..4cabf959 --- a/app/src/free/res/xml/searchable.xml +++ b/app/src/free/res/xml/searchable.xml @@ -19,7 +19,7 @@ - - - - - - - - - - diff --git a/app/src/jenkins/ic_launcher-web.png b/app/src/jenkins/ic_launcher-web.png deleted file mode 100644 index d7de51d5..00000000 Binary files a/app/src/jenkins/ic_launcher-web.png and /dev/null differ diff --git a/app/src/jenkins/res/drawable-hdpi/ic_launcher.png b/app/src/jenkins/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 544858c6..00000000 Binary files a/app/src/jenkins/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/jenkins/res/drawable-mdpi/ic_launcher.png b/app/src/jenkins/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index b94d2db2..00000000 Binary files a/app/src/jenkins/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/jenkins/res/drawable-xhdpi/ic_launcher.png b/app/src/jenkins/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 57887534..00000000 Binary files a/app/src/jenkins/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/jenkins/res/drawable-xxhdpi/ic_launcher.png b/app/src/jenkins/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index acde6b92..00000000 Binary files a/app/src/jenkins/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/jenkins/res/values/strings.xml b/app/src/jenkins/res/values/strings.xml deleted file mode 100644 index 15733874..00000000 --- a/app/src/jenkins/res/values/strings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - Plumble Nightly - \ No newline at end of file diff --git a/app/src/jenkins/res/xml/searchable.xml b/app/src/jenkins/res/xml/searchable.xml deleted file mode 100644 index f851745b..00000000 --- a/app/src/jenkins/res/xml/searchable.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml old mode 100644 new mode 100755 index 3cab429c..d0441bbb --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ ~ along with this program. If not, see . --> + package="com.terracom.mumbleclient" > + android:theme="@style/Theme.QRPushToTalk" > + android:parentActivityName=".app.QRPushToTalkActivity" > - + - + - + - + - + diff --git a/app/src/main/java/com/morlunk/mumbleclient/Constants.java b/app/src/main/java/com/terracom/mumbleclient/Constants.java old mode 100644 new mode 100755 similarity index 89% rename from app/src/main/java/com/morlunk/mumbleclient/Constants.java rename to app/src/main/java/com/terracom/mumbleclient/Constants.java index bf3e4ff6..c6810f9f --- a/app/src/main/java/com/morlunk/mumbleclient/Constants.java +++ b/app/src/main/java/com/terracom/mumbleclient/Constants.java @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient; +package com.terracom.mumbleclient; public class Constants { - public static final String TAG = "Plumble"; + public static final String TAG = "QRPushToTalk"; } diff --git a/app/src/main/java/com/morlunk/mumbleclient/Settings.java b/app/src/main/java/com/terracom/mumbleclient/Settings.java old mode 100644 new mode 100755 similarity index 86% rename from app/src/main/java/com/morlunk/mumbleclient/Settings.java rename to app/src/main/java/com/terracom/mumbleclient/Settings.java index c19e3720..d909df2f --- a/app/src/main/java/com/morlunk/mumbleclient/Settings.java +++ b/app/src/main/java/com/terracom/mumbleclient/Settings.java @@ -15,15 +15,16 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient; +package com.terracom.mumbleclient; import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.preference.PreferenceManager; +import android.util.Log; import android.view.Gravity; -import com.morlunk.jumble.Constants; +import com.terracom.jumble.Constants; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -33,7 +34,7 @@ /** * Singleton settings class for universal access to the app's preferences. - * @author morlunk + * @author terracom */ public class Settings { public static final String PREF_INPUT_METHOD = "audioInputMethod"; @@ -93,7 +94,7 @@ public class Settings { public static final String PREF_CERT_PASSWORD = "certificatePassword"; public static final String PREF_DEFAULT_USERNAME = "defaultUsername"; - public static final String DEFAULT_DEFAULT_USERNAME = "Plumble_User"; // funny var name + public static final String DEFAULT_DEFAULT_USERNAME = "GuardID_GuardPIN"; // funny var name -> QRPushToTalk_User default public static final String PREF_FORCE_TCP = "forceTcp"; public static final Boolean DEFAULT_FORCE_TCP = false; @@ -152,10 +153,12 @@ private Settings(Context ctx) { } public String getInputMethod() { - String method = preferences.getString(PREF_INPUT_METHOD, ARRAY_INPUT_METHOD_VOICE); + //String method = preferences.getString(PREF_INPUT_METHOD, ARRAY_INPUT_METHOD_VOICE); + String method = preferences.getString(PREF_INPUT_METHOD,ARRAY_INPUT_METHOD_PTT); if(!ARRAY_INPUT_METHODS.contains(method)) { // Set default method for users who used to use handset mode before removal. - method = ARRAY_INPUT_METHOD_VOICE; + //method = ARRAY_INPUT_METHOD_VOICE; + method = ARRAY_INPUT_METHOD_PTT; } return method; } @@ -167,16 +170,33 @@ public String getInputMethod() { public int getJumbleInputMethod() { String inputMethod = getInputMethod(); if (ARRAY_INPUT_METHOD_VOICE.equals(inputMethod)) { + //Log.d("---------------MhnymaaaaaaaVOICE-----------------", inputMethod); return Constants.TRANSMIT_VOICE_ACTIVITY; + //return Constants.TRANSMIT_PUSH_TO_TALK; } else if (ARRAY_INPUT_METHOD_PTT.equals(inputMethod)) { + //Log.d("---------------MhnymaaaaaaaPTT-----------------",inputMethod); return Constants.TRANSMIT_PUSH_TO_TALK; } else if (ARRAY_INPUT_METHOD_CONTINUOUS.equals(inputMethod)) { + //Log.d("---------------MhnymaaaaaaaCONTINUOUS-----------------",inputMethod); return Constants.TRANSMIT_CONTINUOUS; + //return Constants.TRANSMIT_PUSH_TO_TALK; } throw new RuntimeException("Could not convert input method '" + inputMethod + "' to a Jumble input method id!"); } + /*public int getJumbleInputMethod() { + String inputMethod = getInputMethod(); + if (ARRAY_INPUT_METHOD_VOICE.equals(inputMethod)) { + return Constants.TRANSMIT_PUSH_TO_TALK; + } else if (ARRAY_INPUT_METHOD_PTT.equals(inputMethod)) { + return Constants.TRANSMIT_PUSH_TO_TALK; + } else if (ARRAY_INPUT_METHOD_CONTINUOUS.equals(inputMethod)) { + return Constants.TRANSMIT_PUSH_TO_TALK; + } + throw new RuntimeException("Could not convert input method '" + inputMethod + "' to a Jumble input method id!"); + }*/ - public void setInputMethod(String inputMethod) { + + /*public void setInputMethod(String inputMethod) { if(ARRAY_INPUT_METHOD_VOICE.equals(inputMethod) || ARRAY_INPUT_METHOD_PTT.equals(inputMethod) || ARRAY_INPUT_METHOD_CONTINUOUS.equals(inputMethod)) { @@ -184,6 +204,16 @@ public void setInputMethod(String inputMethod) { } else { throw new RuntimeException("Invalid input method " + inputMethod); } + }*/ + + public void setInputMethod(String inputMethod) { + if(ARRAY_INPUT_METHOD_VOICE.equals(inputMethod) || + ARRAY_INPUT_METHOD_PTT.equals(inputMethod) || + ARRAY_INPUT_METHOD_CONTINUOUS.equals(inputMethod)) { + preferences.edit().putString(PREF_INPUT_METHOD, "ptt").apply(); + } else { + throw new RuntimeException("Invalid input method " + inputMethod); + } } public int getInputSampleRate() { @@ -239,19 +269,26 @@ public int getHotCornerGravity() { /** * @return the resource ID of the user-defined theme. */ + + /* public int getTheme() { String theme = preferences.getString(PREF_THEME, ARRAY_THEME_LIGHT); if(ARRAY_THEME_LIGHT.equals(theme)) - return R.style.Theme_Plumble; + return R.style.Theme_QRPushToTalk; else if(ARRAY_THEME_DARK.equals(theme)) - return R.style.Theme_Plumble_Dark; + return R.style.Theme_QRPushToTalk_Dark; else if(ARRAY_THEME_SOLARIZED_LIGHT.equals(theme)) - return R.style.Theme_Plumble_Solarized_Light; + return R.style.Theme_QRPushToTalk_Solarized_Light; else if(ARRAY_THEME_SOLARIZED_DARK.equals(theme)) - return R.style.Theme_Plumble_Solarized_Dark; + return R.style.Theme_QRPushToTalk_Solarized_Dark; return -1; } + */ + public int getTheme() { + return R.style.Theme_QRPushToTalk_Solarized_Light; + + } /** * Attempts to read the certificate from the path specified in settings. * @return The parsed bytes of the certificate, or null otherwise. diff --git a/app/src/main/java/com/morlunk/mumbleclient/app/DrawerAdapter.java b/app/src/main/java/com/terracom/mumbleclient/app/DrawerAdapter.java old mode 100644 new mode 100755 similarity index 92% rename from app/src/main/java/com/morlunk/mumbleclient/app/DrawerAdapter.java rename to app/src/main/java/com/terracom/mumbleclient/app/DrawerAdapter.java index e48c8bef..11b76f16 --- a/app/src/main/java/com/morlunk/mumbleclient/app/DrawerAdapter.java +++ b/app/src/main/java/com/terracom/mumbleclient/app/DrawerAdapter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.app; +package com.terracom.mumbleclient.app; import android.content.Context; import android.graphics.PorterDuff; @@ -26,7 +26,7 @@ import android.widget.ImageView; import android.widget.TextView; -import com.morlunk.mumbleclient.R; +import com.terracom.mumbleclient.R; /** * Created by andrew on 01/08/13. @@ -99,13 +99,13 @@ public DrawerAdapter(Context context, DrawerDataProvider provider) { mProvider = provider; add(new DrawerAdapter.DrawerHeader(HEADER_CONNECTED_SERVER, context.getString(R.string.drawer_not_connected))); add(new DrawerAdapter.DrawerItem(ITEM_SERVER, context.getString(R.string.drawer_server), R.drawable.ic_action_channels)); - add(new DrawerAdapter.DrawerItem(ITEM_INFO, context.getString(R.string.information), R.drawable.ic_action_info_dark)); - add(new DrawerAdapter.DrawerItem(ITEM_ACCESS_TOKENS, context.getString(R.string.drawer_tokens), R.drawable.ic_action_save)); - add(new DrawerAdapter.DrawerItem(ITEM_PINNED_CHANNELS, context.getString(R.string.drawer_pinned), R.drawable.ic_action_comment)); +// add(new DrawerAdapter.DrawerItem(ITEM_INFO, context.getString(R.string.information), R.drawable.ic_action_info_dark)); +// add(new DrawerAdapter.DrawerItem(ITEM_ACCESS_TOKENS, context.getString(R.string.drawer_tokens), R.drawable.ic_action_save)); +// add(new DrawerAdapter.DrawerItem(ITEM_PINNED_CHANNELS, context.getString(R.string.drawer_pinned), R.drawable.ic_action_comment)); add(new DrawerAdapter.DrawerHeader(HEADER_SERVERS, context.getString(R.string.drawer_header_servers))); add(new DrawerAdapter.DrawerItem(ITEM_FAVOURITES, context.getString(R.string.drawer_favorites), R.drawable.ic_action_favourite_on)); // add(new DrawerAdapter.DrawerItem(ITEM_LAN, context.getString(R.string.drawer_lan), R.drawable.ic_action_fullscreen)); // Coming soon, TODO - add(new DrawerAdapter.DrawerItem(ITEM_PUBLIC, context.getString(R.string.drawer_public), R.drawable.ic_action_search)); +// add(new DrawerAdapter.DrawerItem(ITEM_PUBLIC, context.getString(R.string.drawer_public), R.drawable.ic_action_search)); add(new DrawerAdapter.DrawerHeader(HEADER_GENERAL, context.getString(R.string.general))); add(new DrawerAdapter.DrawerItem(ITEM_SETTINGS, context.getString(R.string.action_settings), R.drawable.ic_action_settings)); } diff --git a/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java b/app/src/main/java/com/terracom/mumbleclient/app/QRPushToTalkActivity.java old mode 100644 new mode 100755 similarity index 89% rename from app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java rename to app/src/main/java/com/terracom/mumbleclient/app/QRPushToTalkActivity.java index b392ec4f..3894dfc1 --- a/app/src/main/java/com/morlunk/mumbleclient/app/PlumbleActivity.java +++ b/app/src/main/java/com/terracom/mumbleclient/app/QRPushToTalkActivity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.app; +package com.terracom.mumbleclient.app; import android.app.AlertDialog; import android.app.ProgressDialog; @@ -47,29 +47,29 @@ import android.widget.ListView; import android.widget.Toast; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Server; -import com.morlunk.jumble.util.JumbleObserver; -import com.morlunk.jumble.util.MumbleURLParser; -import com.morlunk.jumble.util.ParcelableByteArray; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.channel.AccessTokenFragment; -import com.morlunk.mumbleclient.channel.ChannelFragment; -import com.morlunk.mumbleclient.channel.ServerInfoFragment; -import com.morlunk.mumbleclient.db.DatabaseProvider; -import com.morlunk.mumbleclient.db.PlumbleDatabase; -import com.morlunk.mumbleclient.db.PlumbleSQLiteDatabase; -import com.morlunk.mumbleclient.db.PublicServer; -import com.morlunk.mumbleclient.preference.PlumbleCertificateGenerateTask; -import com.morlunk.mumbleclient.preference.Preferences; -import com.morlunk.mumbleclient.servers.FavouriteServerListFragment; -import com.morlunk.mumbleclient.servers.PublicServerListFragment; -import com.morlunk.mumbleclient.servers.ServerEditFragment; -import com.morlunk.mumbleclient.service.PlumbleService; -import com.morlunk.mumbleclient.util.JumbleServiceFragment; -import com.morlunk.mumbleclient.util.JumbleServiceProvider; -import com.morlunk.mumbleclient.util.PlumbleTrustStore; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Server; +import com.terracom.jumble.util.JumbleObserver; +import com.terracom.jumble.util.MumbleURLParser; +import com.terracom.jumble.util.ParcelableByteArray; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.channel.AccessTokenFragment; +import com.terracom.mumbleclient.channel.ChannelFragment; +import com.terracom.mumbleclient.channel.ServerInfoFragment; +import com.terracom.mumbleclient.db.DatabaseProvider; +import com.terracom.mumbleclient.db.QRPushToTalkDatabase; +import com.terracom.mumbleclient.db.QRPushToTalkSQLiteDatabase; +import com.terracom.mumbleclient.db.PublicServer; +import com.terracom.mumbleclient.preference.QRPushToTalkCertificateGenerateTask; +import com.terracom.mumbleclient.preference.Preferences; +import com.terracom.mumbleclient.servers.FavouriteServerListFragment; +import com.terracom.mumbleclient.servers.PublicServerListFragment; +import com.terracom.mumbleclient.servers.ServerEditFragment; +import com.terracom.mumbleclient.service.QRPushToTalkService; +import com.terracom.mumbleclient.util.JumbleServiceFragment; +import com.terracom.mumbleclient.util.JumbleServiceProvider; +import com.terracom.mumbleclient.util.QRPushToTalkTrustStore; import org.spongycastle.util.encoders.Hex; @@ -87,7 +87,7 @@ import info.guardianproject.onionkit.ui.OrbotHelper; -public class PlumbleActivity extends ActionBarActivity implements ListView.OnItemClickListener, +public class QRPushToTalkActivity extends ActionBarActivity implements ListView.OnItemClickListener, FavouriteServerListFragment.ServerConnectHandler, JumbleServiceProvider, DatabaseProvider, SharedPreferences.OnSharedPreferenceChangeListener, DrawerAdapter.DrawerDataProvider, ServerEditFragment.ServerEditListener { @@ -96,8 +96,8 @@ public class PlumbleActivity extends ActionBarActivity implements ListView.OnIte */ public static final String EXTRA_DRAWER_FRAGMENT = "drawer_fragment"; - private PlumbleService.PlumbleBinder mService; - private PlumbleDatabase mDatabase; + private QRPushToTalkService.QRPushToTalkBinder mService; + private QRPushToTalkDatabase mDatabase; private Settings mSettings; private ActionBarDrawerToggle mDrawerToggle; @@ -115,7 +115,7 @@ public class PlumbleActivity extends ActionBarActivity implements ListView.OnIte private ServiceConnection mConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName name, IBinder service) { - mService = (PlumbleService.PlumbleBinder) service; + mService = (QRPushToTalkService.QRPushToTalkBinder) service; try { mService.registerObserver(mObserver); mService.clearChatNotifications(); // Clear chat notifications on resume. @@ -173,14 +173,14 @@ public void onConnectionError(String message, boolean reconnecting) throws Remot if(mErrorDialog != null) mErrorDialog.dismiss(); mConnectingDialog.dismiss(); - AlertDialog.Builder ab = new AlertDialog.Builder(PlumbleActivity.this); + AlertDialog.Builder ab = new AlertDialog.Builder(QRPushToTalkActivity.this); ab.setTitle(R.string.connectionRefused); if(!reconnecting) { ab.setMessage(message); ab.setPositiveButton(android.R.string.ok, null); } else { ab.setTitle(R.string.connectionRefused); - ab.setMessage(message+"\n"+getString(R.string.reconnecting, PlumbleService.RECONNECT_DELAY/1000)); + ab.setMessage(message+"\n"+getString(R.string.reconnecting, QRPushToTalkService.RECONNECT_DELAY/1000)); ab.setPositiveButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -206,7 +206,7 @@ public void onTLSHandshakeFailed(ParcelableByteArray cert) throws RemoteExceptio CertificateFactory certFactory = CertificateFactory.getInstance("X.509"); final X509Certificate x509 = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(certBytes)); - AlertDialog.Builder adb = new AlertDialog.Builder(PlumbleActivity.this); + AlertDialog.Builder adb = new AlertDialog.Builder(QRPushToTalkActivity.this); adb.setTitle(R.string.untrusted_certificate); try { MessageDigest digest = MessageDigest.getInstance("SHA-1"); @@ -228,14 +228,14 @@ public void onClick(DialogInterface dialog, int which) { // Try to add to trust store try { String alias = lastServer.getHost(); // FIXME unreliable - KeyStore trustStore = PlumbleTrustStore.getTrustStore(PlumbleActivity.this); + KeyStore trustStore = QRPushToTalkTrustStore.getTrustStore(QRPushToTalkActivity.this); trustStore.setCertificateEntry(alias, x509); - PlumbleTrustStore.saveTrustStore(PlumbleActivity.this, trustStore); - Toast.makeText(PlumbleActivity.this, R.string.trust_added, Toast.LENGTH_LONG).show(); + QRPushToTalkTrustStore.saveTrustStore(QRPushToTalkActivity.this, trustStore); + Toast.makeText(QRPushToTalkActivity.this, R.string.trust_added, Toast.LENGTH_LONG).show(); connectToServer(lastServer); // FIXME unreliable } catch (Exception e) { e.printStackTrace(); - Toast.makeText(PlumbleActivity.this, R.string.trust_add_failed, Toast.LENGTH_LONG).show(); + Toast.makeText(QRPushToTalkActivity.this, R.string.trust_add_failed, Toast.LENGTH_LONG).show(); } } }); @@ -248,7 +248,7 @@ public void onClick(DialogInterface dialog, int which) { @Override public void onPermissionDenied(String reason) throws RemoteException { - AlertDialog.Builder adb = new AlertDialog.Builder(PlumbleActivity.this); + AlertDialog.Builder adb = new AlertDialog.Builder(QRPushToTalkActivity.this); adb.setTitle(R.string.perm_denied); adb.setMessage(reason); adb.show(); @@ -268,7 +268,7 @@ protected void onCreate(Bundle savedInstanceState) { SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); preferences.registerOnSharedPreferenceChangeListener(this); - mDatabase = new PlumbleSQLiteDatabase(this); // TODO add support for cloud storage + mDatabase = new QRPushToTalkSQLiteDatabase(this); // TODO add support for cloud storage mDatabase.open(); mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); @@ -305,7 +305,7 @@ public void onDrawerOpened(View drawerView) { public void onCancel(DialogInterface dialog) { try { mService.disconnect(); - Toast.makeText(PlumbleActivity.this, R.string.cancelled, Toast.LENGTH_SHORT).show(); + Toast.makeText(QRPushToTalkActivity.this, R.string.cancelled, Toast.LENGTH_SHORT).show(); } catch (RemoteException e) { e.printStackTrace(); } @@ -367,7 +367,7 @@ protected void onPostCreate(Bundle savedInstanceState) { @Override protected void onResume() { super.onResume(); - Intent connectIntent = new Intent(this, PlumbleService.class); + Intent connectIntent = new Intent(this, QRPushToTalkService.class); bindService(connectIntent, mConnection, BIND_AUTO_CREATE); } @@ -418,7 +418,7 @@ public boolean onPrepareOptionsMenu(Menu menu) { @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.plumble, menu); + getMenuInflater().inflate(R.menu.qrptt, menu); return true; } @@ -516,7 +516,7 @@ private void showSetupWizard() { adb.setPositiveButton(R.string.generate, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - PlumbleCertificateGenerateTask generateTask = new PlumbleCertificateGenerateTask(PlumbleActivity.this) { + QRPushToTalkCertificateGenerateTask generateTask = new QRPushToTalkCertificateGenerateTask(QRPushToTalkActivity.this) { @Override protected void onPostExecute(File result) { super.onPostExecute(result); @@ -679,7 +679,7 @@ public IJumbleService getService() { } @Override - public PlumbleDatabase getDatabase() { + public QRPushToTalkDatabase getDatabase() { return mDatabase; } @@ -700,7 +700,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin if(Build.VERSION.SDK_INT >= 11) recreate(); else { - Intent intent = new Intent(this, PlumbleActivity.class); + Intent intent = new Intent(this, QRPushToTalkActivity.class); finish(); startActivity(intent); } diff --git a/app/src/main/java/com/morlunk/mumbleclient/app/ServerConnectTask.java b/app/src/main/java/com/terracom/mumbleclient/app/ServerConnectTask.java old mode 100644 new mode 100755 similarity index 84% rename from app/src/main/java/com/morlunk/mumbleclient/app/ServerConnectTask.java rename to app/src/main/java/com/terracom/mumbleclient/app/ServerConnectTask.java index 7542ea07..0ed40ea9 --- a/app/src/main/java/com/morlunk/mumbleclient/app/ServerConnectTask.java +++ b/app/src/main/java/com/terracom/mumbleclient/app/ServerConnectTask.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.app; +package com.terracom.mumbleclient.app; import android.content.Context; import android.content.Intent; @@ -24,26 +24,26 @@ import android.media.MediaRecorder; import android.os.AsyncTask; -import com.morlunk.jumble.JumbleService; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.db.PlumbleDatabase; -import com.morlunk.mumbleclient.service.PlumbleService; -import com.morlunk.mumbleclient.util.PlumbleTrustStore; +import com.terracom.jumble.JumbleService; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.db.QRPushToTalkDatabase; +import com.terracom.mumbleclient.service.QRPushToTalkService; +import com.terracom.mumbleclient.util.QRPushToTalkTrustStore; import java.util.ArrayList; /** - * Constructs an intent for connection to a PlumbleService and executes it. + * Constructs an intent for connection to a QRPushToTalkService and executes it. * Created by andrew on 20/08/14. */ public class ServerConnectTask extends AsyncTask { private Context mContext; - private PlumbleDatabase mDatabase; + private QRPushToTalkDatabase mDatabase; private Settings mSettings; - public ServerConnectTask(Context context, PlumbleDatabase database) { + public ServerConnectTask(Context context, QRPushToTalkDatabase database) { mContext = context; mDatabase = database; mSettings = Settings.getInstance(context); @@ -68,7 +68,7 @@ protected Intent doInBackground(Server... params) { e.printStackTrace(); } - Intent connectIntent = new Intent(mContext, PlumbleService.class); + Intent connectIntent = new Intent(mContext, QRPushToTalkService.class); connectIntent.putExtra(JumbleService.EXTRAS_SERVER, server); connectIntent.putExtra(JumbleService.EXTRAS_CLIENT_NAME, mContext.getString(R.string.app_name)+" "+applicationVersion); connectIntent.putExtra(JumbleService.EXTRAS_TRANSMIT_MODE, inputMethod); @@ -77,7 +77,7 @@ protected Intent doInBackground(Server... params) { connectIntent.putExtra(JumbleService.EXTRAS_CERTIFICATE, mSettings.getCertificate()); connectIntent.putExtra(JumbleService.EXTRAS_CERTIFICATE_PASSWORD, mSettings.getCertificatePassword()); connectIntent.putExtra(JumbleService.EXTRAS_AUTO_RECONNECT, mSettings.isAutoReconnectEnabled()); - connectIntent.putExtra(JumbleService.EXTRAS_AUTO_RECONNECT_DELAY, PlumbleService.RECONNECT_DELAY); + connectIntent.putExtra(JumbleService.EXTRAS_AUTO_RECONNECT_DELAY, QRPushToTalkService.RECONNECT_DELAY); connectIntent.putExtra(JumbleService.EXTRAS_USE_OPUS, !mSettings.isOpusDisabled()); connectIntent.putExtra(JumbleService.EXTRAS_INPUT_RATE, mSettings.getInputSampleRate()); connectIntent.putExtra(JumbleService.EXTRAS_INPUT_QUALITY, mSettings.getInputQuality()); @@ -87,9 +87,9 @@ protected Intent doInBackground(Server... params) { connectIntent.putExtra(JumbleService.EXTRAS_AUDIO_SOURCE, audioSource); connectIntent.putExtra(JumbleService.EXTRAS_AUDIO_STREAM, audioStream); connectIntent.putExtra(JumbleService.EXTRAS_FRAMES_PER_PACKET, mSettings.getFramesPerPacket()); - connectIntent.putExtra(JumbleService.EXTRAS_TRUST_STORE, PlumbleTrustStore.getTrustStorePath(mContext)); - connectIntent.putExtra(JumbleService.EXTRAS_TRUST_STORE_PASSWORD, PlumbleTrustStore.getTrustStorePassword()); - connectIntent.putExtra(JumbleService.EXTRAS_TRUST_STORE_FORMAT, PlumbleTrustStore.getTrustStoreFormat()); + connectIntent.putExtra(JumbleService.EXTRAS_TRUST_STORE, QRPushToTalkTrustStore.getTrustStorePath(mContext)); + connectIntent.putExtra(JumbleService.EXTRAS_TRUST_STORE_PASSWORD, QRPushToTalkTrustStore.getTrustStorePassword()); + connectIntent.putExtra(JumbleService.EXTRAS_TRUST_STORE_FORMAT, QRPushToTalkTrustStore.getTrustStoreFormat()); connectIntent.putExtra(JumbleService.EXTRAS_HALF_DUPLEX, mSettings.isHalfDuplex()); connectIntent.putExtra(JumbleService.EXTRAS_ENABLE_PREPROCESSOR, mSettings.isPreprocessorEnabled()); if (server.isSaved()) { diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/AccessTokenFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/AccessTokenFragment.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/channel/AccessTokenFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/AccessTokenFragment.java index a778c73f..635aa01a --- a/app/src/main/java/com/morlunk/mumbleclient/channel/AccessTokenFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/AccessTokenFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.app.Activity; import android.content.Context; @@ -35,10 +35,10 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.morlunk.mumbleclient.Constants; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.db.DatabaseProvider; -import com.morlunk.mumbleclient.util.JumbleServiceFragment; +import com.terracom.mumbleclient.Constants; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.db.DatabaseProvider; +import com.terracom.mumbleclient.util.JumbleServiceFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelAdapter.java b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelAdapter.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ChannelAdapter.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ChannelAdapter.java index bea1f8d3..55f3c499 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelAdapter.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelAdapter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.content.Context; import android.os.RemoteException; @@ -26,10 +26,10 @@ import android.widget.ImageView; import android.widget.TextView; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.User; -import com.morlunk.mumbleclient.R; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.User; +import com.terracom.mumbleclient.R; /** * Simple adapter to display the users in a single channel. diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelChatFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelChatFragment.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ChannelChatFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ChannelChatFragment.java index dcd68f02..8c227646 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelChatFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelChatFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.app.Activity; import android.content.Context; @@ -42,15 +42,15 @@ import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import com.morlunk.jumble.IJumbleObserver; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.Message; -import com.morlunk.jumble.model.User; -import com.morlunk.jumble.util.JumbleObserver; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.util.JumbleServiceFragment; -import com.morlunk.mumbleclient.util.MumbleImageGetter; +import com.terracom.jumble.IJumbleObserver; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.Message; +import com.terracom.jumble.model.User; +import com.terracom.jumble.util.JumbleObserver; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.util.JumbleServiceFragment; +import com.terracom.mumbleclient.util.MumbleImageGetter; import java.util.ArrayList; import java.util.List; @@ -206,7 +206,7 @@ public void run() { } /** - * Sends the message currently in {@link com.morlunk.mumbleclient.channel.ChannelChatFragment#mChatTextEdit} + * Sends the message currently in {@link com.terracom.mumbleclient.channel.ChannelChatFragment#mChatTextEdit} * to the remote server. Clears the message box if the message was sent successfully. * @throws RemoteException If the service failed to send the message. */ diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelEditFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelEditFragment.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ChannelEditFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ChannelEditFragment.java index 34ef318e..13008bb1 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelEditFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelEditFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.app.Activity; import android.app.AlertDialog; @@ -29,10 +29,10 @@ import android.widget.CheckBox; import android.widget.TextView; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.net.Permissions; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.util.JumbleServiceProvider; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.net.Permissions; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.util.JumbleServiceProvider; /** * Created by andrew on 23/11/13. diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelFragment.java old mode 100644 new mode 100755 similarity index 97% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ChannelFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ChannelFragment.java index 5cf9a5e9..49f1ec36 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.content.SharedPreferences; import android.content.res.TypedArray; @@ -37,12 +37,12 @@ import android.view.ViewGroup; import android.widget.Button; -import com.morlunk.jumble.IJumbleObserver; -import com.morlunk.jumble.model.User; -import com.morlunk.jumble.util.JumbleObserver; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.util.JumbleServiceFragment; +import com.terracom.jumble.IJumbleObserver; +import com.terracom.jumble.model.User; +import com.terracom.jumble.util.JumbleObserver; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.util.JumbleServiceFragment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelListAdapter.java b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelListAdapter.java old mode 100644 new mode 100755 similarity index 96% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ChannelListAdapter.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ChannelListAdapter.java index 5c5b10a9..bcf42c55 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelListAdapter.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelListAdapter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.content.Context; import android.content.res.Resources; @@ -33,13 +33,13 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.User; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.db.PlumbleDatabase; -import com.morlunk.mumbleclient.drawable.CircleDrawable; -import com.morlunk.mumbleclient.drawable.FlipDrawable; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.User; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.db.QRPushToTalkDatabase; +import com.terracom.mumbleclient.drawable.CircleDrawable; +import com.terracom.mumbleclient.drawable.FlipDrawable; import java.util.ArrayList; import java.util.HashMap; @@ -61,7 +61,7 @@ public class ChannelListAdapter extends RecyclerView.Adapter { private Context mContext; private IJumbleService mService; - private PlumbleDatabase mDatabase; + private QRPushToTalkDatabase mDatabase; private List mRootChannels; private List mNodes; /** @@ -72,7 +72,7 @@ public class ChannelListAdapter extends RecyclerView.Adapter { private OnUserClickListener mUserClickListener; private OnChannelClickListener mChannelClickListener; - public ChannelListAdapter(Context context, IJumbleService service, PlumbleDatabase database, boolean showPinnedOnly) throws RemoteException { + public ChannelListAdapter(Context context, IJumbleService service, QRPushToTalkDatabase database, boolean showPinnedOnly) throws RemoteException { setHasStableIds(true); mContext = context; mService = service; diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelListFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelListFragment.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ChannelListFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ChannelListFragment.java index 59479a54..25c156af --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelListFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelListFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.app.Activity; import android.app.SearchManager; @@ -41,18 +41,18 @@ import android.view.View; import android.view.ViewGroup; -import com.morlunk.jumble.IJumbleObserver; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.Server; -import com.morlunk.jumble.model.User; -import com.morlunk.jumble.util.JumbleObserver; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.channel.actionmode.ChannelActionModeCallback; -import com.morlunk.mumbleclient.channel.actionmode.UserActionModeCallback; -import com.morlunk.mumbleclient.db.DatabaseProvider; -import com.morlunk.mumbleclient.db.PlumbleDatabase; -import com.morlunk.mumbleclient.util.JumbleServiceFragment; +import com.terracom.jumble.IJumbleObserver; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.Server; +import com.terracom.jumble.model.User; +import com.terracom.jumble.util.JumbleObserver; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.channel.actionmode.ChannelActionModeCallback; +import com.terracom.mumbleclient.channel.actionmode.UserActionModeCallback; +import com.terracom.mumbleclient.db.DatabaseProvider; +import com.terracom.mumbleclient.db.QRPushToTalkDatabase; +import com.terracom.mumbleclient.util.JumbleServiceFragment; public class ChannelListFragment extends JumbleServiceFragment implements UserActionModeCallback.LocalUserUpdateListener, OnChannelClickListener, OnUserClickListener { @@ -209,14 +209,14 @@ public void onPrepareOptionsMenu(Menu menu) { e.printStackTrace(); } - try { + /*try { if(getService() != null) { MenuItem bluetoothItem = menu.findItem(R.id.menu_bluetooth); bluetoothItem.setChecked(getService().isBluetoothAvailable()); } } catch (RemoteException e) { e.printStackTrace(); - } + }*/ } @Override @@ -297,14 +297,14 @@ public boolean onOptionsItemSelected(MenuItem item) { return true; case R.id.menu_search: return false; - case R.id.menu_bluetooth: + /*case R.id.menu_bluetooth: item.setChecked(!item.isChecked()); try { getService().setBluetoothEnabled(item.isChecked()); } catch (RemoteException e) { e.printStackTrace(); } - return true; + return true; */ } return super.onOptionsItemSelected(item); @@ -343,7 +343,7 @@ public void onLocalUserStateUpdated(final User user) { mChannelListAdapter.notifyDataSetChanged(); // Add or remove registered user from local mute history - final PlumbleDatabase database = mDatabaseProvider.getDatabase(); + final QRPushToTalkDatabase database = mDatabaseProvider.getDatabase(); final Server server = getService().getConnectedServer(); if (user.getUserId() >= 0 && server.isSaved()) { diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelSearchProvider.java b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelSearchProvider.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ChannelSearchProvider.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ChannelSearchProvider.java index 95e42ef6..241b7411 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelSearchProvider.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ChannelSearchProvider.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.app.SearchManager; import android.content.ComponentName; @@ -30,12 +30,12 @@ import android.os.RemoteException; import android.util.Log; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.User; -import com.morlunk.mumbleclient.Constants; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.service.PlumbleService; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.User; +import com.terracom.mumbleclient.Constants; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.service.QRPushToTalkService; import java.util.LinkedList; import java.util.List; @@ -94,7 +94,7 @@ public Cursor query(Uri uri, String[] projection, String selection, // Try to connect to the service. Wait for conn to establish. if(mService == null) { - Intent serviceIntent = new Intent(getContext(), PlumbleService.class); + Intent serviceIntent = new Intent(getContext(), QRPushToTalkService.class); getContext().bindService(serviceIntent, mConn, 0); synchronized (mServiceLock) { diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChatTargetProvider.java b/app/src/main/java/com/terracom/mumbleclient/channel/ChatTargetProvider.java old mode 100644 new mode 100755 similarity index 93% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ChatTargetProvider.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ChatTargetProvider.java index 8c8b5328..96a9cf58 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChatTargetProvider.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ChatTargetProvider.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.User; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.User; public interface ChatTargetProvider { diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/OnChannelClickListener.java b/app/src/main/java/com/terracom/mumbleclient/channel/OnChannelClickListener.java old mode 100644 new mode 100755 similarity index 90% rename from app/src/main/java/com/morlunk/mumbleclient/channel/OnChannelClickListener.java rename to app/src/main/java/com/terracom/mumbleclient/channel/OnChannelClickListener.java index 540711d2..8fc9c1e8 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/OnChannelClickListener.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/OnChannelClickListener.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; -import com.morlunk.jumble.model.Channel; +import com.terracom.jumble.model.Channel; /** * Created by andrew on 20/10/14. diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/OnUserClickListener.java b/app/src/main/java/com/terracom/mumbleclient/channel/OnUserClickListener.java old mode 100644 new mode 100755 similarity index 90% rename from app/src/main/java/com/morlunk/mumbleclient/channel/OnUserClickListener.java rename to app/src/main/java/com/terracom/mumbleclient/channel/OnUserClickListener.java index d7d7b6fd..a6b80cfe --- a/app/src/main/java/com/morlunk/mumbleclient/channel/OnUserClickListener.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/OnUserClickListener.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; -import com.morlunk.jumble.model.User; +import com.terracom.jumble.model.User; /** * Created by andrew on 20/10/14. diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ServerInfoFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/ServerInfoFragment.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/channel/ServerInfoFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/ServerInfoFragment.java index 8dea26e9..3901281d --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ServerInfoFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/ServerInfoFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel; +package com.terracom.mumbleclient.channel; import android.os.Bundle; import android.os.Handler; @@ -26,10 +26,10 @@ import android.view.ViewGroup; import android.widget.TextView; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.net.JumbleUDPMessageType; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.util.JumbleServiceFragment; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.net.JumbleUDPMessageType; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.util.JumbleServiceFragment; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/ChannelActionModeCallback.java b/app/src/main/java/com/terracom/mumbleclient/channel/actionmode/ChannelActionModeCallback.java old mode 100644 new mode 100755 similarity index 91% rename from app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/ChannelActionModeCallback.java rename to app/src/main/java/com/terracom/mumbleclient/channel/actionmode/ChannelActionModeCallback.java index fc55b9fe..ec059322 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/ChannelActionModeCallback.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/actionmode/ChannelActionModeCallback.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel.actionmode; +package com.terracom.mumbleclient.channel.actionmode; import android.app.AlertDialog; import android.content.Context; @@ -33,16 +33,16 @@ import android.view.MenuInflater; import android.view.MenuItem; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.Server; -import com.morlunk.jumble.net.Permissions; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.channel.ChannelEditFragment; -import com.morlunk.mumbleclient.channel.ChatTargetProvider; -import com.morlunk.mumbleclient.channel.comment.ChannelDescriptionFragment; -import com.morlunk.mumbleclient.db.PlumbleDatabase; -import com.morlunk.mumbleclient.util.TintedMenuInflater; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.Server; +import com.terracom.jumble.net.Permissions; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.channel.ChannelEditFragment; +import com.terracom.mumbleclient.channel.ChatTargetProvider; +import com.terracom.mumbleclient.channel.comment.ChannelDescriptionFragment; +import com.terracom.mumbleclient.db.QRPushToTalkDatabase; +import com.terracom.mumbleclient.util.TintedMenuInflater; /** * Contextual action mode for channels. @@ -54,14 +54,14 @@ public class ChannelActionModeCallback extends ChatTargetActionModeCallback { private Context mContext; private IJumbleService mService; private Channel mChannel; - private PlumbleDatabase mDatabase; + private QRPushToTalkDatabase mDatabase; private FragmentManager mFragmentManager; public ChannelActionModeCallback(Context context, IJumbleService service, Channel channel, ChatTargetProvider chatTargetProvider, - PlumbleDatabase database, + QRPushToTalkDatabase database, FragmentManager fragmentManager) { super(chatTargetProvider); mContext = context; diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/ChatTargetActionModeCallback.java b/app/src/main/java/com/terracom/mumbleclient/channel/actionmode/ChatTargetActionModeCallback.java old mode 100644 new mode 100755 similarity index 93% rename from app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/ChatTargetActionModeCallback.java rename to app/src/main/java/com/terracom/mumbleclient/channel/actionmode/ChatTargetActionModeCallback.java index 0ac183d5..a3974807 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/ChatTargetActionModeCallback.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/actionmode/ChatTargetActionModeCallback.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel.actionmode; +package com.terracom.mumbleclient.channel.actionmode; import android.support.v7.view.ActionMode; import android.view.Menu; -import com.morlunk.mumbleclient.channel.ChatTargetProvider; +import com.terracom.mumbleclient.channel.ChatTargetProvider; /** * A callback that sets the active chat target when activated, and resets when destroyed (usually diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/UserActionModeCallback.java b/app/src/main/java/com/terracom/mumbleclient/channel/actionmode/UserActionModeCallback.java old mode 100644 new mode 100755 similarity index 96% rename from app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/UserActionModeCallback.java rename to app/src/main/java/com/terracom/mumbleclient/channel/actionmode/UserActionModeCallback.java index 9219f4fc..0b5e61d2 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/actionmode/UserActionModeCallback.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/actionmode/UserActionModeCallback.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel.actionmode; +package com.terracom.mumbleclient.channel.actionmode; import android.app.AlertDialog; import android.content.Context; @@ -30,15 +30,15 @@ import android.view.MenuItem; import android.widget.EditText; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.User; -import com.morlunk.jumble.net.Permissions; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.channel.ChatTargetProvider; -import com.morlunk.mumbleclient.channel.comment.UserCommentFragment; -import com.morlunk.mumbleclient.util.ModelUtils; -import com.morlunk.mumbleclient.util.TintedMenuInflater; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.User; +import com.terracom.jumble.net.Permissions; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.channel.ChatTargetProvider; +import com.terracom.mumbleclient.channel.comment.UserCommentFragment; +import com.terracom.mumbleclient.util.ModelUtils; +import com.terracom.mumbleclient.util.TintedMenuInflater; import java.util.List; diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/comment/AbstractCommentFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/comment/AbstractCommentFragment.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/channel/comment/AbstractCommentFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/comment/AbstractCommentFragment.java index 4f6147cd..9850bf92 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/comment/AbstractCommentFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/comment/AbstractCommentFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel.comment; +package com.terracom.mumbleclient.channel.comment; import android.app.Activity; import android.app.AlertDialog; @@ -30,9 +30,9 @@ import android.widget.EditText; import android.widget.TabHost; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.util.JumbleServiceProvider; +import com.terracom.jumble.IJumbleService; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.util.JumbleServiceProvider; /** * Fragment to change your comment using basic WYSIWYG tools. @@ -141,7 +141,7 @@ public boolean isEditing() { /** * Requests a comment from the service. Will not be called if we already have a comment provided. - * This method is expected to set a callback that will call {@link com.morlunk.mumbleclient.channel.comment.AbstractCommentFragment#loadComment(String comment)}. + * This method is expected to set a callback that will call {@link com.terracom.mumbleclient.channel.comment.AbstractCommentFragment#loadComment(String comment)}. * @param service The bound Jumble service to use for remote calls. */ public abstract void requestComment(IJumbleService service) throws RemoteException; diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/comment/ChannelDescriptionFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/comment/ChannelDescriptionFragment.java old mode 100644 new mode 100755 similarity index 90% rename from app/src/main/java/com/morlunk/mumbleclient/channel/comment/ChannelDescriptionFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/comment/ChannelDescriptionFragment.java index 982cf7f2..116af542 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/comment/ChannelDescriptionFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/comment/ChannelDescriptionFragment.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel.comment; +package com.terracom.mumbleclient.channel.comment; import android.os.RemoteException; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.util.JumbleObserver; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.util.JumbleObserver; /** * Created by andrew on 03/03/14. diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/comment/UserCommentFragment.java b/app/src/main/java/com/terracom/mumbleclient/channel/comment/UserCommentFragment.java old mode 100644 new mode 100755 similarity index 90% rename from app/src/main/java/com/morlunk/mumbleclient/channel/comment/UserCommentFragment.java rename to app/src/main/java/com/terracom/mumbleclient/channel/comment/UserCommentFragment.java index 3aa952e8..bfe7e83b --- a/app/src/main/java/com/morlunk/mumbleclient/channel/comment/UserCommentFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/channel/comment/UserCommentFragment.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.channel.comment; +package com.terracom.mumbleclient.channel.comment; import android.os.RemoteException; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.User; -import com.morlunk.jumble.util.JumbleObserver; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.User; +import com.terracom.jumble.util.JumbleObserver; /** * Created by andrew on 03/03/14. diff --git a/app/src/main/java/com/morlunk/mumbleclient/db/DatabaseProvider.java b/app/src/main/java/com/terracom/mumbleclient/db/DatabaseProvider.java old mode 100644 new mode 100755 similarity index 90% rename from app/src/main/java/com/morlunk/mumbleclient/db/DatabaseProvider.java rename to app/src/main/java/com/terracom/mumbleclient/db/DatabaseProvider.java index 31ae9582..2324751d --- a/app/src/main/java/com/morlunk/mumbleclient/db/DatabaseProvider.java +++ b/app/src/main/java/com/terracom/mumbleclient/db/DatabaseProvider.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.db; +package com.terracom.mumbleclient.db; /** * Created by andrew on 15/08/13. */ public interface DatabaseProvider { - public PlumbleDatabase getDatabase(); + public QRPushToTalkDatabase getDatabase(); } diff --git a/app/src/main/java/com/morlunk/mumbleclient/db/PublicServer.java b/app/src/main/java/com/terracom/mumbleclient/db/PublicServer.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/db/PublicServer.java rename to app/src/main/java/com/terracom/mumbleclient/db/PublicServer.java index 3e914000..69b73cdc --- a/app/src/main/java/com/morlunk/mumbleclient/db/PublicServer.java +++ b/app/src/main/java/com/terracom/mumbleclient/db/PublicServer.java @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.db; +package com.terracom.mumbleclient.db; -import com.morlunk.jumble.model.Server; +import com.terracom.jumble.model.Server; public class PublicServer extends Server { diff --git a/app/src/main/java/com/morlunk/mumbleclient/db/PlumbleDatabase.java b/app/src/main/java/com/terracom/mumbleclient/db/QRPushToTalkDatabase.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/db/PlumbleDatabase.java rename to app/src/main/java/com/terracom/mumbleclient/db/QRPushToTalkDatabase.java index eddd2c38..1facbbdb --- a/app/src/main/java/com/morlunk/mumbleclient/db/PlumbleDatabase.java +++ b/app/src/main/java/com/terracom/mumbleclient/db/QRPushToTalkDatabase.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.db; +package com.terracom.mumbleclient.db; -import com.morlunk.jumble.model.Server; +import com.terracom.jumble.model.Server; import java.util.List; @@ -25,7 +25,7 @@ * An interface for persistent storage services (i.e. databases, cloud) to implement. * Created by andrew on 13/08/13. */ -public interface PlumbleDatabase { +public interface QRPushToTalkDatabase { public void open(); public void close(); diff --git a/app/src/main/java/com/morlunk/mumbleclient/db/PlumbleSQLiteDatabase.java b/app/src/main/java/com/terracom/mumbleclient/db/QRPushToTalkSQLiteDatabase.java old mode 100644 new mode 100755 similarity index 97% rename from app/src/main/java/com/morlunk/mumbleclient/db/PlumbleSQLiteDatabase.java rename to app/src/main/java/com/terracom/mumbleclient/db/QRPushToTalkSQLiteDatabase.java index c4a52e3f..1fda4aac --- a/app/src/main/java/com/morlunk/mumbleclient/db/PlumbleSQLiteDatabase.java +++ b/app/src/main/java/com/terracom/mumbleclient/db/QRPushToTalkSQLiteDatabase.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.db; +package com.terracom.mumbleclient.db; import android.content.ContentValues; import android.content.Context; @@ -24,13 +24,13 @@ import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.Constants; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.Constants; import java.util.ArrayList; import java.util.List; -public class PlumbleSQLiteDatabase extends SQLiteOpenHelper implements PlumbleDatabase { +public class QRPushToTalkSQLiteDatabase extends SQLiteOpenHelper implements QRPushToTalkDatabase { public static final String DATABASE_NAME = "mumble.db"; public static final String TABLE_SERVER = "server"; @@ -104,11 +104,11 @@ public class PlumbleSQLiteDatabase extends SQLiteOpenHelper implements PlumbleDa public static final Integer PRE_LOCAL_IGNORE_DB_VERSION = 6; public static final Integer CURRENT_DB_VERSION = 7; - public PlumbleSQLiteDatabase(Context context) { + public QRPushToTalkSQLiteDatabase(Context context) { super(context, DATABASE_NAME, null, CURRENT_DB_VERSION); } - public PlumbleSQLiteDatabase(Context context, String name) { + public QRPushToTalkSQLiteDatabase(Context context, String name) { super(context, name, null, CURRENT_DB_VERSION); } diff --git a/app/src/main/java/com/morlunk/mumbleclient/drawable/CircleDrawable.java b/app/src/main/java/com/terracom/mumbleclient/drawable/CircleDrawable.java old mode 100644 new mode 100755 similarity index 97% rename from app/src/main/java/com/morlunk/mumbleclient/drawable/CircleDrawable.java rename to app/src/main/java/com/terracom/mumbleclient/drawable/CircleDrawable.java index 549bc350..4263f695 --- a/app/src/main/java/com/morlunk/mumbleclient/drawable/CircleDrawable.java +++ b/app/src/main/java/com/terracom/mumbleclient/drawable/CircleDrawable.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.drawable; +package com.terracom.mumbleclient.drawable; import android.content.res.Resources; import android.graphics.Bitmap; @@ -30,7 +30,7 @@ import android.graphics.drawable.Drawable; import android.util.TypedValue; -import com.morlunk.mumbleclient.R; +import com.terracom.mumbleclient.R; /** * A drawable containing a circular bitmap in the style of @drawable/outline_circle_talking_off. diff --git a/app/src/main/java/com/morlunk/mumbleclient/drawable/FlipDrawable.java b/app/src/main/java/com/terracom/mumbleclient/drawable/FlipDrawable.java old mode 100644 new mode 100755 similarity index 98% rename from app/src/main/java/com/morlunk/mumbleclient/drawable/FlipDrawable.java rename to app/src/main/java/com/terracom/mumbleclient/drawable/FlipDrawable.java index 268b26fa..1d5fb62c --- a/app/src/main/java/com/morlunk/mumbleclient/drawable/FlipDrawable.java +++ b/app/src/main/java/com/terracom/mumbleclient/drawable/FlipDrawable.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.drawable; +package com.terracom.mumbleclient.drawable; import android.animation.ValueAnimator; import android.annotation.TargetApi; diff --git a/app/src/main/java/com/morlunk/mumbleclient/preference/KeySelectDialogPreference.java b/app/src/main/java/com/terracom/mumbleclient/preference/KeySelectDialogPreference.java old mode 100644 new mode 100755 similarity index 98% rename from app/src/main/java/com/morlunk/mumbleclient/preference/KeySelectDialogPreference.java rename to app/src/main/java/com/terracom/mumbleclient/preference/KeySelectDialogPreference.java index 1e627f7a..e00aab00 --- a/app/src/main/java/com/morlunk/mumbleclient/preference/KeySelectDialogPreference.java +++ b/app/src/main/java/com/terracom/mumbleclient/preference/KeySelectDialogPreference.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.preference; +package com.terracom.mumbleclient.preference; import android.annotation.TargetApi; import android.app.AlertDialog.Builder; @@ -33,7 +33,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.morlunk.mumbleclient.R; +import com.terracom.mumbleclient.R; public class KeySelectDialogPreference extends DialogPreference implements OnKeyListener { diff --git a/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java b/app/src/main/java/com/terracom/mumbleclient/preference/Preferences.java old mode 100644 new mode 100755 similarity index 90% rename from app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java rename to app/src/main/java/com/terracom/mumbleclient/preference/Preferences.java index 8658f265..245cc0f9 --- a/app/src/main/java/com/morlunk/mumbleclient/preference/Preferences.java +++ b/app/src/main/java/com/terracom/mumbleclient/preference/Preferences.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.preference; +package com.terracom.mumbleclient.preference; import android.annotation.TargetApi; import android.app.AlertDialog; @@ -40,9 +40,9 @@ import android.widget.EditText; import android.widget.Toast; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.util.PlumbleTrustStore; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.util.QRPushToTalkTrustStore; import java.io.File; import java.io.IOException; @@ -58,11 +58,11 @@ */ public class Preferences extends PreferenceActivity { - public static final String ACTION_PREFS_GENERAL = "com.morlunk.mumbleclient.app.PREFS_GENERAL"; - public static final String ACTION_PREFS_AUTHENTICATION = "com.morlunk.mumbleclient.app.PREFS_AUTHENTICATION"; - public static final String ACTION_PREFS_AUDIO = "com.morlunk.mumbleclient.app.PREFS_AUDIO"; - public static final String ACTION_PREFS_APPEARANCE = "com.morlunk.mumbleclient.app.PREFS_APPEARANCE"; - public static final String ACTION_PREFS_ABOUT = "com.morlunk.mumbleclient.app.PREFS_ABOUT"; + public static final String ACTION_PREFS_GENERAL = "com.terracom.mumbleclient.app.PREFS_GENERAL"; + public static final String ACTION_PREFS_AUTHENTICATION = "com.terracom.mumbleclient.app.PREFS_AUTHENTICATION"; + public static final String ACTION_PREFS_AUDIO = "com.terracom.mumbleclient.app.PREFS_AUDIO"; + public static final String ACTION_PREFS_APPEARANCE = "com.terracom.mumbleclient.app.PREFS_APPEARANCE"; + public static final String ACTION_PREFS_ABOUT = "com.terracom.mumbleclient.app.PREFS_ABOUT"; private static final String CERTIFICATE_GENERATE_KEY = "certificateGenerate"; private static final String CERTIFICATE_PATH_KEY = "certificatePath"; @@ -106,7 +106,7 @@ public void onBuildHeaders(List
target) { @Override protected boolean isValidFragment(String fragmentName) { - return PlumblePreferenceFragment.class.getName().equals(fragmentName); + return QRPushToTalkPreferenceFragment.class.getName().equals(fragmentName); } private static void configureCertificatePreferences(PreferenceScreen screen) { @@ -133,7 +133,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { if("".equals(newValue)) return true; // No certificate File cert = new File((String)newValue); try { - boolean needsPassword = PlumbleCertificateManager.isPasswordRequired(cert); + boolean needsPassword = QRPushToTalkCertificateManager.isPasswordRequired(cert); if(!needsPassword) return true; // If we need a password, prompt the user. Do NOT change the preference until @@ -150,7 +150,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { trustClearPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { - PlumbleTrustStore.clearTrustStore(preference.getContext()); + QRPushToTalkTrustStore.clearTrustStore(preference.getContext()); Toast.makeText(preference.getContext(), R.string.trust_cleared, Toast.LENGTH_LONG).show(); return true; } @@ -188,7 +188,7 @@ public void onClick(DialogInterface dialog, int which) { String password = passwordField.getText().toString(); boolean passwordValid = false; try { - passwordValid = PlumbleCertificateManager.isPasswordValid(certificate, password); + passwordValid = QRPushToTalkCertificateManager.isPasswordValid(certificate, password); } catch (KeyStoreException e) { e.printStackTrace(); } catch (IOException e) { @@ -244,8 +244,10 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { private static void updateAudioDependents(PreferenceScreen screen, String inputMethod) { PreferenceCategory pttCategory = (PreferenceCategory) screen.findPreference("ptt_settings"); PreferenceCategory vadCategory = (PreferenceCategory) screen.findPreference("vad_settings"); - pttCategory.setEnabled(Settings.ARRAY_INPUT_METHOD_PTT.equals(inputMethod)); - vadCategory.setEnabled(Settings.ARRAY_INPUT_METHOD_VOICE.equals(inputMethod)); + //pttCategory.setEnabled(Settings.ARRAY_INPUT_METHOD_PTT.equals(inputMethod)); + pttCategory.setEnabled(true); + //vadCategory.setEnabled(Settings.ARRAY_INPUT_METHOD_VOICE.equals(inputMethod)); + vadCategory.setEnabled(false); } /** @@ -254,7 +256,7 @@ private static void updateAudioDependents(PreferenceScreen screen, String inputM * @param preference The ListPreference to update. */ private static void updateCertificatePath(ListPreference preference) throws NullPointerException, IOException { - List certificateFiles = PlumbleCertificateManager.getAvailableCertificates(); + List certificateFiles = QRPushToTalkCertificateManager.getAvailableCertificates(); // Get arrays of certificate paths and names. String[] certificateNames = new String[certificateFiles.size() + 1]; // Extra space for 'None' option @@ -277,7 +279,7 @@ private static void updateCertificatePath(ListPreference preference) throws Null * @param certificateList If passed, will update the list of certificates available. Messy. */ private static void generateCertificate(final ListPreference certificateList) { - PlumbleCertificateGenerateTask generateTask = new PlumbleCertificateGenerateTask(certificateList.getContext()) { + QRPushToTalkCertificateGenerateTask generateTask = new QRPushToTalkCertificateGenerateTask(certificateList.getContext()) { @Override protected void onPostExecute(File result) { super.onPostExecute(result); @@ -308,7 +310,7 @@ private static void configureAboutPreferences(Context context, PreferenceScreen } @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public static class PlumblePreferenceFragment extends PreferenceFragment { + public static class QRPushToTalkPreferenceFragment extends PreferenceFragment { @Override public void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/com/morlunk/mumbleclient/preference/PlumbleCertificateGenerateTask.java b/app/src/main/java/com/terracom/mumbleclient/preference/QRPushToTalkCertificateGenerateTask.java old mode 100644 new mode 100755 similarity index 86% rename from app/src/main/java/com/morlunk/mumbleclient/preference/PlumbleCertificateGenerateTask.java rename to app/src/main/java/com/terracom/mumbleclient/preference/QRPushToTalkCertificateGenerateTask.java index 98a058d3..d769d1bb --- a/app/src/main/java/com/morlunk/mumbleclient/preference/PlumbleCertificateGenerateTask.java +++ b/app/src/main/java/com/terracom/mumbleclient/preference/QRPushToTalkCertificateGenerateTask.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.preference; +package com.terracom.mumbleclient.preference; import android.app.ProgressDialog; import android.content.Context; @@ -24,16 +24,16 @@ import android.os.AsyncTask; import android.widget.Toast; -import com.morlunk.mumbleclient.R; +import com.terracom.mumbleclient.R; import java.io.File; -public class PlumbleCertificateGenerateTask extends AsyncTask { +public class QRPushToTalkCertificateGenerateTask extends AsyncTask { private Context context; private ProgressDialog loadingDialog; - public PlumbleCertificateGenerateTask(Context context) { + public QRPushToTalkCertificateGenerateTask(Context context) { this.context = context; } @@ -57,7 +57,7 @@ public void onCancel(DialogInterface arg0) { @Override protected File doInBackground(Void... params) { try { - return PlumbleCertificateManager.generateCertificate(); + return QRPushToTalkCertificateManager.generateCertificate(); } catch (Exception e) { e.printStackTrace(); return null; diff --git a/app/src/main/java/com/morlunk/mumbleclient/preference/PlumbleCertificateManager.java b/app/src/main/java/com/terracom/mumbleclient/preference/QRPushToTalkCertificateManager.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/preference/PlumbleCertificateManager.java rename to app/src/main/java/com/terracom/mumbleclient/preference/QRPushToTalkCertificateManager.java index 39b16ae7..b7bae312 --- a/app/src/main/java/com/morlunk/mumbleclient/preference/PlumbleCertificateManager.java +++ b/app/src/main/java/com/terracom/mumbleclient/preference/QRPushToTalkCertificateManager.java @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.preference; +package com.terracom.mumbleclient.preference; import android.os.Environment; -import com.morlunk.jumble.net.JumbleCertificateGenerator; +import com.terracom.jumble.net.JumbleCertificateGenerator; import org.spongycastle.operator.OperatorCreationException; @@ -39,10 +39,10 @@ import java.util.List; import java.util.Locale; -public class PlumbleCertificateManager { +public class QRPushToTalkCertificateManager { - private static final String CERTIFICATE_FOLDER = "Plumble"; - private static final String CERTIFICATE_FORMAT = "plumble-%s.p12"; + private static final String CERTIFICATE_FOLDER = "QRPushToTalk"; + private static final String CERTIFICATE_FORMAT = "qrptt-%s.p12"; private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd_HH-mm-ss"); /** diff --git a/app/src/main/java/com/morlunk/mumbleclient/preference/SeekBarDialogPreference.java b/app/src/main/java/com/terracom/mumbleclient/preference/SeekBarDialogPreference.java old mode 100644 new mode 100755 similarity index 99% rename from app/src/main/java/com/morlunk/mumbleclient/preference/SeekBarDialogPreference.java rename to app/src/main/java/com/terracom/mumbleclient/preference/SeekBarDialogPreference.java index 26b472f2..15fddf80 --- a/app/src/main/java/com/morlunk/mumbleclient/preference/SeekBarDialogPreference.java +++ b/app/src/main/java/com/terracom/mumbleclient/preference/SeekBarDialogPreference.java @@ -23,7 +23,7 @@ * I added some extra functionality like a multiplier + better persistence. * - Andrew Comminos */ -package com.morlunk.mumbleclient.preference; +package com.terracom.mumbleclient.preference; import android.content.Context; import android.preference.DialogPreference; diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/FavouriteServerAdapter.java b/app/src/main/java/com/terracom/mumbleclient/servers/FavouriteServerAdapter.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/servers/FavouriteServerAdapter.java rename to app/src/main/java/com/terracom/mumbleclient/servers/FavouriteServerAdapter.java index 73e7b751..fb7527c9 --- a/app/src/main/java/com/morlunk/mumbleclient/servers/FavouriteServerAdapter.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/FavouriteServerAdapter.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; import android.content.Context; import android.view.MenuItem; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.R; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.R; import java.util.List; diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/FavouriteServerListFragment.java b/app/src/main/java/com/terracom/mumbleclient/servers/FavouriteServerListFragment.java old mode 100644 new mode 100755 similarity index 92% rename from app/src/main/java/com/morlunk/mumbleclient/servers/FavouriteServerListFragment.java rename to app/src/main/java/com/terracom/mumbleclient/servers/FavouriteServerListFragment.java index 3e257f72..090549e5 --- a/app/src/main/java/com/morlunk/mumbleclient/servers/FavouriteServerListFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/FavouriteServerListFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; import android.app.Activity; import android.app.AlertDialog; @@ -36,17 +36,17 @@ import android.widget.GridView; import android.widget.TextView; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.BuildConfig; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.db.DatabaseProvider; -import com.morlunk.mumbleclient.db.PublicServer; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.BuildConfig; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.db.DatabaseProvider; +import com.terracom.mumbleclient.db.PublicServer; import java.util.List; /** * Displays a list of servers, and allows the user to connect and edit them. - * @author morlunk + * @author terracom * */ public class FavouriteServerListFragment extends Fragment implements OnItemClickListener, FavouriteServerAdapter.FavouriteServerAdapterMenuListener { @@ -82,15 +82,15 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, mServerGrid.setOnItemClickListener(this); mServerGrid.setEmptyView(view.findViewById(R.id.server_list_grid_empty)); - TextView donateText = (TextView) view.findViewById(R.id.donate_box); + /*TextView donateText = (TextView) view.findViewById(R.id.donate_box); donateText.setVisibility(BuildConfig.DONATE_NAG ? View.VISIBLE : View.GONE); donateText.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - Intent playIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.morlunk.mumbleclient")); + Intent playIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.terracom.mumbleclient")); startActivity(playIntent); } - }); + });*/ registerForContextMenu(mServerGrid); return view; diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerAdapter.java b/app/src/main/java/com/terracom/mumbleclient/servers/PublicServerAdapter.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerAdapter.java rename to app/src/main/java/com/terracom/mumbleclient/servers/PublicServerAdapter.java index b18b54c1..70f52d8c --- a/app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerAdapter.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/PublicServerAdapter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; import android.content.Context; import android.view.MenuItem; @@ -23,9 +23,9 @@ import android.view.ViewGroup; import android.widget.TextView; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.db.PublicServer; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.db.PublicServer; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerFetchTask.java b/app/src/main/java/com/terracom/mumbleclient/servers/PublicServerFetchTask.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerFetchTask.java rename to app/src/main/java/com/terracom/mumbleclient/servers/PublicServerFetchTask.java index 5c2f3d18..30e75e7d --- a/app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerFetchTask.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/PublicServerFetchTask.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; import android.os.AsyncTask; import android.util.Xml; -import com.morlunk.mumbleclient.db.PublicServer; +import com.terracom.mumbleclient.db.PublicServer; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -48,7 +48,7 @@ protected List doInBackground(Void... params) { URL url = new URL(MUMBLE_PUBLIC_URL); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setRequestMethod("GET"); - connection.addRequestProperty("version", com.morlunk.jumble.Constants.PROTOCOL_STRING); + connection.addRequestProperty("version", com.terracom.jumble.Constants.PROTOCOL_STRING); connection.connect(); InputStream stream = connection.getInputStream(); diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerListFragment.java b/app/src/main/java/com/terracom/mumbleclient/servers/PublicServerListFragment.java old mode 100644 new mode 100755 similarity index 97% rename from app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerListFragment.java rename to app/src/main/java/com/terracom/mumbleclient/servers/PublicServerListFragment.java index 25457b23..7ff66155 --- a/app/src/main/java/com/morlunk/mumbleclient/servers/PublicServerListFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/PublicServerListFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; import android.annotation.TargetApi; import android.app.Activity; @@ -47,12 +47,12 @@ import android.widget.TextView.OnEditorActionListener; import android.widget.Toast; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.db.DatabaseProvider; -import com.morlunk.mumbleclient.db.PlumbleDatabase; -import com.morlunk.mumbleclient.db.PublicServer; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.db.DatabaseProvider; +import com.terracom.mumbleclient.db.QRPushToTalkDatabase; +import com.terracom.mumbleclient.db.PublicServer; import java.util.ArrayList; import java.util.Collection; @@ -67,7 +67,7 @@ /** * Displays a list of public servers that can be connected to, sorted, and favourited. - * @author morlunk + * @author terracom * */ public class PublicServerListFragment extends Fragment implements OnItemClickListener, PublicServerAdapter.PublicServerAdapterMenuListener { @@ -163,7 +163,7 @@ public void onClick(DialogInterface dialog, int which) { } else { server.setUsername(settings.getDefaultUsername()); } - PlumbleDatabase database = mDatabaseProvider.getDatabase(); + QRPushToTalkDatabase database = mDatabaseProvider.getDatabase(); database.addServer(server); } }); @@ -349,7 +349,7 @@ protected void onPostExecute(ServerInfoResponse serverInfoResponse) { if(serverInfoResponse == null) { // TODO handle bad responses } else if(serverInfoResponse.getCurrentUsers() == 0 && - serverInfoResponse.getVersion() == com.morlunk.jumble.Constants.PROTOCOL_VERSION) { + serverInfoResponse.getVersion() == com.terracom.jumble.Constants.PROTOCOL_VERSION) { mGoodResponses.add(serverInfoResponse); } diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/ServerAdapter.java b/app/src/main/java/com/terracom/mumbleclient/servers/ServerAdapter.java old mode 100644 new mode 100755 similarity index 98% rename from app/src/main/java/com/morlunk/mumbleclient/servers/ServerAdapter.java rename to app/src/main/java/com/terracom/mumbleclient/servers/ServerAdapter.java index d3a74e55..75ded86c --- a/app/src/main/java/com/morlunk/mumbleclient/servers/ServerAdapter.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/ServerAdapter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; import android.content.Context; import android.os.Build; @@ -29,8 +29,8 @@ import android.widget.ProgressBar; import android.widget.TextView; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.R; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.R; import java.util.List; import java.util.concurrent.ConcurrentHashMap; diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/ServerEditFragment.java b/app/src/main/java/com/terracom/mumbleclient/servers/ServerEditFragment.java old mode 100644 new mode 100755 similarity index 96% rename from app/src/main/java/com/morlunk/mumbleclient/servers/ServerEditFragment.java rename to app/src/main/java/com/terracom/mumbleclient/servers/ServerEditFragment.java index 29c0a58f..15dc4eb6 --- a/app/src/main/java/com/morlunk/mumbleclient/servers/ServerEditFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/ServerEditFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; import android.app.Activity; import android.app.AlertDialog; @@ -27,11 +27,11 @@ import android.widget.EditText; import android.widget.TextView; -import com.morlunk.jumble.Constants; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.db.DatabaseProvider; +import com.terracom.jumble.Constants; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.db.DatabaseProvider; public class ServerEditFragment extends DialogFragment { private TextView mNameTitle; diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/ServerInfoResponse.java b/app/src/main/java/com/terracom/mumbleclient/servers/ServerInfoResponse.java old mode 100644 new mode 100755 similarity index 96% rename from app/src/main/java/com/morlunk/mumbleclient/servers/ServerInfoResponse.java rename to app/src/main/java/com/terracom/mumbleclient/servers/ServerInfoResponse.java index 96611351..ba949a3e --- a/app/src/main/java/com/morlunk/mumbleclient/servers/ServerInfoResponse.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/ServerInfoResponse.java @@ -15,16 +15,16 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; -import com.morlunk.jumble.model.Server; +import com.terracom.jumble.model.Server; import java.nio.ByteBuffer; /** * Response from server pings. * @see http://mumble.sourceforge.net/Protocol - * @author morlunk + * @author terracom */ public class ServerInfoResponse { diff --git a/app/src/main/java/com/morlunk/mumbleclient/servers/ServerInfoTask.java b/app/src/main/java/com/terracom/mumbleclient/servers/ServerInfoTask.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/servers/ServerInfoTask.java rename to app/src/main/java/com/terracom/mumbleclient/servers/ServerInfoTask.java index 73c3eb2f..bd12b453 --- a/app/src/main/java/com/morlunk/mumbleclient/servers/ServerInfoTask.java +++ b/app/src/main/java/com/terracom/mumbleclient/servers/ServerInfoTask.java @@ -15,13 +15,13 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.servers; +package com.terracom.mumbleclient.servers; import android.os.AsyncTask; import android.util.Log; -import com.morlunk.jumble.model.Server; -import com.morlunk.mumbleclient.Constants; +import com.terracom.jumble.model.Server; +import com.terracom.mumbleclient.Constants; import java.net.DatagramPacket; import java.net.DatagramSocket; @@ -31,7 +31,7 @@ /** * Pings the requested server and returns a ServerInfoResponse. * Will return a 'dummy' ServerInfoResponse in the case of failure. - * @author morlunk + * @author terracom * */ public class ServerInfoTask extends AsyncTask { diff --git a/app/src/main/java/com/morlunk/mumbleclient/service/PlumbleHotCorner.java b/app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkHotCorner.java old mode 100644 new mode 100755 similarity index 85% rename from app/src/main/java/com/morlunk/mumbleclient/service/PlumbleHotCorner.java rename to app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkHotCorner.java index cc82db68..5a0d32ec --- a/app/src/main/java/com/morlunk/mumbleclient/service/PlumbleHotCorner.java +++ b/app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkHotCorner.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.service; +package com.terracom.mumbleclient.service; import android.content.Context; import android.graphics.PixelFormat; @@ -24,24 +24,24 @@ import android.view.View; import android.view.WindowManager; -import com.morlunk.mumbleclient.R; +import com.terracom.mumbleclient.R; /** - * A hot corner in an area of the screen specified by {@link PlumbleHotCorner#getGravity()}. + * A hot corner in an area of the screen specified by {@link QRPushToTalkHotCorner#getGravity()}. * Created by andrew on 07/06/14. */ -public class PlumbleHotCorner implements View.OnTouchListener { +public class QRPushToTalkHotCorner implements View.OnTouchListener { private WindowManager mWindowManager; private Context mContext; private View mView; private boolean mShown; private int mHighlightColour; - private PlumbleHotCornerListener mListener; + private QRPushToTalkHotCornerListener mListener; private WindowManager.LayoutParams mParams; - public PlumbleHotCorner(Context context, int gravity, PlumbleHotCornerListener listener) { + public QRPushToTalkHotCorner(Context context, int gravity, QRPushToTalkHotCornerListener listener) { if(listener == null) { - throw new NullPointerException("A PlumbleHotCornerListener must be assigned."); + throw new NullPointerException("A QRPushToTalkHotCornerListener must be assigned."); } LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); @@ -106,7 +106,7 @@ public int getGravity() { return mParams.gravity; } - public static interface PlumbleHotCornerListener { + public static interface QRPushToTalkHotCornerListener { public void onHotCornerDown(); public void onHotCornerUp(); } diff --git a/app/src/main/java/com/morlunk/mumbleclient/service/PlumbleNotification.java b/app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkNotification.java old mode 100644 new mode 100755 similarity index 87% rename from app/src/main/java/com/morlunk/mumbleclient/service/PlumbleNotification.java rename to app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkNotification.java index 8e32ae7e..e9381025 --- a/app/src/main/java/com/morlunk/mumbleclient/service/PlumbleNotification.java +++ b/app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkNotification.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.service; +package com.terracom.mumbleclient.service; import android.app.Notification; import android.app.PendingIntent; @@ -26,18 +26,18 @@ import android.content.IntentFilter; import android.support.v4.app.NotificationCompat; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.app.DrawerAdapter; -import com.morlunk.mumbleclient.app.PlumbleActivity; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.app.DrawerAdapter; +import com.terracom.mumbleclient.app.QRPushToTalkActivity; import java.util.ArrayList; import java.util.List; /** - * Wrapper to create Plumble notifications. + * Wrapper to create QRPushToTalk notifications. * Created by andrew on 08/08/14. */ -public class PlumbleNotification { +public class QRPushToTalkNotification { private static final int NOTIFICATION_ID = 1; private static final String BROADCAST_MUTE = "b_mute"; private static final String BROADCAST_DEAFEN = "b_deafen"; @@ -67,22 +67,22 @@ public void onReceive(Context context, Intent intent) { }; /** - * Creates a foreground Plumble notification for the given service. + * Creates a foreground QRPushToTalk notification for the given service. * @param service The service to register a foreground notification for. * @param listener An listener for notification actions. - * @return A new PlumbleNotification instance. + * @return A new QRPushToTalkNotification instance. */ - public static PlumbleNotification showForeground(Service service, OnActionListener listener) { - PlumbleNotification notification = new PlumbleNotification(service, listener); + public static QRPushToTalkNotification showForeground(Service service, OnActionListener listener) { + QRPushToTalkNotification notification = new QRPushToTalkNotification(service, listener); notification.show(); return notification; } - private PlumbleNotification(Service service, OnActionListener listener) { + private QRPushToTalkNotification(Service service, OnActionListener listener) { mService = service; mListener = listener; mMessages = new ArrayList(); - mCustomTicker = mService.getString(R.string.plumbleConnected); + mCustomTicker = mService.getString(R.string.qrpttConnected); mCustomContentText = mService.getString(R.string.connected); mReconnecting = false; } @@ -151,7 +151,7 @@ public void hide() { } /** - * Called to update/create the service's foreground Plumble notification. + * Called to update/create the service's foreground QRPushToTalk notification. */ private Notification createNotification() { NotificationCompat.Builder builder = new NotificationCompat.Builder(mService); @@ -193,8 +193,8 @@ private Notification createNotification() { builder.setStyle(inboxStyle); } - Intent channelListIntent = new Intent(mService, PlumbleActivity.class); - channelListIntent.putExtra(PlumbleActivity.EXTRA_DRAWER_FRAGMENT, DrawerAdapter.ITEM_SERVER); + Intent channelListIntent = new Intent(mService, QRPushToTalkActivity.class); + channelListIntent.putExtra(QRPushToTalkActivity.EXTRA_DRAWER_FRAGMENT, DrawerAdapter.ITEM_SERVER); // FLAG_CANCEL_CURRENT ensures that the extra always gets sent. PendingIntent pendingIntent = PendingIntent.getActivity(mService, 0, channelListIntent, PendingIntent.FLAG_CANCEL_CURRENT); builder.setContentIntent(pendingIntent); diff --git a/app/src/main/java/com/morlunk/mumbleclient/service/PlumbleOverlay.java b/app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkOverlay.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/service/PlumbleOverlay.java rename to app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkOverlay.java index d37e1362..8d9fc305 --- a/app/src/main/java/com/morlunk/mumbleclient/service/PlumbleOverlay.java +++ b/app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkOverlay.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.service; +package com.terracom.mumbleclient.service; import android.content.Context; import android.graphics.PixelFormat; @@ -28,18 +28,18 @@ import android.widget.ImageView; import android.widget.ListView; -import com.morlunk.jumble.model.Channel; -import com.morlunk.jumble.model.User; -import com.morlunk.jumble.util.JumbleObserver; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.channel.ChannelAdapter; +import com.terracom.jumble.model.Channel; +import com.terracom.jumble.model.User; +import com.terracom.jumble.util.JumbleObserver; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.channel.ChannelAdapter; /** * An onscreen interactive overlay displaying the users in the current channel. * Created by andrew on 26/09/13. */ -public class PlumbleOverlay { +public class QRPushToTalkOverlay { public static final int DEFAULT_WIDTH = 200; public static final int DEFAULT_HEIGHT = 240; @@ -78,9 +78,9 @@ else if(newChannel.getId() == mService.getBinder().getSessionChannel().getId() | private boolean mShown = false; // private boolean mShowChat = false; - private PlumbleService mService; + private QRPushToTalkService mService; - public PlumbleOverlay(PlumbleService service) { + public QRPushToTalkOverlay(QRPushToTalkService service) { mService = service; mOverlayView = View.inflate(service, R.layout.overlay, null); mTalkButton = (ImageView) mOverlayView.findViewById(R.id.overlay_talk); diff --git a/app/src/main/java/com/morlunk/mumbleclient/service/PlumbleService.java b/app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkService.java old mode 100644 new mode 100755 similarity index 89% rename from app/src/main/java/com/morlunk/mumbleclient/service/PlumbleService.java rename to app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkService.java index 07ee2d95..ddb703d3 --- a/app/src/main/java/com/morlunk/mumbleclient/service/PlumbleService.java +++ b/app/src/main/java/com/terracom/mumbleclient/service/QRPushToTalkService.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.service; +package com.terracom.mumbleclient.service; import android.content.BroadcastReceiver; import android.content.Intent; @@ -28,30 +28,30 @@ import android.preference.PreferenceManager; import android.speech.tts.TextToSpeech; -import com.morlunk.jumble.Constants; -import com.morlunk.jumble.JumbleService; -import com.morlunk.jumble.model.Message; -import com.morlunk.jumble.model.User; -import com.morlunk.jumble.util.JumbleObserver; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.service.ipc.TalkBroadcastReceiver; +import com.terracom.jumble.Constants; +import com.terracom.jumble.JumbleService; +import com.terracom.jumble.model.Message; +import com.terracom.jumble.model.User; +import com.terracom.jumble.util.JumbleObserver; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.service.ipc.TalkBroadcastReceiver; /** - * An extension of the Jumble service with some added Plumble-exclusive non-standard Mumble features. + * An extension of the Jumble service with some added QRPushToTalk-exclusive non-standard Mumble features. * Created by andrew on 28/07/13. */ -public class PlumbleService extends JumbleService implements SharedPreferences.OnSharedPreferenceChangeListener { +public class QRPushToTalkService extends JumbleService implements SharedPreferences.OnSharedPreferenceChangeListener { /** Undocumented constant that permits a proximity-sensing wake lock. */ public static final int PROXIMITY_SCREEN_OFF_WAKE_LOCK = 32; public static final int TTS_THRESHOLD = 250; // Maximum number of characters to read public static final int RECONNECT_DELAY = 10000; - private PlumbleBinder mBinder = new PlumbleBinder(); + private QRPushToTalkBinder mBinder = new QRPushToTalkBinder(); private Settings mSettings; - private PlumbleNotification mNotification; + private QRPushToTalkNotification mNotification; /** Channel view overlay. */ - private PlumbleOverlay mChannelOverlay; + private QRPushToTalkOverlay mChannelOverlay; /** Proximity lock for handset mode. */ private PowerManager.WakeLock mProximityLock; /** Play sound when push to talk key is pressed */ @@ -67,8 +67,8 @@ public void onInit(int status) { }; /** The view representing the hot corner. */ - private PlumbleHotCorner mHotCorner; - private PlumbleHotCorner.PlumbleHotCornerListener mHotCornerListener = new PlumbleHotCorner.PlumbleHotCornerListener() { + private QRPushToTalkHotCorner mHotCorner; + private QRPushToTalkHotCorner.QRPushToTalkHotCornerListener mHotCornerListener = new QRPushToTalkHotCorner.QRPushToTalkHotCornerListener() { @Override public void onHotCornerDown() { try { @@ -175,7 +175,7 @@ public void onUserTalkStateUpdated(User user) throws RemoteException { } } }; - private PlumbleNotification.OnActionListener mNotificationActionListener = new PlumbleNotification.OnActionListener() { + private QRPushToTalkNotification.OnActionListener mNotificationActionListener = new QRPushToTalkNotification.OnActionListener() { @Override public void onMuteToggled() { try { @@ -238,11 +238,11 @@ public void onCreate() { // Manually set theme to style overlay views // XML theme does NOT do this! - setTheme(R.style.Theme_Plumble); + setTheme(R.style.Theme_QRPushToTalk); // Instantiate overlay view - mChannelOverlay = new PlumbleOverlay(this); - mHotCorner = new PlumbleHotCorner(this, mSettings.getHotCornerGravity(), mHotCornerListener); + mChannelOverlay = new QRPushToTalkOverlay(this); + mHotCorner = new QRPushToTalkHotCorner(this, mSettings.getHotCornerGravity(), mHotCornerListener); // Set up TTS if(mSettings.isTextToSpeechEnabled()) @@ -295,7 +295,7 @@ public void onConnectionSynchronized() { mNotification = null; } - mNotification = PlumbleNotification.showForeground(this, mNotificationActionListener); + mNotification = QRPushToTalkNotification.showForeground(this, mNotificationActionListener); registerReceiver(mTalkReceiver, new IntentFilter(TalkBroadcastReceiver.BROADCAST_TALK)); @@ -389,7 +389,7 @@ else if (mTTS != null && !mSettings.isTextToSpeechEnabled()) { private void setProximitySensorOn(boolean on) { if(on) { PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE); - mProximityLock = pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, "plumble_proximity"); + mProximityLock = pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, "qrptt_proximity"); mProximityLock.acquire(); } else { if(mProximityLock != null) mProximityLock.release(); @@ -398,7 +398,7 @@ private void setProximitySensorOn(boolean on) { } @Override - public PlumbleBinder getBinder() { + public QRPushToTalkBinder getBinder() { return mBinder; } @@ -408,9 +408,9 @@ public IBinder onBind(Intent intent) { } /** - * An extension of JumbleBinder to add Plumble-specific functionality. + * An extension of JumbleBinder to add QRPushToTalk-specific functionality. */ - public class PlumbleBinder extends JumbleBinder { + public class QRPushToTalkBinder extends JumbleBinder { public void setOverlayShown(boolean showOverlay) { if(!mChannelOverlay.isShown()) { mChannelOverlay.show(); diff --git a/app/src/main/java/com/morlunk/mumbleclient/service/ipc/TalkBroadcastReceiver.java b/app/src/main/java/com/terracom/mumbleclient/service/ipc/TalkBroadcastReceiver.java old mode 100644 new mode 100755 similarity index 92% rename from app/src/main/java/com/morlunk/mumbleclient/service/ipc/TalkBroadcastReceiver.java rename to app/src/main/java/com/terracom/mumbleclient/service/ipc/TalkBroadcastReceiver.java index 57772cd2..be2f8d15 --- a/app/src/main/java/com/morlunk/mumbleclient/service/ipc/TalkBroadcastReceiver.java +++ b/app/src/main/java/com/terracom/mumbleclient/service/ipc/TalkBroadcastReceiver.java @@ -15,20 +15,20 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.service.ipc; +package com.terracom.mumbleclient.service.ipc; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.RemoteException; -import com.morlunk.jumble.IJumbleService; +import com.terracom.jumble.IJumbleService; /** * Created by andrew on 08/08/14. */ public class TalkBroadcastReceiver extends BroadcastReceiver { - public static final String BROADCAST_TALK = "com.morlunk.mumbleclient.action.TALK"; + public static final String BROADCAST_TALK = "com.terracom.mumbleclient.action.TALK"; public static final String EXTRA_TALK_STATUS = "status"; public static final String TALK_STATUS_ON = "on"; public static final String TALK_STATUS_OFF = "off"; diff --git a/app/src/main/java/com/morlunk/mumbleclient/util/JumbleServiceFragment.java b/app/src/main/java/com/terracom/mumbleclient/util/JumbleServiceFragment.java old mode 100644 new mode 100755 similarity index 96% rename from app/src/main/java/com/morlunk/mumbleclient/util/JumbleServiceFragment.java rename to app/src/main/java/com/terracom/mumbleclient/util/JumbleServiceFragment.java index 64eced39..8544638f --- a/app/src/main/java/com/morlunk/mumbleclient/util/JumbleServiceFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/util/JumbleServiceFragment.java @@ -15,15 +15,15 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.util; +package com.terracom.mumbleclient.util; import android.app.Activity; import android.os.Bundle; import android.os.RemoteException; import android.support.v4.app.Fragment; -import com.morlunk.jumble.IJumbleObserver; -import com.morlunk.jumble.IJumbleService; +import com.terracom.jumble.IJumbleObserver; +import com.terracom.jumble.IJumbleService; /** * Fragment class intended to make binding the Jumble service to fragments easier. diff --git a/app/src/main/java/com/morlunk/mumbleclient/util/JumbleServiceProvider.java b/app/src/main/java/com/terracom/mumbleclient/util/JumbleServiceProvider.java old mode 100644 new mode 100755 similarity index 92% rename from app/src/main/java/com/morlunk/mumbleclient/util/JumbleServiceProvider.java rename to app/src/main/java/com/terracom/mumbleclient/util/JumbleServiceProvider.java index b9209e45..006cfa07 --- a/app/src/main/java/com/morlunk/mumbleclient/util/JumbleServiceProvider.java +++ b/app/src/main/java/com/terracom/mumbleclient/util/JumbleServiceProvider.java @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.util; +package com.terracom.mumbleclient.util; -import com.morlunk.jumble.IJumbleService; +import com.terracom.jumble.IJumbleService; /** * Created by andrew on 03/08/13. diff --git a/app/src/main/java/com/morlunk/mumbleclient/util/ModelUtils.java b/app/src/main/java/com/terracom/mumbleclient/util/ModelUtils.java old mode 100644 new mode 100755 similarity index 94% rename from app/src/main/java/com/morlunk/mumbleclient/util/ModelUtils.java rename to app/src/main/java/com/terracom/mumbleclient/util/ModelUtils.java index 6899ed73..f7de0fb4 --- a/app/src/main/java/com/morlunk/mumbleclient/util/ModelUtils.java +++ b/app/src/main/java/com/terracom/mumbleclient/util/ModelUtils.java @@ -15,12 +15,12 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.util; +package com.terracom.mumbleclient.util; import android.os.RemoteException; -import com.morlunk.jumble.IJumbleService; -import com.morlunk.jumble.model.Channel; +import com.terracom.jumble.IJumbleService; +import com.terracom.jumble.model.Channel; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/com/morlunk/mumbleclient/util/MumbleImageGetter.java b/app/src/main/java/com/terracom/mumbleclient/util/MumbleImageGetter.java old mode 100644 new mode 100755 similarity index 98% rename from app/src/main/java/com/morlunk/mumbleclient/util/MumbleImageGetter.java rename to app/src/main/java/com/terracom/mumbleclient/util/MumbleImageGetter.java index 76d1a525..d3e23d39 --- a/app/src/main/java/com/morlunk/mumbleclient/util/MumbleImageGetter.java +++ b/app/src/main/java/com/terracom/mumbleclient/util/MumbleImageGetter.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.util; +package com.terracom.mumbleclient.util; import android.content.Context; import android.graphics.Bitmap; @@ -27,7 +27,7 @@ import android.util.Base64; import android.util.DisplayMetrics; -import com.morlunk.mumbleclient.Settings; +import com.terracom.mumbleclient.Settings; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/app/src/main/java/com/morlunk/mumbleclient/util/PlumbleTrustStore.java b/app/src/main/java/com/terracom/mumbleclient/util/QRPushToTalkTrustStore.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/util/PlumbleTrustStore.java rename to app/src/main/java/com/terracom/mumbleclient/util/QRPushToTalkTrustStore.java index a6fb9156..7233556d --- a/app/src/main/java/com/morlunk/mumbleclient/util/PlumbleTrustStore.java +++ b/app/src/main/java/com/terracom/mumbleclient/util/QRPushToTalkTrustStore.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.util; +package com.terracom.mumbleclient.util; import android.content.Context; @@ -32,9 +32,9 @@ /** * Created by andrew on 05/04/14. */ -public class PlumbleTrustStore { +public class QRPushToTalkTrustStore { - private static final String STORE_FILE = "plumble-store.bks"; + private static final String STORE_FILE = "qrptt-store.bks"; private static final String STORE_PASS = ""; private static final String STORE_FORMAT = "BKS"; diff --git a/app/src/main/java/com/morlunk/mumbleclient/util/TintedMenuInflater.java b/app/src/main/java/com/terracom/mumbleclient/util/TintedMenuInflater.java old mode 100644 new mode 100755 similarity index 97% rename from app/src/main/java/com/morlunk/mumbleclient/util/TintedMenuInflater.java rename to app/src/main/java/com/terracom/mumbleclient/util/TintedMenuInflater.java index f5cafded..9cce116b --- a/app/src/main/java/com/morlunk/mumbleclient/util/TintedMenuInflater.java +++ b/app/src/main/java/com/terracom/mumbleclient/util/TintedMenuInflater.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.util; +package com.terracom.mumbleclient.util; import android.content.Context; import android.content.res.TypedArray; @@ -25,7 +25,7 @@ import android.view.MenuInflater; import android.view.MenuItem; -import com.morlunk.mumbleclient.R; +import com.terracom.mumbleclient.R; /** * A wrapper around a {@link android.view.MenuInflater} that tints menu items to the control color diff --git a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardActivity.java b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardActivity.java old mode 100644 new mode 100755 similarity index 98% rename from app/src/main/java/com/morlunk/mumbleclient/wizard/WizardActivity.java rename to app/src/main/java/com/terracom/mumbleclient/wizard/WizardActivity.java index 00188b03..fc29b07a --- a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardActivity.java +++ b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardActivity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.wizard; +package com.terracom.mumbleclient.wizard; import android.app.AlertDialog; import android.content.DialogInterface; @@ -28,8 +28,8 @@ import android.view.View; import android.widget.Button; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; /** * A simple activity_wizard providing an easy to use interface for configuring useful settings. diff --git a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardAudioFragment.java b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardAudioFragment.java old mode 100644 new mode 100755 similarity index 97% rename from app/src/main/java/com/morlunk/mumbleclient/wizard/WizardAudioFragment.java rename to app/src/main/java/com/terracom/mumbleclient/wizard/WizardAudioFragment.java index 1150da44..2223561b --- a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardAudioFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardAudioFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.wizard; +package com.terracom.mumbleclient.wizard; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -27,7 +27,7 @@ import android.widget.SpinnerAdapter; import android.widget.TextView; -import com.morlunk.mumbleclient.R; +import com.terracom.mumbleclient.R; /** * Created by andrew on 04/11/13. diff --git a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardCertificateFragment.java b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardCertificateFragment.java old mode 100644 new mode 100755 similarity index 88% rename from app/src/main/java/com/morlunk/mumbleclient/wizard/WizardCertificateFragment.java rename to app/src/main/java/com/terracom/mumbleclient/wizard/WizardCertificateFragment.java index fb2edc5b..4f31b480 --- a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardCertificateFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardCertificateFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.wizard; +package com.terracom.mumbleclient.wizard; import android.app.Activity; import android.os.Bundle; @@ -25,9 +25,9 @@ import android.view.ViewGroup; import android.widget.Button; -import com.morlunk.mumbleclient.R; -import com.morlunk.mumbleclient.Settings; -import com.morlunk.mumbleclient.preference.PlumbleCertificateGenerateTask; +import com.terracom.mumbleclient.R; +import com.terracom.mumbleclient.Settings; +import com.terracom.mumbleclient.preference.QRPushToTalkCertificateGenerateTask; import java.io.File; @@ -64,7 +64,7 @@ public void onClick(View v) { private void generateCertificate() { final Settings settings = Settings.getInstance(getActivity()); - PlumbleCertificateGenerateTask task = new PlumbleCertificateGenerateTask(getActivity()) { + QRPushToTalkCertificateGenerateTask task = new QRPushToTalkCertificateGenerateTask(getActivity()) { @Override protected void onPostExecute(File result) { super.onPostExecute(result); diff --git a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardNavigation.java b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardNavigation.java old mode 100644 new mode 100755 similarity index 95% rename from app/src/main/java/com/morlunk/mumbleclient/wizard/WizardNavigation.java rename to app/src/main/java/com/terracom/mumbleclient/wizard/WizardNavigation.java index eeb4b291..a4fff88b --- a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardNavigation.java +++ b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardNavigation.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.wizard; +package com.terracom.mumbleclient.wizard; /** * Created by andrew on 04/11/13. diff --git a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardWelcomeFragment.java b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardWelcomeFragment.java old mode 100644 new mode 100755 similarity index 93% rename from app/src/main/java/com/morlunk/mumbleclient/wizard/WizardWelcomeFragment.java rename to app/src/main/java/com/terracom/mumbleclient/wizard/WizardWelcomeFragment.java index a86e0f6b..fdcd926a --- a/app/src/main/java/com/morlunk/mumbleclient/wizard/WizardWelcomeFragment.java +++ b/app/src/main/java/com/terracom/mumbleclient/wizard/WizardWelcomeFragment.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.morlunk.mumbleclient.wizard; +package com.terracom.mumbleclient.wizard; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -23,7 +23,7 @@ import android.view.View; import android.view.ViewGroup; -import com.morlunk.mumbleclient.R; +import com.terracom.mumbleclient.R; /** * Created by andrew on 03/11/13. diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/anim/slide_down.xml b/app/src/main/res/anim/slide_down.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/anim/slide_up.xml b/app/src/main/res/anim/slide_up.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_notify.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_notify.png index 275068a7..b37054fe 100644 Binary files a/app/src/main/res/drawable-hdpi-v11/ic_stat_notify.png and b/app/src/main/res/drawable-hdpi-v11/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-hdpi-v9/ic_stat_notify.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_notify.png index 6f674a30..0458f7e5 100644 Binary files a/app/src/main/res/drawable-hdpi-v9/ic_stat_notify.png and b/app/src/main/res/drawable-hdpi-v9/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_add_dark.png b/app/src/main/res/drawable-hdpi/ic_action_add_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_add_light.png b/app/src/main/res/drawable-hdpi/ic_action_add_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_audio.png b/app/src/main/res/drawable-hdpi/ic_action_audio.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_audio_muted.png b/app/src/main/res/drawable-hdpi/ic_action_audio_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_audio_on.png b/app/src/main/res/drawable-hdpi/ic_action_audio_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_channels.png b/app/src/main/res/drawable-hdpi/ic_action_channels.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_chat.png b/app/src/main/res/drawable-hdpi/ic_action_chat.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_collapsed.png b/app/src/main/res/drawable-hdpi/ic_action_collapsed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_comment.png b/app/src/main/res/drawable-hdpi/ic_action_comment.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_delete_dark.png b/app/src/main/res/drawable-hdpi/ic_action_delete_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_delete_light.png b/app/src/main/res/drawable-hdpi/ic_action_delete_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_drag_handle.png b/app/src/main/res/drawable-hdpi/ic_action_drag_handle.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/app/src/main/res/drawable-hdpi/ic_action_edit_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_expanded.png b/app/src/main/res/drawable-hdpi/ic_action_expanded.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_favourite_on.png b/app/src/main/res/drawable-hdpi/ic_action_favourite_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_fullscreen.png b/app/src/main/res/drawable-hdpi/ic_action_fullscreen.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_headphones.png b/app/src/main/res/drawable-hdpi/ic_action_headphones.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_info_dark.png b/app/src/main/res/drawable-hdpi/ic_action_info_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_microphone.png b/app/src/main/res/drawable-hdpi/ic_action_microphone.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_microphone_dark.png b/app/src/main/res/drawable-hdpi/ic_action_microphone_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_microphone_muted.png b/app/src/main/res/drawable-hdpi/ic_action_microphone_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_move.png b/app/src/main/res/drawable-hdpi/ic_action_move.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_save.png b/app/src/main/res/drawable-hdpi/ic_action_save.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_send.png b/app/src/main/res/drawable-hdpi/ic_action_send.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_sort.png b/app/src/main/res/drawable-hdpi/ic_action_sort.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_action_user_dark.png b/app/src/main/res/drawable-hdpi/ic_action_user_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_carriage_return.png b/app/src/main/res/drawable-hdpi/ic_carriage_return.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_deafened.png b/app/src/main/res/drawable-hdpi/ic_deafened.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_home.png b/app/src/main/res/drawable-hdpi/ic_home.png index b6ad614a..a797235b 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_home.png and b/app/src/main/res/drawable-hdpi/ic_home.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png index 5de2b030..0f15c7ab 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_menu_moreoverflow_card_dark_normal.png b/app/src/main/res/drawable-hdpi/ic_menu_moreoverflow_card_dark_normal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_menu_moreoverflow_card_dark_pressed.png b/app/src/main/res/drawable-hdpi/ic_menu_moreoverflow_card_dark_pressed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_muted.png b/app/src/main/res/drawable-hdpi/ic_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_muted_local.png b/app/src/main/res/drawable-hdpi/ic_muted_local.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_registered.png b/app/src/main/res/drawable-hdpi/ic_registered.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_server_deafened.png b/app/src/main/res/drawable-hdpi/ic_server_deafened.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_server_light.png b/app/src/main/res/drawable-hdpi/ic_server_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_server_location.png b/app/src/main/res/drawable-hdpi/ic_server_location.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_server_muted.png b/app/src/main/res/drawable-hdpi/ic_server_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notify.png b/app/src/main/res/drawable-hdpi/ic_stat_notify.png index 8593d93e..4a212b8e 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_stat_notify.png and b/app/src/main/res/drawable-hdpi/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_suppressed.png b/app/src/main/res/drawable-hdpi/ic_suppressed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_talking_off.png b/app/src/main/res/drawable-hdpi/ic_talking_off.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_talking_on.png b/app/src/main/res/drawable-hdpi/ic_talking_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/ic_user_light.png b/app/src/main/res/drawable-hdpi/ic_user_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/list_longpressed.9.png b/app/src/main/res/drawable-hdpi/list_longpressed.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/list_pressed.9.png b/app/src/main/res/drawable-hdpi/list_pressed.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/list_selector_disabled.9.png b/app/src/main/res/drawable-hdpi/list_selector_disabled.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/list_selector_focused.9.png b/app/src/main/res/drawable-hdpi/list_selector_focused.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-hdpi/server_card.9.png b/app/src/main/res/drawable-hdpi/server_card.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_notify.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_notify.png index e8610e88..a5c6715b 100644 Binary files a/app/src/main/res/drawable-mdpi-v11/ic_stat_notify.png and b/app/src/main/res/drawable-mdpi-v11/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-mdpi-v9/ic_stat_notify.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_notify.png index 8cdef38d..90c34ca4 100644 Binary files a/app/src/main/res/drawable-mdpi-v9/ic_stat_notify.png and b/app/src/main/res/drawable-mdpi-v9/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_add_dark.png b/app/src/main/res/drawable-mdpi/ic_action_add_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_add_light.png b/app/src/main/res/drawable-mdpi/ic_action_add_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_audio.png b/app/src/main/res/drawable-mdpi/ic_action_audio.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_audio_muted.png b/app/src/main/res/drawable-mdpi/ic_action_audio_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_audio_on.png b/app/src/main/res/drawable-mdpi/ic_action_audio_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_channels.png b/app/src/main/res/drawable-mdpi/ic_action_channels.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_chat.png b/app/src/main/res/drawable-mdpi/ic_action_chat.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_collapsed.png b/app/src/main/res/drawable-mdpi/ic_action_collapsed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_comment.png b/app/src/main/res/drawable-mdpi/ic_action_comment.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_delete_dark.png b/app/src/main/res/drawable-mdpi/ic_action_delete_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_delete_light.png b/app/src/main/res/drawable-mdpi/ic_action_delete_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_drag_handle.png b/app/src/main/res/drawable-mdpi/ic_action_drag_handle.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/app/src/main/res/drawable-mdpi/ic_action_edit_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_expanded.png b/app/src/main/res/drawable-mdpi/ic_action_expanded.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_favourite_on.png b/app/src/main/res/drawable-mdpi/ic_action_favourite_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_fullscreen.png b/app/src/main/res/drawable-mdpi/ic_action_fullscreen.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_headphones.png b/app/src/main/res/drawable-mdpi/ic_action_headphones.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_info_dark.png b/app/src/main/res/drawable-mdpi/ic_action_info_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_microphone.png b/app/src/main/res/drawable-mdpi/ic_action_microphone.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_microphone_dark.png b/app/src/main/res/drawable-mdpi/ic_action_microphone_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_microphone_muted.png b/app/src/main/res/drawable-mdpi/ic_action_microphone_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_move.png b/app/src/main/res/drawable-mdpi/ic_action_move.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_save.png b/app/src/main/res/drawable-mdpi/ic_action_save.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_send.png b/app/src/main/res/drawable-mdpi/ic_action_send.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_sort.png b/app/src/main/res/drawable-mdpi/ic_action_sort.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_action_user_dark.png b/app/src/main/res/drawable-mdpi/ic_action_user_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_carriage_return.png b/app/src/main/res/drawable-mdpi/ic_carriage_return.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_deafened.png b/app/src/main/res/drawable-mdpi/ic_deafened.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_home.png b/app/src/main/res/drawable-mdpi/ic_home.png index d433d76c..640ff185 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_home.png and b/app/src/main/res/drawable-mdpi/ic_home.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png index 90e32e57..a797235b 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_card_dark_normal.png b/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_card_dark_normal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_card_dark_pressed.png b/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_card_dark_pressed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_muted.png b/app/src/main/res/drawable-mdpi/ic_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_muted_local.png b/app/src/main/res/drawable-mdpi/ic_muted_local.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_registered.png b/app/src/main/res/drawable-mdpi/ic_registered.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_server_deafened.png b/app/src/main/res/drawable-mdpi/ic_server_deafened.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_server_light.png b/app/src/main/res/drawable-mdpi/ic_server_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_server_location.png b/app/src/main/res/drawable-mdpi/ic_server_location.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_server_muted.png b/app/src/main/res/drawable-mdpi/ic_server_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notify.png b/app/src/main/res/drawable-mdpi/ic_stat_notify.png index 2d9a5854..8c8be3ba 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_stat_notify.png and b/app/src/main/res/drawable-mdpi/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_suppressed.png b/app/src/main/res/drawable-mdpi/ic_suppressed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_talking_off.png b/app/src/main/res/drawable-mdpi/ic_talking_off.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_talking_on.png b/app/src/main/res/drawable-mdpi/ic_talking_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/ic_user_light.png b/app/src/main/res/drawable-mdpi/ic_user_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/list_longpressed.9.png b/app/src/main/res/drawable-mdpi/list_longpressed.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/list_pressed.9.png b/app/src/main/res/drawable-mdpi/list_pressed.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/list_selector_disabled.9.png b/app/src/main/res/drawable-mdpi/list_selector_disabled.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/list_selector_focused.9.png b/app/src/main/res/drawable-mdpi/list_selector_focused.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-mdpi/server_card.9.png b/app/src/main/res/drawable-mdpi/server_card.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_notify.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notify.png index 69e2685b..a797235b 100644 Binary files a/app/src/main/res/drawable-xhdpi-v11/ic_stat_notify.png and b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_stat_notify.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notify.png index a8c7249e..e76ec590 100644 Binary files a/app/src/main/res/drawable-xhdpi-v9/ic_stat_notify.png and b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_add_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_add_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_add_light.png b/app/src/main/res/drawable-xhdpi/ic_action_add_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_audio.png b/app/src/main/res/drawable-xhdpi/ic_action_audio.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_audio_muted.png b/app/src/main/res/drawable-xhdpi/ic_action_audio_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_bad.png b/app/src/main/res/drawable-xhdpi/ic_action_bad.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_channels.png b/app/src/main/res/drawable-xhdpi/ic_action_channels.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_chat.png b/app/src/main/res/drawable-xhdpi/ic_action_chat.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_collapsed.png b/app/src/main/res/drawable-xhdpi/ic_action_collapsed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_comment.png b/app/src/main/res/drawable-xhdpi/ic_action_comment.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_delete_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_delete_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_delete_light.png b/app/src/main/res/drawable-xhdpi/ic_action_delete_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_drag_handle.png b/app/src/main/res/drawable-xhdpi/ic_action_drag_handle.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_edit_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_error.png b/app/src/main/res/drawable-xhdpi/ic_action_error.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_expanded.png b/app/src/main/res/drawable-xhdpi/ic_action_expanded.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_favourite_on.png b/app/src/main/res/drawable-xhdpi/ic_action_favourite_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_fullscreen.png b/app/src/main/res/drawable-xhdpi/ic_action_fullscreen.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_headphones.png b/app/src/main/res/drawable-xhdpi/ic_action_headphones.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_info_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_info_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_match.png b/app/src/main/res/drawable-xhdpi/ic_action_match.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_microphone.png b/app/src/main/res/drawable-xhdpi/ic_action_microphone.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_microphone_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_microphone_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_microphone_muted.png b/app/src/main/res/drawable-xhdpi/ic_action_microphone_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_move.png b/app/src/main/res/drawable-xhdpi/ic_action_move.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_save.png b/app/src/main/res/drawable-xhdpi/ic_action_save.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_send.png b/app/src/main/res/drawable-xhdpi/ic_action_send.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_sort.png b/app/src/main/res/drawable-xhdpi/ic_action_sort.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_user_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_user_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_carriage_return.png b/app/src/main/res/drawable-xhdpi/ic_carriage_return.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_deafened.png b/app/src/main/res/drawable-xhdpi/ic_deafened.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_home.png b/app/src/main/res/drawable-xhdpi/ic_home.png index 97e2b70a..804af009 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_home.png and b/app/src/main/res/drawable-xhdpi/ic_home.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png index f1c4de92..d86831dd 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_card_dark_normal.png b/app/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_card_dark_normal.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_card_dark_pressed.png b/app/src/main/res/drawable-xhdpi/ic_menu_moreoverflow_card_dark_pressed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_muted.png b/app/src/main/res/drawable-xhdpi/ic_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_muted_local.png b/app/src/main/res/drawable-xhdpi/ic_muted_local.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_registered.png b/app/src/main/res/drawable-xhdpi/ic_registered.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_server_deafened.png b/app/src/main/res/drawable-xhdpi/ic_server_deafened.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_server_light.png b/app/src/main/res/drawable-xhdpi/ic_server_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_server_location.png b/app/src/main/res/drawable-xhdpi/ic_server_location.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_server_muted.png b/app/src/main/res/drawable-xhdpi/ic_server_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notify.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify.png index 1ce98ca9..f7c2150e 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_stat_notify.png and b/app/src/main/res/drawable-xhdpi/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_suppressed.png b/app/src/main/res/drawable-xhdpi/ic_suppressed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_talking_off.png b/app/src/main/res/drawable-xhdpi/ic_talking_off.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_talking_on.png b/app/src/main/res/drawable-xhdpi/ic_talking_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/ic_user_light.png b/app/src/main/res/drawable-xhdpi/ic_user_light.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/list_longpressed.9.png b/app/src/main/res/drawable-xhdpi/list_longpressed.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/list_pressed.9.png b/app/src/main/res/drawable-xhdpi/list_pressed.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/list_selector_disabled.9.png b/app/src/main/res/drawable-xhdpi/list_selector_disabled.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/list_selector_focused.9.png b/app/src/main/res/drawable-xhdpi/list_selector_focused.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xhdpi/server_card.9.png b/app/src/main/res/drawable-xhdpi/server_card.9.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_notify.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_notify.png index 72f9fb0b..0f15c7ab 100644 Binary files a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_notify.png and b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v9/ic_stat_notify.png b/app/src/main/res/drawable-xxhdpi-v9/ic_stat_notify.png index 38367003..34b7bc3d 100644 Binary files a/app/src/main/res/drawable-xxhdpi-v9/ic_stat_notify.png and b/app/src/main/res/drawable-xxhdpi-v9/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_audio.png b/app/src/main/res/drawable-xxhdpi/ic_action_audio.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_audio_muted.png b/app/src/main/res/drawable-xxhdpi/ic_action_audio_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_chat.png b/app/src/main/res/drawable-xxhdpi/ic_action_chat.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_collapsed.png b/app/src/main/res/drawable-xxhdpi/ic_action_collapsed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_drag_handle.png b/app/src/main/res/drawable-xxhdpi/ic_action_drag_handle.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_expanded.png b/app/src/main/res/drawable-xxhdpi/ic_action_expanded.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_headphones.png b/app/src/main/res/drawable-xxhdpi/ic_action_headphones.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_microphone.png b/app/src/main/res/drawable-xxhdpi/ic_action_microphone.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_microphone_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_microphone_dark.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_microphone_muted.png b/app/src/main/res/drawable-xxhdpi/ic_action_microphone_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_move.png b/app/src/main/res/drawable-xxhdpi/ic_action_move.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_deafened.png b/app/src/main/res/drawable-xxhdpi/ic_deafened.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_home.png b/app/src/main/res/drawable-xxhdpi/ic_home.png index f951a759..d86831dd 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_home.png and b/app/src/main/res/drawable-xxhdpi/ic_home.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png index 735da524..4e744c09 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_muted.png b/app/src/main/res/drawable-xxhdpi/ic_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_muted_local.png b/app/src/main/res/drawable-xxhdpi/ic_muted_local.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_server_deafened.png b/app/src/main/res/drawable-xxhdpi/ic_server_deafened.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_server_muted.png b/app/src/main/res/drawable-xxhdpi/ic_server_muted.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png index 25772c71..bdd3d5d3 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png and b/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_suppressed.png b/app/src/main/res/drawable-xxhdpi/ic_suppressed.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_talking_off.png b/app/src/main/res/drawable-xxhdpi/ic_talking_off.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-xxhdpi/ic_talking_on.png b/app/src/main/res/drawable-xxhdpi/ic_talking_on.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/ic_card_overflow.xml b/app/src/main/res/drawable/ic_card_overflow.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/ic_stat_notify.png b/app/src/main/res/drawable/ic_stat_notify.png index d9d8ba1b..5efdf63c 100644 Binary files a/app/src/main/res/drawable/ic_stat_notify.png and b/app/src/main/res/drawable/ic_stat_notify.png differ diff --git a/app/src/main/res/drawable/outline_circle.xml b/app/src/main/res/drawable/outline_circle.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/outline_circle_deafened.xml b/app/src/main/res/drawable/outline_circle_deafened.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/outline_circle_muted.xml b/app/src/main/res/drawable/outline_circle_muted.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/outline_circle_server_deafened.xml b/app/src/main/res/drawable/outline_circle_server_deafened.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/outline_circle_server_muted.xml b/app/src/main/res/drawable/outline_circle_server_muted.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/outline_circle_suppressed.xml b/app/src/main/res/drawable/outline_circle_suppressed.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/outline_circle_talking_off.xml b/app/src/main/res/drawable/outline_circle_talking_off.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/outline_circle_talking_on.xml b/app/src/main/res/drawable/outline_circle_talking_on.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/overlay_background.xml b/app/src/main/res/drawable/overlay_background.xml old mode 100644 new mode 100755 index 97b87dbb..8f9e692c --- a/app/src/main/res/drawable/overlay_background.xml +++ b/app/src/main/res/drawable/overlay_background.xml @@ -19,6 +19,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/popup_menu_item_background.xml b/app/src/main/res/drawable/popup_menu_item_background.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/ptt_indicator_background.xml b/app/src/main/res/drawable/ptt_indicator_background.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout-sw600dp-v11/fragment_channel.xml b/app/src/main/res/layout-sw600dp-v11/fragment_channel.xml old mode 100644 new mode 100755 index 1f47b504..c266c900 --- a/app/src/main/res/layout-sw600dp-v11/fragment_channel.xml +++ b/app/src/main/res/layout-sw600dp-v11/fragment_channel.xml @@ -31,12 +31,14 @@ android:id="@+id/left_split" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" > + android:layout_weight="1" + android:weightSum="1"> + android:layout_height="match_parent" + android:layout_weight="0.52" /> @@ -69,7 +73,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:text="@string/ptt" - android:textSize="12sp" + android:textSize="18sp" android:textColor="#858585" android:textStyle="bold" android:background="?attr/selectableItemBackground"/> diff --git a/app/src/main/res/layout-sw720dp-v11/fragment_channel.xml b/app/src/main/res/layout-sw720dp-v11/fragment_channel.xml old mode 100644 new mode 100755 index ab3d8e27..7251f762 --- a/app/src/main/res/layout-sw720dp-v11/fragment_channel.xml +++ b/app/src/main/res/layout-sw720dp-v11/fragment_channel.xml @@ -56,6 +56,8 @@ android:id="@+id/pushtotalk_view" android:layout_width="match_parent" android:layout_height="51dp" + android:layout_marginBottom="20dp" + android:layout_weight="0.02" android:gravity="center_horizontal" android:orientation="vertical" > @@ -69,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:text="@string/ptt" - android:textSize="12sp" + android:textSize="18sp" android:textColor="#858585" android:textStyle="bold" android:background="?attr/selectableItemBackground"/> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_wizard.xml b/app/src/main/res/layout/activity_wizard.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/channel_row.xml b/app/src/main/res/layout/channel_row.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/channel_user_row.xml b/app/src/main/res/layout/channel_user_row.xml old mode 100644 new mode 100755 index e896978d..21abfbe4 --- a/app/src/main/res/layout/channel_user_row.xml +++ b/app/src/main/res/layout/channel_user_row.xml @@ -28,7 +28,7 @@ android:layout_width="32dp" android:layout_height="32dp"> - + diff --git a/app/src/main/res/layout/dialog_comment.xml b/app/src/main/res/layout/dialog_comment.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/dialog_server_edit.xml b/app/src/main/res/layout/dialog_server_edit.xml old mode 100644 new mode 100755 index a5442bb1..7c456e8a --- a/app/src/main/res/layout/dialog_server_edit.xml +++ b/app/src/main/res/layout/dialog_server_edit.xml @@ -31,7 +31,8 @@ android:id="@+id/server_edit_name" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:inputType="text" /> + android:inputType="text" + android:hint="Terracom"/> + android:layout_weight="0.92" + android:inputType="textUri" + android:hint="141.237.72.148"/> + android:layout_weight="0.76">