aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-10-05 16:27:08 +0200
committersteckbrief <steckbrief@chefmail.de>2015-10-05 16:27:08 +0200
commit0265bd05bf7ef6ee14c85ae87831bcc42a4b02cd (patch)
tree465addf2e8b2f9f1b2d34f952b91ebfcf93c1b6a /src/main
parent383d1aa9e64a245f17dd7ec6d177bb286a489f62 (diff)
fix imports and namespaces
Diffstat (limited to 'src/main')
-rw-r--r--src/main/AndroidManifest.xml2
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 9da8a4ea..ad5d31e9 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
android:label="@string/app_name"
android:theme="@style/ConversationsTheme"
tools:replace="android:label"
- android:name=".ConversationsPlusApplication">
+ android:name="de.thedevstack.conversationsplus.ConversationsPlusApplication">
<service android:name=".services.XmppConnectionService" />
<receiver android:name=".services.EventReceiver" >
diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
index dfe67cb7..2def66f7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
@@ -6,6 +6,8 @@ import android.content.pm.PackageManager;
import java.io.File;
+import eu.siacs.conversations.R;
+
/**
* This class is used to provide static access to the applicationcontext.
*/