Cleaned up tree. Now app = different app. Also upgraded gradlew 4.4->4.8

.atomignore

@@ -1,8 +1,2 @@
-crowdin.yaml
-diaspora-android.iml
-gradle
-gradle.properties
-gradlew
-gradlew.bat
 local.properties
-.gradle/
+/.gradle/*

.gitignore

@@ -1,7 +1,2 @@
-crowdin.yaml
-diaspora-android.iml
-gradle
-gradle.properties
-gradlew
-gradlew.bat
+/.gradle/*
 local.properties

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Sat Jun 16 12:09:21 CEST 2018
-gradle.version=4.4
+#Sun Jun 17 09:50:40 CEST 2018
+gradle.version=4.8

app/.gitignore

@@ -1 +0,0 @@
-/build

app/build.gradle

@@ -16,9 +16,9 @@ android {
         buildConfigField "boolean", "IS_GPLAY_BUILD", "false"
         buildConfigField "String[]", "DETECTED_ANDROID_LOCALES", "${findUsedAndroidLocales()}"
         buildConfigField "String", "GITHASH", "\"${getGitHash()}\""
-        resValue "string", "manifest_package_id", "com.github.dfa.hubzilla_android"
+        resValue "string", "manifest_package_id", "com.dfa.hubzilla_android"
 
-        applicationId "com.github.dfa.hubzilla_android"
+        applicationId "com.dfa.hubzilla_android"
         versionName "0.0.1"
         versionCode 32
 

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.github.dfa.hubzilla_android"
+    package="com.dfa.hubzilla_android"
     tools:ignore="GoogleAppIndexingWarning">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,14 +11,14 @@
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <application
-        android:name="com.github.dfa.hubzilla_android.App"
+        android:name="com.dfa.hubzilla_android.App"
         android:allowBackup="false"
         android:icon="${appIcon}"
         android:label="@string/app_name"
         android:theme="@style/DiasporaLight">
 
         <provider
-            android:name="com.github.dfa.hubzilla_android.service.HashtagContentProvider"
+            android:name="com.dfa.hubzilla_android.service.HashtagContentProvider"
             android:authorities="${applicationId}.mainactivity"
             android:exported="false" />
 
@@ -33,25 +33,25 @@
                 android:resource="@xml/file_provider_paths" />
         </provider>
         <service
-            android:name="com.github.dfa.hubzilla_android.service.FetchPodsService"
+            android:name="com.dfa.hubzilla_android.service.FetchPodsService"
             android:enabled="true"
             android:exported="false" />
 
         <activity
-            android:name="com.github.dfa.hubzilla_android.activity.SettingsActivity"
+            android:name="com.dfa.hubzilla_android.activity.SettingsActivity"
             android:configChanges="keyboardHidden|locale|orientation|screenSize"
             android:label="@string/settings"
             android:launchMode="singleInstance"
             android:theme="@style/DiasporaLight.NoActionBar" />
 
         <activity
-            android:name="com.github.dfa.hubzilla_android.activity.AboutActivity"
+            android:name="com.dfa.hubzilla_android.activity.AboutActivity"
             android:configChanges="locale"
             android:label="@string/about_activity__title_about_app"
             android:theme="@style/DiasporaLight.NoActionBar" />
 
         <activity
-            android:name="com.github.dfa.hubzilla_android.activity.MainActivity"
+            android:name="com.dfa.hubzilla_android.activity.MainActivity"
             android:configChanges="keyboardHidden|locale|orientation|screenSize"
             android:icon="${appIcon}"
             android:label="@string/app_name"

app/src/main/java/com/dfa/hubzilla_android/App.java

@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.github.dfa.hubzilla_android;
+package com.dfa.hubzilla_android;
 
 import android.app.Application;
 import android.content.Context;
@@ -28,13 +28,13 @@ import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.WebView;
 
-import com.github.dfa.hubzilla_android.data.DiasporaUserProfile;
-import com.github.dfa.hubzilla_android.service.AvatarImageLoader;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.data.DiasporaUserProfile;
+import com.dfa.hubzilla_android.service.AvatarImageLoader;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
 
-import net.gsantner.opoc.util.AdBlock;
+import net.opoc.util.AdBlock;
 
 public class App extends Application {
     private volatile static App app;

app/src/main/java/com/dfa/hubzilla_android/activity/AboutActivity.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.activity;
+package com.dfa.hubzilla_android.activity;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -42,16 +42,16 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.listener.IntellihideToolbarActivityListener;
-import com.github.dfa.hubzilla_android.ui.HtmlTextView;
-import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedActivity;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.listener.IntellihideToolbarActivityListener;
+import com.dfa.hubzilla_android.ui.HtmlTextView;
+import com.dfa.hubzilla_android.ui.theme.ThemeHelper;
+import com.dfa.hubzilla_android.ui.theme.ThemedActivity;
+import com.dfa.hubzilla_android.ui.theme.ThemedFragment;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
 
 import java.util.Observable;
 import java.util.Observer;
@@ -134,7 +134,7 @@ public class AboutActivity extends ThemedActivity
      */
     public static class AboutFragment extends ThemedFragment {
 
-        public static final String TAG = "com.github.dfa.hubzilla_android.AboutActivity.AboutFragment";
+        public static final String TAG = "com.dfa.hubzilla_android.AboutActivity.AboutFragment";
 
         @BindView(R.id.fragment_about__app_version)
         TextView appVersion;
@@ -224,7 +224,7 @@ public class AboutActivity extends ThemedActivity
      * Fragment that shows information about the license of the app and used 3rd party libraries
      */
     public static class LicenseFragment extends ThemedFragment {
-        public static final String TAG = "com.github.dfa.hubzilla_android.AboutActivity.LicenseFragment";
+        public static final String TAG = "com.dfa.hubzilla_android.AboutActivity.LicenseFragment";
 
         @BindView(R.id.fragment_license__maintainers_text)
         HtmlTextView maintainers;
@@ -302,7 +302,7 @@ public class AboutActivity extends ThemedActivity
      * Fragment that shows debug information like app version, pod version...
      */
     public static class DebugFragment extends Fragment implements Observer {
-        public static final String TAG = "com.github.dfa.hubzilla_android.AboutActivity.DebugFragment";
+        public static final String TAG = "com.dfa.hubzilla_android.AboutActivity.DebugFragment";
 
         @BindView(R.id.fragment_debug__package_name)
         TextView packageName;

app/src/main/java/com/dfa/hubzilla_android/activity/AspectListFragment.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.activity;
+package com.dfa.hubzilla_android.activity;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -32,14 +32,14 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.data.DiasporaAspect;
-import com.github.dfa.hubzilla_android.listener.OnSomethingClickListener;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.data.DiasporaAspect;
+import com.dfa.hubzilla_android.listener.OnSomethingClickListener;
+import com.dfa.hubzilla_android.ui.theme.ThemedFragment;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,7 +53,7 @@ import butterknife.ButterKnife;
  */
 public class AspectListFragment extends ThemedFragment implements OnSomethingClickListener<Object> {
 
-    public static final String TAG = "com.github.dfa.hubzilla_android.AspectListFragment";
+    public static final String TAG = "com.dfa.hubzilla_android.AspectListFragment";
 
     @BindView(R.id.fragment_list__recycler_view)
     public RecyclerView aspectsRecyclerView;

app/src/main/java/com/dfa/hubzilla_android/activity/DiasporaStreamFragment.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.activity;
+package com.dfa.hubzilla_android.activity;
 
 import android.Manifest;
 import android.animation.ObjectAnimator;
@@ -42,22 +42,22 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.widget.Toast;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.BuildConfig;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.data.DiasporaUserProfile;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
-import com.github.dfa.hubzilla_android.web.BrowserFragment;
-import com.github.dfa.hubzilla_android.web.DiasporaStreamWebChromeClient;
-import com.github.dfa.hubzilla_android.web.FileUploadWebChromeClient;
-import com.github.dfa.hubzilla_android.web.WebHelper;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.BuildConfig;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.data.DiasporaUserProfile;
+import com.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.web.BrowserFragment;
+import com.dfa.hubzilla_android.web.DiasporaStreamWebChromeClient;
+import com.dfa.hubzilla_android.web.FileUploadWebChromeClient;
+import com.dfa.hubzilla_android.web.WebHelper;
 
-import net.gsantner.opoc.util.PermissionChecker;
-import net.gsantner.opoc.util.ShareUtil;
+import net.opoc.util.PermissionChecker;
+import net.opoc.util.ShareUtil;
 
 import org.json.JSONException;
 
@@ -71,7 +71,7 @@ import java.util.Date;
  */
 
 public class DiasporaStreamFragment extends BrowserFragment {
-    public static final String TAG = "com.github.dfa.hubzilla_android.StreamFragment";
+    public static final String TAG = "com.dfa.hubzilla_android.StreamFragment";
 
     protected DiasporaUrlHelper urls;
 

app/src/main/java/com/dfa/hubzilla_android/activity/MainActivity.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.activity;
+package com.dfa.hubzilla_android.activity;
 
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
@@ -60,34 +60,34 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.BuildConfig;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.data.DiasporaPodList;
-import com.github.dfa.hubzilla_android.data.DiasporaUserProfile;
-import com.github.dfa.hubzilla_android.listener.DiasporaUserProfileChangedListener;
-import com.github.dfa.hubzilla_android.listener.IntellihideToolbarActivityListener;
-import com.github.dfa.hubzilla_android.receiver.OpenExternalLinkReceiver;
-import com.github.dfa.hubzilla_android.receiver.UpdateTitleReceiver;
-import com.github.dfa.hubzilla_android.ui.BadgeDrawable;
-import com.github.dfa.hubzilla_android.ui.PodSelectionDialog;
-import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedActivity;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment;
-import com.github.dfa.hubzilla_android.util.ActivityUtils;
-import com.github.dfa.hubzilla_android.util.AndroidBug5497Workaround;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
-import com.github.dfa.hubzilla_android.web.BrowserFragment;
-import com.github.dfa.hubzilla_android.web.ContextMenuWebView;
-import com.github.dfa.hubzilla_android.web.ProxyHandler;
-import com.github.dfa.hubzilla_android.web.WebHelper;
-import com.github.dfa.hubzilla_android.web.custom_tab.CustomTabActivityHelper;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.BuildConfig;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.data.DiasporaPodList;
+import com.dfa.hubzilla_android.data.DiasporaUserProfile;
+import com.dfa.hubzilla_android.listener.DiasporaUserProfileChangedListener;
+import com.dfa.hubzilla_android.listener.IntellihideToolbarActivityListener;
+import com.dfa.hubzilla_android.receiver.OpenExternalLinkReceiver;
+import com.dfa.hubzilla_android.receiver.UpdateTitleReceiver;
+import com.dfa.hubzilla_android.ui.BadgeDrawable;
+import com.dfa.hubzilla_android.ui.PodSelectionDialog;
+import com.dfa.hubzilla_android.ui.theme.ThemeHelper;
+import com.dfa.hubzilla_android.ui.theme.ThemedActivity;
+import com.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder;
+import com.dfa.hubzilla_android.ui.theme.ThemedFragment;
+import com.dfa.hubzilla_android.util.ActivityUtils;
+import com.dfa.hubzilla_android.util.AndroidBug5497Workaround;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.web.BrowserFragment;
+import com.dfa.hubzilla_android.web.ContextMenuWebView;
+import com.dfa.hubzilla_android.web.ProxyHandler;
+import com.dfa.hubzilla_android.web.WebHelper;
+import com.dfa.hubzilla_android.web.custom_tab.CustomTabActivityHelper;
 
-import net.gsantner.opoc.format.markdown.SimpleMarkdownParser;
+import net.opoc.format.markdown.SimpleMarkdownParser;
 
 import java.io.IOException;
 
@@ -108,14 +108,14 @@ public class MainActivity extends ThemedActivity
     public static final int INPUT_FILE_REQUEST_CODE_NEW = 1;
     public static final int INPUT_FILE_REQUEST_CODE_OLD = 2;
 
-    public static final String ACTION_OPEN_URL = "com.github.dfa.hubzilla_android.MainActivity.open_url";
-    public static final String ACTION_OPEN_EXTERNAL_URL = "com.github.dfa.hubzilla_android.MainActivity.open_external_url";
-    public static final String ACTION_CHANGE_ACCOUNT = "com.github.dfa.hubzilla_android.MainActivity.change_account";
-    public static final String ACTION_CLEAR_CACHE = "com.github.dfa.hubzilla_android.MainActivity.clear_cache";
-    public static final String ACTION_UPDATE_TITLE_FROM_URL = "com.github.dfa.hubzilla_android.MainActivity.set_title";
+    public static final String ACTION_OPEN_URL = "com.dfa.hubzilla_android.MainActivity.open_url";
+    public static final String ACTION_OPEN_EXTERNAL_URL = "com.dfa.hubzilla_android.MainActivity.open_external_url";
+    public static final String ACTION_CHANGE_ACCOUNT = "com.dfa.hubzilla_android.MainActivity.change_account";
+    public static final String ACTION_CLEAR_CACHE = "com.dfa.hubzilla_android.MainActivity.clear_cache";
+    public static final String ACTION_UPDATE_TITLE_FROM_URL = "com.dfa.hubzilla_android.MainActivity.set_title";
     public static final String URL_MESSAGE = "URL_MESSAGE";
-    public static final String EXTRA_URL = "com.github.dfa.hubzilla_android.extra_url";
-    public static final String CONTENT_HASHTAG = "content://com.github.dfa.hubzilla_android.mainactivity/";
+    public static final String EXTRA_URL = "com.dfa.hubzilla_android.extra_url";
+    public static final String CONTENT_HASHTAG = "content://com.dfa.hubzilla_android.mainactivity/";
 
     private App app;
     private CustomTabActivityHelper customTabActivityHelper;

app/src/main/java/com/dfa/hubzilla_android/activity/PodSelectionFragment.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.activity;
+package com.dfa.hubzilla_android.activity;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -44,17 +44,17 @@ import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.data.DiasporaPodList;
-import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod;
-import com.github.dfa.hubzilla_android.service.FetchPodsService;
-import com.github.dfa.hubzilla_android.ui.PodSelectionDialog;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment;
-import com.github.dfa.hubzilla_android.util.ActivityUtils;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.data.DiasporaPodList;
+import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod;
+import com.dfa.hubzilla_android.service.FetchPodsService;
+import com.dfa.hubzilla_android.ui.PodSelectionDialog;
+import com.dfa.hubzilla_android.ui.theme.ThemedFragment;
+import com.dfa.hubzilla_android.util.ActivityUtils;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -71,7 +71,7 @@ import butterknife.OnClick;
  */
 
 public class PodSelectionFragment extends ThemedFragment implements SearchView.OnQueryTextListener, PodSelectionDialog.PodSelectionDialogResultListener {
-    public static final String TAG = "com.github.dfa.hubzilla_android.PodSelectionFragment";
+    public static final String TAG = "com.dfa.hubzilla_android.PodSelectionFragment";
 
     @BindView(R.id.podselection__fragment__listpods)
     protected ListView listViewPod;

app/src/main/java/com/dfa/hubzilla_android/activity/SettingsActivity.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.activity;
+package com.dfa.hubzilla_android.activity;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -21,17 +21,17 @@ import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.ui.theme.ColorPalette;
-import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedActivity;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedPreferenceFragment;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
-import com.github.dfa.hubzilla_android.web.ProxyHandler;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.ui.theme.ColorPalette;
+import com.dfa.hubzilla_android.ui.theme.ThemeHelper;
+import com.dfa.hubzilla_android.ui.theme.ThemedActivity;
+import com.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder;
+import com.dfa.hubzilla_android.ui.theme.ThemedPreferenceFragment;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.web.ProxyHandler;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -154,7 +154,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
     }
 
     public static class SettingsFragmentMaster extends ThemedPreferenceFragment {
-        public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentMaster";
+        public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentMaster";
 
         public void onCreate(Bundle savedInstances) {
             super.onCreate(savedInstances);
@@ -252,7 +252,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
     }
 
     public static class SettingsFragmentThemes extends ThemedPreferenceFragment {
-        public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentThemes";
+        public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentThemes";
 
         public void onCreate(Bundle savedInstances) {
             super.onCreate(savedInstances);
@@ -360,7 +360,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
     }
 
     public static class SettingsFragmentNavSlider extends ThemedPreferenceFragment {
-        public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentNavSlider";
+        public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentNavSlider";
 
         public void onCreate(Bundle savedInstances) {
             super.onCreate(savedInstances);
@@ -380,7 +380,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
     }
 
     public static class SettingsFragmentProxy extends ThemedPreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
-        public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentProxy";
+        public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentProxy";
 
         public void onCreate(Bundle savedInstances) {
             super.onCreate(savedInstances);
@@ -441,7 +441,7 @@ public class SettingsActivity extends ThemedActivity implements SharedPreference
     }
 
     public static class SettingsFragmentDebugging extends ThemedPreferenceFragment {
-        public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentDebugging";
+        public static final String TAG = "com.dfa.hubzilla_android.settings.SettingsFragmentDebugging";
 
         public void onCreate(Bundle savedInstances) {
             super.onCreate(savedInstances);

app/src/main/java/com/dfa/hubzilla_android/activity/TagListFragment.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.activity;
+package com.dfa.hubzilla_android.activity;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -31,13 +31,13 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.listener.OnSomethingClickListener;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.listener.OnSomethingClickListener;
+import com.dfa.hubzilla_android.ui.theme.ThemedFragment;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -51,7 +51,7 @@ import butterknife.ButterKnife;
  */
 public class TagListFragment extends ThemedFragment implements OnSomethingClickListener<Object> {
 
-    public static final String TAG = "com.github.dfa.hubzilla_android.TagListFragment";
+    public static final String TAG = "com.dfa.hubzilla_android.TagListFragment";
 
     @BindView(R.id.fragment_list__recycler_view)
     public RecyclerView followedTagsRecyclerView;

app/src/main/java/com/dfa/hubzilla_android/data/DiasporaAspect.java

@@ -16,10 +16,10 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.data;
+package com.dfa.hubzilla_android.data;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/com/dfa/hubzilla_android/data/DiasporaPodList.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.data;
+package com.dfa.hubzilla_android.data;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/com/dfa/hubzilla_android/data/DiasporaUserProfile.java

@@ -16,15 +16,15 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.data;
+package com.dfa.hubzilla_android.data;
 
 import android.os.Handler;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.listener.DiasporaUserProfileChangedListener;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.listener.DiasporaUserProfileChangedListener;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/com/dfa/hubzilla_android/listener/DiasporaUserProfileChangedListener.java

@@ -16,9 +16,9 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.listener;
+package com.dfa.hubzilla_android.listener;
 
-import com.github.dfa.hubzilla_android.data.DiasporaUserProfile;
+import com.dfa.hubzilla_android.data.DiasporaUserProfile;
 
 /**
  * Created by gsantner (https://gsantner.net/) on 26.03.16.

app/src/main/java/com/dfa/hubzilla_android/listener/IntellihideToolbarActivityListener.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.listener;
+package com.dfa.hubzilla_android.listener;
 
 import android.support.design.widget.AppBarLayout;
 

app/src/main/java/com/dfa/hubzilla_android/listener/OnSomethingClickListener.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.listener;
+package com.dfa.hubzilla_android.listener;
 
 /**
  * Listener for different types of click events

app/src/main/java/com/dfa/hubzilla_android/receiver/OpenExternalLinkReceiver.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.receiver;
+package com.dfa.hubzilla_android.receiver;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
@@ -27,13 +27,13 @@ import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.support.customtabs.CustomTabsIntent;
 
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.activity.MainActivity;
-import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.web.custom_tab.BrowserFallback;
-import com.github.dfa.hubzilla_android.web.custom_tab.CustomTabActivityHelper;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.activity.MainActivity;
+import com.dfa.hubzilla_android.ui.theme.ThemeHelper;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.web.custom_tab.BrowserFallback;
+import com.dfa.hubzilla_android.web.custom_tab.CustomTabActivityHelper;
 
 /**
  * BroadcastReceiver that opens links in a Chrome CustomTab

app/src/main/java/com/dfa/hubzilla_android/receiver/UpdateTitleReceiver.java

@@ -16,18 +16,18 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.receiver;
+package com.dfa.hubzilla_android.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.activity.MainActivity;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.activity.MainActivity;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
 
 /**
  * BroadcastReceiver used to update the title of the MainActivity depending on the url of the ui__webview

app/src/main/java/com/dfa/hubzilla_android/service/AvatarImageLoader.java

@@ -17,14 +17,14 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.github.dfa.hubzilla_android.service;
+package com.dfa.hubzilla_android.service;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.widget.ImageView;
 
-import net.gsantner.opoc.util.DownloadTask;
+import net.opoc.util.DownloadTask;
 
 import java.io.File;
 

app/src/main/java/com/dfa/hubzilla_android/service/FetchPodsService.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.service;
+package com.dfa.hubzilla_android.service;
 
 import android.app.Service;
 import android.content.Intent;
@@ -24,8 +24,8 @@ import android.os.AsyncTask;
 import android.os.IBinder;
 import android.support.v4.content.LocalBroadcastManager;
 
-import com.github.dfa.hubzilla_android.data.DiasporaPodList;
-import com.github.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.data.DiasporaPodList;
+import com.dfa.hubzilla_android.util.AppLog;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/com/dfa/hubzilla_android/service/HashtagContentProvider.java

@@ -18,7 +18,7 @@
 
     This file is inspired from sourabhsoni.com/implementing-hashtags-in-android-application/
  */
-package com.github.dfa.hubzilla_android.service;
+package com.dfa.hubzilla_android.service;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;

app/src/main/java/com/dfa/hubzilla_android/service/ProfileFetchTask.java

@@ -16,16 +16,16 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.service;
+package com.dfa.hubzilla_android.service;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.webkit.CookieManager;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.data.DiasporaUserProfile;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.DiasporaUrlHelper;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.data.DiasporaUserProfile;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.DiasporaUrlHelper;
 
 import java.io.BufferedReader;
 import java.io.IOException;

app/src/main/java/com/dfa/hubzilla_android/ui/BadgeDrawable.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.ui;
+package com.dfa.hubzilla_android.ui;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -30,9 +30,9 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.support.annotation.NonNull;
 
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
 
 @SuppressWarnings("WeakerAccess")
 public class BadgeDrawable extends Drawable {

app/src/main/java/com/dfa/hubzilla_android/ui/BottomBarBehavior.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.dfa.hubzilla_android.ui;
+package com.dfa.hubzilla_android.ui;
 
 import android.content.Context;
 import android.support.design.widget.AppBarLayout;

app/src/main/java/com/dfa/hubzilla_android/ui/HtmlTextView.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.ui;
+package com.dfa.hubzilla_android.ui;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatTextView;
@@ -26,7 +26,7 @@ import android.text.util.Linkify;
 import android.util.AttributeSet;
 import android.util.Patterns;
 
-import com.github.dfa.hubzilla_android.activity.MainActivity;
+import com.dfa.hubzilla_android.activity.MainActivity;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

app/src/main/java/com/dfa/hubzilla_android/ui/PodSelectionDialog.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.ui;
+package com.dfa.hubzilla_android.ui;
 
 
 import android.annotation.SuppressLint;
@@ -17,14 +17,14 @@ import android.widget.RadioGroup;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod;
-import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod.DiasporaPodUrl;
-import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedAppCompatDialogFragment;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.web.ProxyHandler;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod;
+import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod.DiasporaPodUrl;
+import com.dfa.hubzilla_android.ui.theme.ThemeHelper;
+import com.dfa.hubzilla_android.ui.theme.ThemedAppCompatDialogFragment;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.web.ProxyHandler;
 
 import org.json.JSONException;
 
@@ -40,7 +40,7 @@ import butterknife.OnItemSelected;
  * Created by gsantner (http://gsantner.net) on 06.10.16.
  */
 public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
-    public static final String TAG = "com.github.dfa.hubzilla_android.ui.PodSelectionDialog";
+    public static final String TAG = "com.dfa.hubzilla_android.ui.PodSelectionDialog";
 
     public interface PodSelectionDialogResultListener {
         void onPodSelectionDialogResult(DiasporaPod pod, boolean accepted);

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ColorPalette.java

@@ -1,11 +1,11 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.ColorUtils;
 
-import com.github.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.R;
 
 /**
  * Class that handles Colors

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemeHelper.java

@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
     This class is inspired by org.horasapps.LeafPic
  */
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.content.DialogInterface;
 import android.content.res.ColorStateList;
@@ -39,8 +39,8 @@ import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * Singleton that can be used to color views

app/src/main/java/com/dfa/hubzilla_android/ui/theme/Themeable.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 /**
  * Interface that allows setting Theme colors

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedActivity.java

@@ -16,17 +16,17 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.annotation.TargetApi;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.support.v7.app.AppCompatActivity;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
 
 /**
  * Activity that supports color schemes

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedAlertDialogBuilder.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -6,7 +6,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.StyleRes;
 import android.support.v7.app.AlertDialog;
 
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * AlertDialog Builder that colors its buttons

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedAppCompatDialogFragment.java

@@ -1,11 +1,11 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatDialogFragment;
 
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * Themed DialogFragment

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedCheckBoxPreference.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.content.Context;
 import android.preference.CheckBoxPreference;
@@ -7,7 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * CheckboxPreference that colors its checkbox with accent color

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedColorPickerPreference.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
@@ -8,9 +8,9 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.util.AppSettings;
-import com.github.dfa.hubzilla_android.util.ContextUtils;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.ContextUtils;
 
 /**
  * Preference that shows selected Color in a circle

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedFragment.java

@@ -16,12 +16,12 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.util.AppSettings;
 
-import net.gsantner.opoc.activity.GsFragmentBase;
+import net.opoc.activity.GsFragmentBase;
 
 /**
  * Fragment that supports color schemes

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedPreferenceCategory.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.content.Context;
 import android.preference.PreferenceCategory;
@@ -7,7 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * PreferenceCategory with a colored title

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedPreferenceFragment.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.os.Build;
 import android.preference.Preference;
@@ -6,8 +6,8 @@ import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.view.Window;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * PreferenceFragment with a colored status bar

app/src/main/java/com/dfa/hubzilla_android/ui/theme/ThemedVisibilityPreference.java

@@ -1,11 +1,11 @@
-package com.github.dfa.hubzilla_android.ui.theme;
+package com.dfa.hubzilla_android.ui.theme;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.CheckBox;
 
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * ThemedCheckBoxPreference with visibility icons instead of checkbox. TODO: Make more flexible?

app/src/main/java/com/dfa/hubzilla_android/util/ActivityUtils.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.util;
+package com.dfa.hubzilla_android.util;
 
 import android.app.Activity;
 import android.content.Context;
@@ -8,9 +8,9 @@ import android.os.Environment;
 import android.support.v4.content.FileProvider;
 import android.view.View;
 
-import com.github.dfa.hubzilla_android.BuildConfig;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.web.WebHelper;
+import com.dfa.hubzilla_android.BuildConfig;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.web.WebHelper;
 
 import java.io.File;
 import java.io.IOException;
@@ -20,7 +20,7 @@ import java.util.Date;
 import java.util.Locale;
 
 @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"})
-public class ActivityUtils extends net.gsantner.opoc.util.ActivityUtils {
+public class ActivityUtils extends net.opoc.util.ActivityUtils {
     public ActivityUtils(Activity activity) {
         super(activity);
     }

app/src/main/java/com/dfa/hubzilla_android/util/AndroidBug5497Workaround.java

@@ -1,4 +1,4 @@
-package com.github.dfa.hubzilla_android.util;
+package com.dfa.hubzilla_android.util;
 
 
 import android.app.Activity;

app/src/main/java/com/dfa/hubzilla_android/util/AppLog.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.util;
+package com.dfa.hubzilla_android.util;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

app/src/main/java/com/dfa/hubzilla_android/util/AppSettings.java

@@ -12,7 +12,7 @@
     along with the dandelion*.
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.util;
+package com.dfa.hubzilla_android.util;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -20,14 +20,14 @@ import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.os.Environment;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.BuildConfig;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.data.DiasporaAspect;
-import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod;
-import com.github.dfa.hubzilla_android.web.ProxyHandler;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.BuildConfig;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.data.DiasporaAspect;
+import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod;
+import com.dfa.hubzilla_android.web.ProxyHandler;
 
-import net.gsantner.opoc.preference.SharedPreferencesPropertyBackend;
+import net.opoc.preference.SharedPreferencesPropertyBackend;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/com/dfa/hubzilla_android/util/ContextUtils.java

@@ -1,10 +1,10 @@
-package com.github.dfa.hubzilla_android.util;
+package com.dfa.hubzilla_android.util;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Environment;
 
-import com.github.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.App;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +14,7 @@ import java.util.Date;
 import java.util.Locale;
 
 @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue"})
-public class ContextUtils extends net.gsantner.opoc.util.ContextUtils {
+public class ContextUtils extends net.opoc.util.ContextUtils {
     protected ContextUtils(Context context) {
         super(context);
     }

app/src/main/java/com/dfa/hubzilla_android/util/DiasporaUrlHelper.java

@@ -16,12 +16,12 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.util;
+package com.dfa.hubzilla_android.util;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.data.DiasporaAspect;
-import com.github.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.data.DiasporaAspect;
+import com.dfa.hubzilla_android.data.DiasporaPodList.DiasporaPod;
 
 /**
  * Helper class that provides easy access to specific urls related to diaspora

app/src/main/java/com/dfa/hubzilla_android/web/BrowserFragment.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.content.Context;
 import android.content.MutableContextWrapper;
@@ -27,12 +27,12 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.ProgressBar;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.ui.theme.ThemeHelper;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedFragment;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.ui.theme.ThemeHelper;
+import com.dfa.hubzilla_android.ui.theme.ThemedFragment;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * Fragment with a webView and a ProgressBar.
@@ -41,7 +41,7 @@ import com.github.dfa.hubzilla_android.util.AppSettings;
  */
 
 public class BrowserFragment extends ThemedFragment {
-    public static final String TAG = "com.github.dfa.hubzilla_android.BrowserFragment";
+    public static final String TAG = "com.dfa.hubzilla_android.BrowserFragment";
 
     protected ContextMenuWebView webView;
     protected ProgressBar progressBar;

app/src/main/java/com/dfa/hubzilla_android/web/ContextMenuWebView.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.app.Activity;
 import android.content.ClipData;
@@ -29,13 +29,13 @@ import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import com.github.dfa.hubzilla_android.BuildConfig;
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.BuildConfig;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.util.AppSettings;
 
-import net.gsantner.opoc.util.DownloadTask;
-import net.gsantner.opoc.util.PermissionChecker;
-import net.gsantner.opoc.util.ShareUtil;
+import net.opoc.util.DownloadTask;
+import net.opoc.util.PermissionChecker;
+import net.opoc.util.ShareUtil;
 
 import java.io.File;
 import java.util.Date;

app/src/main/java/com/dfa/hubzilla_android/web/CustomWebViewClient.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -27,12 +27,12 @@ import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.github.dfa.hubzilla_android.App;
-import com.github.dfa.hubzilla_android.activity.MainActivity;
-import com.github.dfa.hubzilla_android.data.DiasporaPodList;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.App;
+import com.dfa.hubzilla_android.activity.MainActivity;
+import com.dfa.hubzilla_android.data.DiasporaPodList;
+import com.dfa.hubzilla_android.util.AppSettings;
 
-import net.gsantner.opoc.util.AdBlock;
+import net.opoc.util.AdBlock;
 
 public class CustomWebViewClient extends WebViewClient {
     private final App app;

app/src/main/java/com/dfa/hubzilla_android/web/DiasporaStreamWebChromeClient.java

@@ -16,16 +16,16 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.webkit.JsResult;
 import android.webkit.WebView;
 import android.widget.ProgressBar;
 
-import com.github.dfa.hubzilla_android.R;
-import com.github.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.ui.theme.ThemedAlertDialogBuilder;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 /**
  * WebChromeClient that handles sharing text to diaspora*

app/src/main/java/com/dfa/hubzilla_android/web/FileUploadWebChromeClient.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.net.Uri;
 import android.webkit.ValueCallback;

app/src/main/java/com/dfa/hubzilla_android/web/NestedWebView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.content.Context;
 import android.support.v4.view.MotionEventCompat;

app/src/main/java/com/dfa/hubzilla_android/web/ProgressBarWebChromeClient.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.view.View;
 import android.webkit.WebChromeClient;

app/src/main/java/com/dfa/hubzilla_android/web/ProxyHandler.java

@@ -16,15 +16,15 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.content.Context;
 import android.os.StrictMode;
 import android.webkit.WebView;
 
-import com.github.dfa.hubzilla_android.activity.MainActivity;
-import com.github.dfa.hubzilla_android.util.AppLog;
-import com.github.dfa.hubzilla_android.util.AppSettings;
+import com.dfa.hubzilla_android.activity.MainActivity;
+import com.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppSettings;
 
 import java.util.ArrayList;
 

app/src/main/java/com/dfa/hubzilla_android/web/WebHelper.java

@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.github.dfa.hubzilla_android.web;
+package com.dfa.hubzilla_android.web;
 
 import android.content.Context;
 import android.content.Intent;
@@ -28,7 +28,7 @@ import android.text.Html;
 import android.webkit.URLUtil;
 import android.webkit.WebView;
 
-import com.github.dfa.hubzilla_android.activity.MainActivity;
+import com.dfa.hubzilla_android.activity.MainActivity;
 
 /**
  * Created by Gregor Santner on 07.08.16.

app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/BrowserFallback.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web.custom_tab;
+package com.dfa.hubzilla_android.web.custom_tab;
 
 import android.app.Activity;
 import android.content.Intent;

app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/CustomTabActivityHelper.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web.custom_tab;
+package com.dfa.hubzilla_android.web.custom_tab;
 
 import android.app.Activity;
 import android.content.ComponentName;

app/src/main/java/com/dfa/hubzilla_android/web/custom_tab/CustomTabsHelper.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package com.github.dfa.hubzilla_android.web.custom_tab;
+package com.dfa.hubzilla_android.web.custom_tab;
 
 import android.content.Context;
 import android.content.Intent;
@@ -27,7 +27,7 @@ import android.net.Uri;
 import android.support.customtabs.CustomTabsService;
 import android.text.TextUtils;
 
-import com.github.dfa.hubzilla_android.util.AppLog;
+import com.dfa.hubzilla_android.util.AppLog;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/net/opoc/activity/GsFragmentBase.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.activity;
+package net.opoc.activity;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -20,7 +20,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import net.gsantner.opoc.util.ContextUtils;
+import net.opoc.util.ContextUtils;
 
 import butterknife.ButterKnife;
 

app/src/main/java/net/opoc/format/markdown/SimpleMarkdownParser.java

@@ -22,7 +22,7 @@
  * FILTER_WEB is intended to be used at engines understanding most common HTML tags.
  */
 
-package net.gsantner.opoc.format.markdown;
+package net.opoc.format.markdown;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;

app/src/main/java/net/opoc/preference/PropertyBackend.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.preference;
+package net.opoc.preference;
 
 import java.util.List;
 

app/src/main/java/net/opoc/preference/SharedPreferencesPropertyBackend.java

@@ -31,7 +31,7 @@
     }
  */
 
-package net.gsantner.opoc.preference;
+package net.opoc.preference;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/net/opoc/preference/nonsupport/LanguagePreference.java

@@ -37,13 +37,13 @@ static String getUsedAndroidLanguages() {
  * Summary: Change language of this app. Restart app for changes to take effect
 
  * Define element in Preferences-XML:
-    <net.gsantner.opoc.preference.LanguagePreference
+    <net.opoc.preference.LanguagePreference
         android:icon="@drawable/ic_language_black_24dp"
         android:key="@string/pref_key__language"
         android:summary="@string/pref_desc__language"
         android:title="@string/pref_title__language"/>
  */
-package net.gsantner.opoc.preference.nonsupport;
+package net.opoc.preference.nonsupport;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -53,7 +53,7 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
-import net.gsantner.opoc.util.ContextUtils;
+import net.opoc.util.ContextUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;

app/src/main/java/net/opoc/util/ActivityUtils.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -32,7 +32,7 @@ import android.webkit.WebView;
 
 
 @SuppressWarnings({"WeakerAccess", "unused", "SameParameterValue", "SpellCheckingInspection"})
-public class ActivityUtils extends net.gsantner.opoc.util.ContextUtils {
+public class ActivityUtils extends net.opoc.util.ContextUtils {
     //########################
     //## Members, Constructors
     //########################

app/src/main/java/net/opoc/util/AdBlock.java

@@ -23,13 +23,13 @@ public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
             : super.shouldInterceptRequest(view, url);
 }
 */
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 import android.content.Context;
 import android.util.Log;
 import android.webkit.WebResourceResponse;
 
-import com.github.dfa.hubzilla_android.R;
+import com.dfa.hubzilla_android.R;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

app/src/main/java/net/opoc/util/Callback.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 @SuppressWarnings("unused")
 public class Callback {

app/src/main/java/net/opoc/util/ContextUtils.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -57,7 +57,7 @@ import android.view.MenuItem;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import net.gsantner.opoc.format.markdown.SimpleMarkdownParser;
+import net.opoc.format.markdown.SimpleMarkdownParser;
 
 import java.io.BufferedReader;
 import java.io.File;

app/src/main/java/net/opoc/util/DownloadTask.java

@@ -16,7 +16,7 @@
 
     If not, see <http://www.gnu.org/licenses/>.
  */
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 import android.os.AsyncTask;
 import android.support.annotation.Nullable;

app/src/main/java/net/opoc/util/FileUtils.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 
 import java.io.BufferedInputStream;

app/src/main/java/net/opoc/util/NetworkUtils.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 import org.json.JSONObject;
 

app/src/main/java/net/opoc/util/PermissionChecker.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 import android.Manifest;
 import android.app.Activity;

app/src/main/java/net/opoc/util/ShareUtil.java

@@ -8,7 +8,7 @@
  *  https://www.apache.org/licenses/LICENSE-2.0
  *
 #########################################################*/
-package net.gsantner.opoc.util;
+package net.opoc.util;
 
 import android.app.Activity;
 import android.content.ClipData;

app/src/main/res/layout/about__activity.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.github.dfa.hubzilla_android.activity.AboutActivity">
+    tools:context="com.dfa.hubzilla_android.activity.AboutActivity">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/about__appbar"

app/src/main/res/layout/about__fragment_about.xml

@@ -6,7 +6,7 @@
     android:layout_marginBottom="@dimen/activity_vertical_margin"
     android:layout_marginLeft="@dimen/activity_horizontal_margin"
     android:layout_marginRight="@dimen/activity_horizontal_margin"
-    tools:context="com.github.dfa.hubzilla_android.activity.AboutActivity$AboutFragment">
+    tools:context="com.dfa.hubzilla_android.activity.AboutActivity$AboutFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -215,7 +215,7 @@
                     android:text="@string/fragment_about__spread_the_word"
                     android:layout_marginBottom="8dp"/>
 
-                <com.github.dfa.hubzilla_android.ui.HtmlTextView
+                <com.dfa.hubzilla_android.ui.HtmlTextView
                     android:id="@+id/fragment_about__spread_the_word_text"
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"

app/src/main/res/layout/about__fragment_debug.xml

@@ -5,7 +5,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    tools:context="com.github.dfa.hubzilla_android.activity.AboutActivity$DebugFragment">
+    tools:context="com.dfa.hubzilla_android.activity.AboutActivity$DebugFragment">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/about__fragment_license.xml

@@ -6,7 +6,7 @@
     android:layout_marginBottom="@dimen/activity_vertical_margin"
     android:layout_marginLeft="@dimen/activity_horizontal_margin"
     android:layout_marginRight="@dimen/activity_horizontal_margin"
-    tools:context="com.github.dfa.hubzilla_android.activity.AboutActivity$LicenseFragment">
+    tools:context="com.dfa.hubzilla_android.activity.AboutActivity$LicenseFragment">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -38,7 +38,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/fragment_license__maintainers"/>
 
-                <com.github.dfa.hubzilla_android.ui.HtmlTextView
+                <com.dfa.hubzilla_android.ui.HtmlTextView
                     android:id="@+id/fragment_license__maintainers_text"
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
@@ -75,7 +75,7 @@
                     android:text="@string/fragment_license__contributors"
                     android:layout_marginBottom="8dp"/>
 
-                <com.github.dfa.hubzilla_android.ui.HtmlTextView
+                <com.dfa.hubzilla_android.ui.HtmlTextView
                     android:id="@+id/fragment_license__contributors_text"
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"
@@ -159,7 +159,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/fragment_license__thirdparty_libs_text"/>
 
-                <com.github.dfa.hubzilla_android.ui.HtmlTextView
+                <com.dfa.hubzilla_android.ui.HtmlTextView
                     android:id="@+id/fragment_license__thirdparty_libs_text"
                     android:textAppearance="@style/TextAppearance.AppCompat"
                     android:layout_width="match_parent"

app/src/main/res/layout/browser__fragment.xml

@@ -3,9 +3,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.github.dfa.hubzilla_android.activity.MainActivity">
+    tools:context="com.dfa.hubzilla_android.activity.MainActivity">
 
-    <com.github.dfa.hubzilla_android.web.ContextMenuWebView
+    <com.dfa.hubzilla_android.web.ContextMenuWebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

app/src/main/res/layout/main__app_bar.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.github.dfa.hubzilla_android.activity.MainActivity">
+    tools:context="com.dfa.hubzilla_android.activity.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:id="@+id/main__appbar"

app/src/main/res/menu/main__menu_top.xml

@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.github.dfa.hubzilla_android.activity.MainActivity"
+    tools:context="com.dfa.hubzilla_android.activity.MainActivity"
     tools:ignore="AlwaysShowAction">
 
     <item

app/src/main/res/raw/.nfs0000000000ea060000000005

@@ -1,25 +0,0 @@
-# AndHub
-`---------------`  
-<small>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 https://www.gnu.org/licenses/.</small>  
-`---------------`  
-
-If you want to publish AndHub in an app store, you have to change the app name (AndHub), package name & launcher icon (blue). See "7. Additional Terms" of GPL.  
-You also have to provide the modifications in source code somewhere online for free. This is explicitly not about building the app and sharing with some friends, it's about app stores.  
-The reason is, that most app stores allow an app id just once, which would block our uploads if somebody else uploaded. Also, we want to keep control on where the app is published, and want to make sure there is no malware in it.  
-The F-Droid project team is explicitly allowed to publish AndHub without listed required modifications above at official F-Droid repository.
-
-## Miscellaneous
-
-We took some inspiration and code from dandelion\*. Go check it out, its free software as well!
-<https://github.com/gsantner/dandelion>

app/src/main/res/raw/.nfs0000000000ea0ec200000004

@@ -1,16 +0,0 @@
-<!--
-This file contains references to people who contributed to the app.
-You can also send a mail to [WIP](http://WIP) to get included.
-
-Schema:  **[Name](Reference)**<br/>~° Text
-
-Where:
-  * Name: username, first/lastname
-  * Reference: E-Mail, Webpage
-  * Text: Information about / kind of contribution
-
-
-
-## LIST OF CONTRIBUTORS
--->
-**[Massimiliano](https://hub.disroot.org/channel/massimiliano)**<br/>~° Current developer of AndHub

app/src/main/res/values/.nfs0000000000ea063800000006

@@ -1,364 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="UnusedResources">
-<!--default setting  was:
-<color name="colorPrimary">@color/primary</color>
-<color name="colorPrimaryDark">@color/primary_dark</color>
-<color name="colorAccent">@color/accent</color>
--->
-    <color name="colorPrimary">@color/d_purple</color>
-    <color name="colorPrimaryDark">@color/d_green</color>
-    <color name="colorAccent">@color/d_green</color>
-
-    <!-- Colors from Palette -->
-    <color name="primary">@color/d_purple</color>
-    <color name="primary_dark">@color/d_green</color>
-    <color name="accent">@color/d_green</color>
-    <color name="primary_light">#BBDEFB</color>
-    <color name="primary_text">#212121</color>
-    <color name="secondary_text">#727272</color>
-    <color name="icons">#FFFFFF</color>
-    <color name="divider">#B6B6B6</color>
-    <!-- End colors from Palette -->
-
-    <color name="white">#ffffff</color>
-    <color name="black">#000000</color>
-    <color name="actvitiy_white">#eeeeee</color>
-    <color name="transparent_black">#c4000000</color>
-    <color name="alternate_row_color">@color/md_grey_200</color>
-    <!-- Disroot colors -->
-    <color name="d_purple">#50162d</color>
-    <color name="d_green">#1f5c60</color>
-    <!-- End Disroot colors -->
-
-    <!-- Accent Color Collection
-        Taken from org.horaapps.leafpic -->
-    <color name="accent_red">#f44336</color>
-    <color name="accent_pink">#e91e63</color>
-    <color name="accent_purple">#9c27b0</color>
-    <color name="accent_deep_purple">#673ab7</color>
-    <color name="accent_indigo">#3f51b5</color>
-    <color name="accent_blue">#2196f3</color>
-    <color name="accent_cyan">#00bcd4</color>
-    <color name="accent_teal">#009688</color>
-    <color name="accent_green">#4caf50</color>
-    <color name="accent_yellow">#ffeb3b</color>
-    <color name="accent_amber">#ffc107</color>
-    <color name="accent_orange">#ff9800</color>
-    <color name="accent_brown">#795548</color>
-    <color name="accent_white">#FFFFFF</color>
-    <color name="accent_grey">#9e9e9e</color>
-    <color name="accent_black">#000000</color>
-
-    <!--
-    ███╗   ███╗ █████╗ ████████╗███████╗██████╗ ██╗ █████╗ ██╗
-    ████╗ ████║██╔══██╗╚══██╔══╝██╔════╝██╔══██╗██║██╔══██╗██║
-    ██╔████╔██║███████║   ██║   █████╗  ██████╔╝██║███████║██║
-    ██║╚██╔╝██║██╔══██║   ██║   ██╔══╝  ██╔══██╗██║██╔══██║██║
-    ██║ ╚═╝ ██║██║  ██║   ██║   ███████╗██║  ██║██║██║  ██║███████╗
-    ╚═╝     ╚═╝╚═╝  ╚═╝   ╚═╝   ╚══════╝╚═╝  ╚═╝╚═╝╚═╝  ╚═╝╚══════╝
-    -->
-    <color name="md_black_1000">#000000</color>
-
-    <color name="md_light_primary_icon">#8A000000</color>
-    <color name="md_light_primary_text">#DE000000</color>
-    <color name="md_light_secondary">#8A000000</color>
-    <color name="md_light_statusbar">@color/md_grey_300</color>
-    <color name="md_light_appbar">@color/md_grey_100</color>
-    <color name="md_light_background">@color/md_grey_200</color>
-    <color name="md_light_cards">@color/md_white_1000</color>
-    <color name="md_light_dialogs">@color/md_white_1000</color>
-    <color name="md_light_disabled">#61000000</color>
-    <color name="md_light_dividers">#1F000000</color>
-
-    <color name="md_dark_appbar">@color/md_grey_900</color>
-    <color name="md_dark_background">@color/md_grey_850</color>
-    <color name="md_dark_cards">@color/md_grey_800</color>
-    <color name="md_dark_dialogs">@color/md_grey_800</color>
-    <color name="md_dark_disabled">#4DFFFFFF</color>
-    <color name="md_dark_dividers">#1FFFFFFF</color>
-    <color name="md_dark_primary_icon">#B3FFFFFF</color>
-    <color name="md_dark_primary_text">#FFFFFFFF</color>
-    <color name="md_dark_secondary">#B3FFFFFF</color>
-    <color name="md_dark_statusbar">@color/md_black_1000</color>
-
-    <!--ALL COLOURS-->
-    <color name="md_amber_100">#FFECB3</color>
-    <color name="md_amber_200">#FFE082</color>
-    <color name="md_amber_300">#FFD54F</color>
-    <color name="md_amber_400">#FFCA28</color>
-    <color name="md_amber_50">#FFF8E1</color>
-    <color name="md_amber_500">#FFC107</color>
-    <color name="md_amber_600">#FFB300</color>
-    <color name="md_amber_700">#FFA000</color>
-    <color name="md_amber_800">#FF8F00</color>
-    <color name="md_amber_900">#FF6F00</color>
-    <color name="md_amber_A100">#FFE57F</color>
-    <color name="md_amber_A200">#FFD740</color>
-    <color name="md_amber_A400">#FFC400</color>
-    <color name="md_amber_A700">#FFAB00</color>
-
-    <color name="md_blue_100">#BBDEFB</color>
-    <color name="md_blue_200">#90CAF9</color>
-    <color name="md_blue_300">#64B5F6</color>
-    <color name="md_blue_400">#42A5F5</color>
-    <color name="md_blue_50">#E3F2FD</color>
-    <color name="md_blue_500">#2196F3</color>
-    <color name="md_blue_600">#1E88E5</color>
-    <color name="md_blue_650">#207be6</color>
-    <color name="md_blue_700">#1976D2</color>
-    <color name="md_blue_750">#195ed2</color>
-    <color name="md_blue_800">#1565C0</color>
-    <color name="md_blue_900">#0D47A1</color>
-    <color name="md_blue_A100">#82B1FF</color>
-    <color name="md_blue_A200">#448AFF</color>
-    <color name="md_blue_A400">#2979FF</color>
-    <color name="md_blue_A700">#2962FF</color>
-
-    <color name="md_blue_grey_100">#CFD8DC</color>
-    <color name="md_blue_grey_200">#B0BEC5</color>
-    <color name="md_blue_grey_300">#90A4AE</color>
-    <color name="md_blue_grey_400">#78909C</color>
-    <color name="md_blue_grey_50">#ECEFF1</color>
-    <color name="md_blue_grey_500">#607D8B</color>
-    <color name="md_blue_grey_600">#546E7A</color>
-    <color name="md_blue_grey_700">#455A64</color>
-    <color name="md_blue_grey_800">#37474F</color>
-    <color name="md_blue_grey_900">#263238</color>
-
-    <color name="md_brown_100">#D7CCC8</color>
-    <color name="md_brown_200">#BCAAA4</color>
-    <color name="md_brown_300">#A1887F</color>
-    <color name="md_brown_400">#8D6E63</color>
-    <color name="md_brown_50">#EFEBE9</color>
-    <color name="md_brown_500">#795548</color>
-    <color name="md_brown_600">#6D4C41</color>
-    <color name="md_brown_700">#5D4037</color>
-    <color name="md_brown_800">#4E342E</color>
-    <color name="md_brown_900">#3E2723</color>
-
-    <color name="md_cyan_100">#B2EBF2</color>
-    <color name="md_cyan_200">#80DEEA</color>
-    <color name="md_cyan_300">#4DD0E1</color>
-    <color name="md_cyan_400">#26C6DA</color>
-    <color name="md_cyan_50">#E0F7FA</color>
-    <color name="md_cyan_500">#00BCD4</color>
-    <color name="md_cyan_600">#00ACC1</color>
-    <color name="md_cyan_700">#0097A7</color>
-    <color name="md_cyan_800">#00838F</color>
-    <color name="md_cyan_900">#006064</color>
-    <color name="md_cyan_A100">#84FFFF</color>
-    <color name="md_cyan_A200">#18FFFF</color>
-    <color name="md_cyan_A400">#00E5FF</color>
-    <color name="md_cyan_A700">#00B8D4</color>
-
-
-    <color name="md_deep_orange_100">#FFCCBC</color>
-    <color name="md_deep_orange_200">#FFAB91</color>
-    <color name="md_deep_orange_300">#FF8A65</color>
-    <color name="md_deep_orange_400">#FF7043</color>
-    <color name="md_deep_orange_50">#FBE9E7</color>
-    <color name="md_deep_orange_500">#FF5722</color>
-    <color name="md_deep_orange_600">#F4511E</color>
-    <color name="md_deep_orange_650">#FF5300</color>
-    <color name="md_deep_orange_700">#E64A19</color>
-    <color name="md_deep_orange_800">#D84315</color>
-    <color name="md_deep_orange_900">#BF360C</color>
-    <color name="md_deep_orange_A100">#FF9E80</color>
-    <color name="md_deep_orange_A200">#FF6E40</color>
-    <color name="md_deep_orange_A400">#FF3D00</color>
-    <color name="md_deep_orange_A700">#DD2C00</color>
-
-    <color name="md_deep_purple_100">#D1C4E9</color>
-    <color name="md_deep_purple_200">#B39DDB</color>
-    <color name="md_deep_purple_300">#9575CD</color>
-    <color name="md_deep_purple_400">#7E57C2</color>
-    <color name="md_deep_purple_50">#EDE7F6</color>
-    <color name="md_deep_purple_500">#673AB7</color>
-    <color name="md_deep_purple_600">#5E35B1</color>
-    <color name="md_deep_purple_700">#512DA8</color>
-    <color name="md_deep_purple_800">#4527A0</color>
-    <color name="md_deep_purple_900">#311B92</color>
-    <color name="md_deep_purple_A100">#B388FF</color>
-    <color name="md_deep_purple_A200">#7C4DFF</color>
-    <color name="md_deep_purple_A400">#651FFF</color>
-    <color name="md_deep_purple_A700">#6200EA</color>
-
-    <color name="md_green_100">#C8E6C9</color>
-    <color name="md_green_200">#A5D6A7</color>
-    <color name="md_green_300">#81C784</color>
-    <color name="md_green_400">#66BB6A</color>
-    <color name="md_green_50">#E8F5E9</color>
-    <color name="md_green_500">#4CAF50</color>
-    <color name="md_green_600">#43A047</color>
-    <color name="md_green_700">#388E3C</color>
-    <color name="md_green_800">#2E7D32</color>
-    <color name="md_green_900">#1B5E20</color>
-    <color name="md_green_A100">#B9F6CA</color>
-    <color name="md_green_A200">#69F0AE</color>
-    <color name="md_green_A400">#00E676</color>
-    <color name="md_green_A700">#00C853</color>
-
-    <color name="md_grey_100">#F5F5F5</color>
-    <color name="md_grey_200">#EEEEEE</color>
-    <color name="md_grey_300">#E0E0E0</color>
-    <color name="md_grey_400">#BDBDBD</color>
-    <color name="md_grey_50">#FAFAFA</color>
-    <color name="md_grey_500">#9E9E9E</color>
-    <color name="md_grey_600">#757575</color>
-    <color name="md_grey_700">#616161</color>
-    <color name="md_grey_800">#424242</color>
-    <color name="md_grey_850">#303030</color>
-    <color name="md_grey_900">#212121</color>
-
-    <color name="md_indigo_100">#C5CAE9</color>
-    <color name="md_indigo_200">#9FA8DA</color>
-    <color name="md_indigo_300">#7986CB</color>
-    <color name="md_indigo_400">#5C6BC0</color>
-    <color name="md_indigo_50">#E8EAF6</color>
-    <color name="md_indigo_500">#3F51B5</color>
-    <color name="md_indigo_600">#3949AB</color>
-    <color name="md_indigo_700">#303F9F</color>
-    <color name="md_indigo_800">#283593</color>
-    <color name="md_indigo_900">#1A237E</color>
-    <color name="md_indigo_A100">#8C9EFF</color>
-    <color name="md_indigo_A200">#536DFE</color>
-    <color name="md_indigo_A400">#3D5AFE</color>
-    <color name="md_indigo_A700">#304FFE</color>
-
-    <color name="md_light_blue_100">#B3E5FC</color>
-    <color name="md_light_blue_200">#81D4FA</color>
-    <color name="md_light_blue_300">#4FC3F7</color>
-    <color name="md_light_blue_400">#29B6F6</color>
-    <color name="md_light_blue_50">#E1F5FE</color>
-    <color name="md_light_blue_500">#03A9F4</color>
-    <color name="md_light_blue_600">#039BE5</color>
-    <color name="md_light_blue_700">#0288D1</color>
-    <color name="md_light_blue_800">#0277BD</color>
-    <color name="md_light_blue_900">#01579B</color>
-    <color name="md_light_blue_A100">#80D8FF</color>
-    <color name="md_light_blue_A200">#40C4FF</color>
-    <color name="md_light_blue_A400">#00B0FF</color>
-    <color name="md_light_blue_A700">#0091EA</color>
-
-    <color name="md_light_green_100">#DCEDC8</color>
-    <color name="md_light_green_200">#C5E1A5</color>
-    <color name="md_light_green_300">#AED581</color>
-    <color name="md_light_green_400">#9CCC65</color>
-    <color name="md_light_green_50">#F1F8E9</color>
-    <color name="md_light_green_500">#8BC34A</color>
-    <color name="md_light_green_600">#7CB342</color>
-    <color name="md_light_green_700">#689F38</color>
-    <color name="md_light_green_800">#558B2F</color>
-    <color name="md_light_green_900">#33691E</color>
-    <color name="md_light_green_A100">#CCFF90</color>
-    <color name="md_light_green_A200">#B2FF59</color>
-    <color name="md_light_green_A400">#76FF03</color>
-    <color name="md_light_green_A700">#64DD17</color>
-
-    <color name="md_lime_100">#F0F4C3</color>
-    <color name="md_lime_200">#E6EE9C</color>
-    <color name="md_lime_300">#DCE775</color>
-    <color name="md_lime_400">#D4E157</color>
-    <color name="md_lime_50">#F9FBE7</color>
-    <color name="md_lime_500">#CDDC39</color>
-    <color name="md_lime_600">#C0CA33</color>
-    <color name="md_lime_700">#AFB42B</color>
-    <color name="md_lime_800">#9E9D24</color>
-    <color name="md_lime_900">#827717</color>
-    <color name="md_lime_A100">#F4FF81</color>
-    <color name="md_lime_A200">#EEFF41</color>
-    <color name="md_lime_A400">#C6FF00</color>
-    <color name="md_lime_A700">#AEEA00</color>
-
-    <color name="md_orange_100">#FFE0B2</color>
-    <color name="md_orange_200">#FFCC80</color>
-    <color name="md_orange_300">#FFB74D</color>
-    <color name="md_orange_400">#FFA726</color>
-    <color name="md_orange_50">#FFF3E0</color>
-    <color name="md_orange_500">#FF9800</color>
-    <color name="md_orange_600">#FB8C00</color>
-    <color name="md_orange_700">#F57C00</color>
-    <color name="md_orange_800">#EF6C00</color>
-    <color name="md_orange_900">#E65100</color>
-    <color name="md_orange_A100">#FFD180</color>
-    <color name="md_orange_A200">#FFAB40</color>
-    <color name="md_orange_A400">#FF9100</color>
-    <color name="md_orange_A700">#FF6D00</color>
-
-    <color name="md_pink_100">#F8BBD0</color>
-    <color name="md_pink_200">#F48FB1</color>
-    <color name="md_pink_300">#F06292</color>
-    <color name="md_pink_400">#EC407A</color>
-    <color name="md_pink_50">#FCE4EC</color>
-    <color name="md_pink_500">#E91E63</color>
-    <color name="md_pink_600">#D81B60</color>
-    <color name="md_pink_700">#C2185B</color>
-    <color name="md_pink_800">#AD1457</color>
-    <color name="md_pink_900">#880E4F</color>
-    <color name="md_pink_A100">#FF80AB</color>
-    <color name="md_pink_A200">#FF4081</color>
-    <color name="md_pink_A400">#F50057</color>
-    <color name="md_pink_A700">#C51162</color>
-
-    <color name="md_purple_100">#E1BEE7</color>
-    <color name="md_purple_200">#CE93D8</color>
-    <color name="md_purple_300">#BA68C8</color>
-    <color name="md_purple_400">#AB47BC</color>
-    <color name="md_purple_50">#F3E5F5</color>
-    <color name="md_purple_500">#9C27B0</color>
-    <color name="md_purple_600">#8E24AA</color>
-    <color name="md_purple_700">#7B1FA2</color>
-    <color name="md_purple_800">#6A1B9A</color>
-    <color name="md_purple_900">#4A148C</color>
-    <color name="md_purple_A100">#EA80FC</color>
-    <color name="md_purple_A200">#E040FB</color>
-    <color name="md_purple_A400">#D500F9</color>
-    <color name="md_purple_A700">#AA00FF</color>
-
-    <color name="md_red_100">#FFCDD2</color>
-    <color name="md_red_200">#EF9A9A</color>
-    <color name="md_red_300">#E57373</color>
-    <color name="md_red_400">#EF5350</color>
-    <color name="md_red_50">#FFEBEE</color>
-    <color name="md_red_500">#F44336</color>
-    <color name="md_red_600">#E53935</color>
-    <color name="md_red_700">#D32F2F</color>
-    <color name="md_red_800">#C62828</color>
-    <color name="md_red_900">#B71C1C</color>
-    <color name="md_red_A100">#FF8A80</color>
-    <color name="md_red_A200">#FF5252</color>
-    <color name="md_red_A400">#FF1744</color>
-    <color name="md_red_A700">#D50000</color>
-
-    <color name="md_teal_100">#B2DFDB</color>
-    <color name="md_teal_200">#80CBC4</color>
-    <color name="md_teal_300">#4DB6AC</color>
-    <color name="md_teal_400">#26A69A</color>
-    <color name="md_teal_50">#E0F2F1</color>
-    <color name="md_teal_500">#009688</color>
-    <color name="md_teal_600">#00897B</color>
-    <color name="md_teal_700">#00796B</color>
-    <color name="md_teal_800">#00695C</color>
-    <color name="md_teal_900">#004D40</color>
-    <color name="md_teal_A100">#A7FFEB</color>
-    <color name="md_teal_A200">#64FFDA</color>
-    <color name="md_teal_A400">#1DE9B6</color>
-    <color name="md_teal_A700">#00BFA5</color>
-
-    <color name="md_white_1000">#FFFFFF</color>
-    <color name="md_yellow_100">#FFF9C4</color>
-    <color name="md_yellow_200">#FFF59D</color>
-    <color name="md_yellow_300">#FFF176</color>
-    <color name="md_yellow_400">#FFEE58</color>
-    <color name="md_yellow_50">#FFFDE7</color>
-    <color name="md_yellow_500">#FFEB3B</color>
-    <color name="md_yellow_600">#FDD835</color>
-    <color name="md_yellow_700">#FBC02D</color>
-    <color name="md_yellow_800">#F9A825</color>
-    <color name="md_yellow_900">#F57F17</color>
-    <color name="md_yellow_A100">#FFFF8D</color>
-    <color name="md_yellow_A200">#FFFF00</color>
-    <color name="md_yellow_A400">#FFEA00</color>
-    <color name="md_yellow_A700">#FFD600</color>
-</resources>

app/src/main/res/values/strings-not_translatable.xml

@@ -27,7 +27,7 @@
     <string name="fragment_license__license_gpl_link" translatable="false">https://www.gnu.org/licenses/gpl-3.0.html</string>
     <string name="fragment_license__misc" translatable="false">@string/pref_title__sub_miscelaneous</string>
     <string name="fragment_licesen__misc_leafpic_link" translatable="false">https://github.com/gsantner/dandelion</string>
-    <string name="fragment_about__fdroid_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.github.dfa.hubzilla_android</string>
+    <string name="fragment_about__fdroid_link" translatable="false">https://f-droid.org/repository/browse/?fdid=com.dfa.hubzilla_android</string>
     <string name="fragment_about__about" translatable="false">@string/app_name</string>
     <string name="fragment_about__contribute_link" translatable="false">https://framagit.org/massimiliano/AndHub</string>
     <string name="fragment_about__translate_link" translatable="false">https://framagit.org/massimiliano/AndHub</string>

app/src/main/res/xml-v25/shortcuts.xml

@@ -9,8 +9,8 @@
         android:shortcutDisabledMessage="@string/new_post">
         <intent
             android:action="sc_new_post"
-            android:targetPackage="com.github.dfa.hubzilla_android"
-            android:targetClass="com.github.dfa.hubzilla_android.activity.MainActivity" />
+            android:targetPackage="com.dfa.hubzilla_android"
+            android:targetClass="com.dfa.hubzilla_android.activity.MainActivity" />
         <!-- If your shortcut is associated with multiple intents, include them
              here. The last intent in the fragments is what the user sees when they
              launch this shortcut. -->
@@ -26,8 +26,8 @@
         android:shortcutDisabledMessage="@string/activities">
         <intent
             android:action="sc_activities"
-            android:targetPackage="com.github.dfa.hubzilla_android"
-            android:targetClass="com.github.dfa.hubzilla_android.activity.MainActivity" />
+            android:targetPackage="com.dfa.hubzilla_android"
+            android:targetClass="com.dfa.hubzilla_android.activity.MainActivity" />
         <!-- If your shortcut is associated with multiple intents, include them
              here. The last intent in the fragments is what the user sees when they
              launch this shortcut. -->
@@ -43,8 +43,8 @@
         android:shortcutDisabledMessage="@string/aspects">
         <intent
             android:action="sc_aspects"
-            android:targetPackage="com.github.dfa.hubzilla_android"
-            android:targetClass="com.github.dfa.hubzilla_android.activity.MainActivity" />
+            android:targetPackage="com.dfa.hubzilla_android"
+            android:targetClass="com.dfa.hubzilla_android.activity.MainActivity" />
         <!-- If your shortcut is associated with multiple intents, include them
              here. The last intent in the fragments is what the user sees when they
              launch this shortcut. -->
@@ -60,8 +60,8 @@
         android:shortcutDisabledMessage="@string/nav_followed_tags">
         <intent
             android:action="sc_nav_followed_tags"
-            android:targetPackage="com.github.dfa.hubzilla_android"
-            android:targetClass="com.github.dfa.hubzilla_android.activity.MainActivity" />
+            android:targetPackage="com.dfa.hubzilla_android"
+            android:targetClass="com.dfa.hubzilla_android.activity.MainActivity" />
         <!-- If your shortcut is associated with multiple intents, include them
              here. The last intent in the fragments is what the user sees when they
              launch this shortcut. -->