Browse Source

Update Jumble version.

tags/3.1.0
Andrew Comminos 5 years ago
parent
commit
9cb5fb7920
19 changed files with 235 additions and 10 deletions
  1. +2
    -0
      app/build.gradle
  2. +1
    -1
      app/src/main/java/com/morlunk/mumbleclient/service/PlumbleOverlay.java
  3. +6
    -8
      app/src/main/java/com/morlunk/mumbleclient/service/PlumbleService.java
  4. +17
    -0
      app/src/main/res/values-de/preference.xml
  5. +17
    -0
      app/src/main/res/values-de/strings.xml
  6. +17
    -0
      app/src/main/res/values-fr/preference.xml
  7. +17
    -0
      app/src/main/res/values-fr/strings.xml
  8. +17
    -0
      app/src/main/res/values-it/preference.xml
  9. +17
    -0
      app/src/main/res/values-it/strings.xml
  10. +17
    -0
      app/src/main/res/values-nl/preference.xml
  11. +17
    -0
      app/src/main/res/values-nl/strings.xml
  12. +17
    -0
      app/src/main/res/values-pl/preference.xml
  13. +17
    -0
      app/src/main/res/values-pl/strings.xml
  14. +17
    -0
      app/src/main/res/values-ru/preference.xml
  15. +17
    -0
      app/src/main/res/values-ru/strings.xml
  16. +2
    -0
      build.gradle
  17. +17
    -0
      gradle/wrapper/gradle-wrapper.properties
  18. +1
    -1
      libraries/Jumble
  19. +2
    -0
      settings.gradle

+ 2
- 0
app/build.gradle View File

@@ -19,6 +19,8 @@





buildscript {
repositories {
mavenCentral()


+ 1
- 1
app/src/main/java/com/morlunk/mumbleclient/service/PlumbleOverlay.java View File

@@ -58,7 +58,7 @@ public class PlumbleOverlay {

@Override
public void onUserJoinedChannel(User user, Channel newChannel, Channel oldChannel) throws RemoteException {
if(user.getSession() == mService.getSession()) // Session user has changed channels
if(user.getSession() == mService.getBinder().getSession()) // Session user has changed channels
mChannelAdapter.setChannel(mService.getBinder().getSessionChannel());
else if(newChannel.getId() == mService.getBinder().getSessionChannel().getId() ||
oldChannel.getId() == mService.getBinder().getSessionChannel().getId())


+ 6
- 8
app/src/main/java/com/morlunk/mumbleclient/service/PlumbleService.java View File

@@ -81,7 +81,7 @@ public class PlumbleService extends JumbleService implements SharedPreferences.O
@Override
public void onInit(int status) {
if(status == TextToSpeech.ERROR)
logWarning(getString(R.string.tts_failed));
log(Message.Type.WARNING, getString(R.string.tts_failed));
}
};

@@ -149,7 +149,7 @@ public class PlumbleService extends JumbleService implements SharedPreferences.O

@Override
public void onUserStateUpdated(User user) throws RemoteException {
if(user.getSession() == getSession()) {
if(user.getSession() == mBinder.getSession()) {
mSettings.setMutedAndDeafened(user.isSelfMuted(), user.isSelfDeafened()); // Update settings mute/deafen state
updateNotificationState();
}
@@ -377,11 +377,11 @@ public class PlumbleService extends JumbleService implements SharedPreferences.O
/**
* Updates the status notification with unread messages (if applicable), or status updates.
*/
public void updateNotificationState() {
public void updateNotificationState() throws RemoteException {
if(mStatusNotificationBuilder == null) return;
String contentText;
if(isConnected()) {
User currentUser = getUserHandler().getUser(getSession());
User currentUser = mBinder.getSessionUser();
if(currentUser.isSelfMuted() && currentUser.isSelfDeafened())
contentText = getString(R.string.status_notify_muted_and_deafened);
else if(currentUser.isSelfMuted())
@@ -392,10 +392,8 @@ public class PlumbleService extends JumbleService implements SharedPreferences.O
contentText = getString(R.string.disconnected);
}

try {
if(getBinder().isReconnecting()) contentText = getString(R.string.reconnecting, PlumbleActivity.RECONNECT_DELAY/1000);
} catch (RemoteException e) {
e.printStackTrace();
if(getBinder().isReconnecting()) {
contentText = getString(R.string.reconnecting, PlumbleActivity.RECONNECT_DELAY/1000);
}

if(!mUnreadMessages.isEmpty() && isConnected()) {


+ 17
- 0
app/src/main/res/values-de/preference.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<string name="inputMethodVoice">Sprachaktivierung</string>
<string name="inputMethodPtt">Push-To-Talk</string>


+ 17
- 0
app/src/main/res/values-de/strings.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<!--Drawer pane-->
<string name="drawer_open">Drawer öffnen</string>


+ 17
- 0
app/src/main/res/values-fr/preference.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<string-array name="audioInputNames">
<item>@string/inputMethodVoice</item>


+ 17
- 0
app/src/main/res/values-fr/strings.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<!--Drawer pane-->
<string name="drawer_open">Ouvrir Drawer</string>


+ 17
- 0
app/src/main/res/values-it/preference.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<string-array name="audioSampleRateNames">
<item>128000Hz (sperimentale)</item>


+ 17
- 0
app/src/main/res/values-it/strings.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<!--Drawer pane-->
<string name="drawer_not_connected">Non connesso</string>


+ 17
- 0
app/src/main/res/values-nl/preference.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<string-array name="audioSampleRateNames">
<item>128000Hz (experimenteel)</item>


+ 17
- 0
app/src/main/res/values-nl/strings.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<!--Drawer pane-->
<string name="drawer_open">Open Luik</string>


+ 17
- 0
app/src/main/res/values-pl/preference.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<!--Experimental-->
<string-array name="themeNames">


+ 17
- 0
app/src/main/res/values-pl/strings.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<!--Drawer pane-->
<!--Chat formatting-->


+ 17
- 0
app/src/main/res/values-ru/preference.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<string-array name="audioSampleRateNames">
<item>128000Hz (экспериментально)</item>


+ 17
- 0
app/src/main/res/values-ru/strings.xml View File

@@ -1,4 +1,21 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
~ Copyright (C) 2014 Andrew Comminos
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<resources>
<!--Drawer pane-->
<!--Chat formatting-->


+ 2
- 0
build.gradle View File

@@ -19,4 +19,6 @@





// Top-level build file where you can add configuration options common to all sub-projects/modules.

+ 17
- 0
gradle/wrapper/gradle-wrapper.properties View File

@@ -1,3 +1,20 @@
#
# Copyright (C) 2014 Andrew Comminos
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

#Sat Jun 07 00:40:57 PDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists


+ 1
- 1
libraries/Jumble

@@ -1 +1 @@
Subproject commit 0747318791e3179a8c2d94fc3ed4050d0c66403d
Subproject commit 913077a36f9ab38fca9c76575335f1f39cfca720

+ 2
- 0
settings.gradle View File

@@ -19,4 +19,6 @@





include ':libraries:NetCipher:libnetcipher', ':libraries:Jumble', ':app'

Loading…
Cancel
Save