Commit 508a3fc3 authored by massimiliano's avatar massimiliano

Solved Diaspora* installation conflict

parent 4e144f92
#Sun Jun 10 11:52:15 CEST 2018
gradle.version=4.4
......@@ -16,10 +16,10 @@ 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.diaspora_android"
resValue "string", "manifest_package_id", "com.github.dfa.hubzilla_android"
applicationId "com.github.dfa.diaspora_android"
versionName "1.1.3"
applicationId "com.github.dfa.hubzilla_android"
versionName "0.0.1"
versionCode 32
......
<?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.diaspora_android"
package="com.github.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.diaspora_android.App"
android:name="com.github.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.diaspora_android.service.HashtagContentProvider"
android:name="com.github.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.diaspora_android.service.FetchPodsService"
android:name="com.github.dfa.hubzilla_android.service.FetchPodsService"
android:enabled="true"
android:exported="false" />
<activity
android:name="com.github.dfa.diaspora_android.activity.SettingsActivity"
android:name="com.github.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.diaspora_android.activity.AboutActivity"
android:name="com.github.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.diaspora_android.activity.MainActivity"
android:name="com.github.dfa.hubzilla_android.activity.MainActivity"
android:configChanges="keyboardHidden|locale|orientation|screenSize"
android:icon="${appIcon}"
android:label="@string/app_name"
......
......@@ -17,7 +17,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android;
package com.github.dfa.hubzilla_android;
import android.app.Application;
import android.content.Context;
......@@ -28,11 +28,11 @@ import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.webkit.WebView;
import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
import com.github.dfa.diaspora_android.service.AvatarImageLoader;
import com.github.dfa.diaspora_android.util.AppLog;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
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 net.gsantner.opoc.util.AdBlock;
......
......@@ -16,7 +16,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.activity;
package com.github.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.diaspora_android.App;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.listener.IntellihideToolbarActivityListener;
import com.github.dfa.diaspora_android.ui.HtmlTextView;
import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
import com.github.dfa.diaspora_android.ui.theme.ThemedActivity;
import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
import com.github.dfa.diaspora_android.util.AppLog;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.ContextUtils;
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 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.diaspora_android.AboutActivity.AboutFragment";
public static final String TAG = "com.github.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.diaspora_android.AboutActivity.LicenseFragment";
public static final String TAG = "com.github.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.diaspora_android.AboutActivity.DebugFragment";
public static final String TAG = "com.github.dfa.hubzilla_android.AboutActivity.DebugFragment";
@BindView(R.id.fragment_debug__package_name)
TextView packageName;
......
......@@ -16,7 +16,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.activity;
package com.github.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.diaspora_android.App;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.data.DiasporaAspect;
import com.github.dfa.diaspora_android.listener.OnSomethingClickListener;
import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.ContextUtils;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
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 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.diaspora_android.AspectListFragment";
public static final String TAG = "com.github.dfa.hubzilla_android.AspectListFragment";
@BindView(R.id.fragment_list__recycler_view)
public RecyclerView aspectsRecyclerView;
......
......@@ -16,7 +16,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.activity;
package com.github.dfa.hubzilla_android.activity;
import android.Manifest;
import android.animation.ObjectAnimator;
......@@ -42,19 +42,19 @@ import android.webkit.WebChromeClient;
import android.webkit.WebView;
import android.widget.Toast;
import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.BuildConfig;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder;
import com.github.dfa.diaspora_android.util.AppLog;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.ContextUtils;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
import com.github.dfa.diaspora_android.web.BrowserFragment;
import com.github.dfa.diaspora_android.web.DiasporaStreamWebChromeClient;
import com.github.dfa.diaspora_android.web.FileUploadWebChromeClient;
import com.github.dfa.diaspora_android.web.WebHelper;
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 net.gsantner.opoc.util.PermissionChecker;
import net.gsantner.opoc.util.ShareUtil;
......@@ -71,7 +71,7 @@ import java.util.Date;
*/
public class DiasporaStreamFragment extends BrowserFragment {
public static final String TAG = "com.github.dfa.diaspora_android.StreamFragment";
public static final String TAG = "com.github.dfa.hubzilla_android.StreamFragment";
protected DiasporaUrlHelper urls;
......
......@@ -16,7 +16,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.activity;
package com.github.dfa.hubzilla_android.activity;
import android.annotation.SuppressLint;
import android.content.BroadcastReceiver;
......@@ -60,32 +60,32 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.BuildConfig;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.data.DiasporaPodList;
import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
import com.github.dfa.diaspora_android.listener.DiasporaUserProfileChangedListener;
import com.github.dfa.diaspora_android.listener.IntellihideToolbarActivityListener;
import com.github.dfa.diaspora_android.receiver.OpenExternalLinkReceiver;
import com.github.dfa.diaspora_android.receiver.UpdateTitleReceiver;
import com.github.dfa.diaspora_android.ui.BadgeDrawable;
import com.github.dfa.diaspora_android.ui.PodSelectionDialog;
import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
import com.github.dfa.diaspora_android.ui.theme.ThemedActivity;
import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder;
import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
import com.github.dfa.diaspora_android.util.ActivityUtils;
import com.github.dfa.diaspora_android.util.AndroidBug5497Workaround;
import com.github.dfa.diaspora_android.util.AppLog;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.ContextUtils;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
import com.github.dfa.diaspora_android.web.BrowserFragment;
import com.github.dfa.diaspora_android.web.ContextMenuWebView;
import com.github.dfa.diaspora_android.web.ProxyHandler;
import com.github.dfa.diaspora_android.web.WebHelper;
import com.github.dfa.diaspora_android.web.custom_tab.CustomTabActivityHelper;
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 net.gsantner.opoc.format.markdown.SimpleMarkdownParser;
......@@ -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.diaspora_android.MainActivity.open_url";
public static final String ACTION_OPEN_EXTERNAL_URL = "com.github.dfa.diaspora_android.MainActivity.open_external_url";
public static final String ACTION_CHANGE_ACCOUNT = "com.github.dfa.diaspora_android.MainActivity.change_account";
public static final String ACTION_CLEAR_CACHE = "com.github.dfa.diaspora_android.MainActivity.clear_cache";
public static final String ACTION_UPDATE_TITLE_FROM_URL = "com.github.dfa.diaspora_android.MainActivity.set_title";
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 URL_MESSAGE = "URL_MESSAGE";
public static final String EXTRA_URL = "com.github.dfa.diaspora_android.extra_url";
public static final String CONTENT_HASHTAG = "content://com.github.dfa.diaspora_android.mainactivity/";
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/";
private App app;
private CustomTabActivityHelper customTabActivityHelper;
......
......@@ -16,7 +16,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.activity;
package com.github.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.diaspora_android.App;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.data.DiasporaPodList;
import com.github.dfa.diaspora_android.data.DiasporaPodList.DiasporaPod;
import com.github.dfa.diaspora_android.service.FetchPodsService;
import com.github.dfa.diaspora_android.ui.PodSelectionDialog;
import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
import com.github.dfa.diaspora_android.util.ActivityUtils;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.ContextUtils;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
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 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.diaspora_android.PodSelectionFragment";
public static final String TAG = "com.github.dfa.hubzilla_android.PodSelectionFragment";
@BindView(R.id.podselection__fragment__listpods)
protected ListView listViewPod;
......
package com.github.dfa.diaspora_android.activity;
package com.github.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.diaspora_android.App;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.ui.theme.ColorPalette;
import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
import com.github.dfa.diaspora_android.ui.theme.ThemedActivity;
import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder;
import com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceFragment;
import com.github.dfa.diaspora_android.util.AppLog;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
import com.github.dfa.diaspora_android.web.ProxyHandler;
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 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.diaspora_android.settings.SettingsFragmentMaster";
public static final String TAG = "com.github.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.diaspora_android.settings.SettingsFragmentThemes";
public static final String TAG = "com.github.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.diaspora_android.settings.SettingsFragmentNavSlider";
public static final String TAG = "com.github.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.diaspora_android.settings.SettingsFragmentProxy";
public static final String TAG = "com.github.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.diaspora_android.settings.SettingsFragmentDebugging";
public static final String TAG = "com.github.dfa.hubzilla_android.settings.SettingsFragmentDebugging";
public void onCreate(Bundle savedInstances) {
super.onCreate(savedInstances);
......
......@@ -16,7 +16,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.activity;
package com.github.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.diaspora_android.App;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.listener.OnSomethingClickListener;
import com.github.dfa.diaspora_android.ui.theme.ThemedFragment;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.ContextUtils;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
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 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.diaspora_android.TagListFragment";
public static final String TAG = "com.github.dfa.hubzilla_android.TagListFragment";
@BindView(R.id.fragment_list__recycler_view)
public RecyclerView followedTagsRecyclerView;
......
......@@ -16,10 +16,10 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.data;
package com.github.dfa.hubzilla_android.data;
import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.hubzilla_android.App;
import com.github.dfa.hubzilla_android.util.AppSettings;
import org.json.JSONException;
import org.json.JSONObject;
......
package com.github.dfa.diaspora_android.data;
package com.github.dfa.hubzilla_android.data;
import org.json.JSONArray;
import org.json.JSONException;
......
......@@ -16,15 +16,15 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.data;
package com.github.dfa.hubzilla_android.data;
import android.os.Handler;
import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.listener.DiasporaUserProfileChangedListener;
import com.github.dfa.diaspora_android.util.AppLog;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
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 org.json.JSONArray;
import org.json.JSONException;
......
......@@ -16,9 +16,9 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.listener;
package com.github.dfa.hubzilla_android.listener;
import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
import com.github.dfa.hubzilla_android.data.DiasporaUserProfile;
/**
* Created by gsantner (https://gsantner.net/) on 26.03.16.
......
package com.github.dfa.diaspora_android.listener;
package com.github.dfa.hubzilla_android.listener;
import android.support.design.widget.AppBarLayout;
......
package com.github.dfa.diaspora_android.listener;
package com.github.dfa.hubzilla_android.listener;
/**
* Listener for different types of click events
......
......@@ -16,7 +16,7 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.receiver;
package com.github.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.diaspora_android.R;
import com.github.dfa.diaspora_android.activity.MainActivity;
import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
import com.github.dfa.diaspora_android.util.AppLog;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.web.custom_tab.BrowserFallback;
import com.github.dfa.diaspora_android.web.custom_tab.CustomTabActivityHelper;
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;
/**
* BroadcastReceiver that opens links in a Chrome CustomTab
......
......@@ -16,18 +16,18 @@
If not, see <http://www.gnu.org/licenses/>.
*/
package com.github.dfa.diaspora_android.receiver;
package com.github.dfa.hubzilla_android.receiver;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import com.github.dfa.diaspora_android.App;
import com.github.dfa.diaspora_android.R;
import com.github.dfa.diaspora_android.activity.MainActivity;
import com.github.dfa.diaspora_android.util.AppLog;
import com.github.dfa.diaspora_android.util.AppSettings;
import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
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;
/**
* BroadcastReceiver used to update the title of the MainActivity depending on the url of the ui__webview