Merge remote-tracking branch 'origin/master'

kontalk · May 7, 2016 · 19b3f45 · 19b3f45
2 parents aacf0e9 + 1fe9983
commit 19b3f45
Show file tree

Hide file tree

Showing 24 changed files with 1,478 additions and 927 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -34,7 +34,7 @@ android {
 
     defaultConfig {
         applicationId "org.kontalk"
-        versionCode 119
+        versionCode 120
         versionName "3.1.9-preview"
         targetSdkVersion 22
         minSdkVersion 9

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -177,7 +177,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.PreferencesActivity">
+        <activity android:name=".ui.prefs.PreferencesActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
                 <category android:name="android.intent.category.DEFAULT" />

diff --git a/app/src/main/java/org/kontalk/ui/ConversationsActivity.java b/app/src/main/java/org/kontalk/ui/ConversationsActivity.java
@@ -44,6 +44,7 @@
 import org.kontalk.provider.MyMessages.Threads;
 import org.kontalk.service.msgcenter.MessageCenterService;
 import org.kontalk.sync.Syncer;
+import org.kontalk.ui.prefs.PreferencesActivity;
 import org.kontalk.ui.view.ContactPickerListener;
 import org.kontalk.util.MessageUtils;
 import org.kontalk.util.Preferences;

diff --git a/app/src/main/java/org/kontalk/ui/NumberValidation.java b/app/src/main/java/org/kontalk/ui/NumberValidation.java
@@ -45,6 +45,7 @@
 
 import org.jivesoftware.smack.util.StringUtils;
 import org.jxmpp.util.XmppStringUtils;
+import org.kontalk.ui.prefs.PreferencesActivity;
 import org.spongycastle.openpgp.PGPException;
 
 import android.accounts.Account;
@@ -723,7 +724,7 @@ public void onFileSelection(@NonNull FileChooserDialog fileChooserDialog, @NonNu
             startImport(new FileInputStream(file));
         }
         catch (FileNotFoundException e) {
-            Log.e(PreferencesFragment.TAG, "error importing keys", e);
+            Log.e(TAG, "error importing keys", e);
             Toast.makeText(this,
                 R.string.err_import_keypair_read,
                 Toast.LENGTH_LONG).show();