mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-05 16:45:08 +00:00
Code Issues Releases Wiki Activity

Rename MaterialActivity to MainActivity

Browse Source 
Summary: Its more descriptive

Reviewers: #kde_connect, mtijink

Reviewed By: #kde_connect, mtijink

Subscribers: mtijink, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D10951
This commit is contained in:
Nicolas Fella
2018-03-03 17:21:16 +01:00
parent 889251ed94
commit e72e0f61dd
11 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
View File

@@ -68,7 +68,7 @@ public class DeviceFragment extends Fragment {
static String mDeviceId; //Static because if we get here by using the back button in the action bar, the extra deviceId will not be set.
Device device;
MaterialActivity mActivity;
MainActivity mActivity;
ArrayList<ListAdapter.Item> pluginListItems;
@@ -82,7 +82,7 @@ public class DeviceFragment extends Fragment {
this.setArguments(args);
}
public DeviceFragment(String deviceId, MaterialActivity activity) {
public DeviceFragment(String deviceId, MainActivity activity) {
this.mActivity = activity;
Bundle args = new Bundle();
args.putString(ARG_DEVICE_ID, deviceId);
@@ -92,7 +92,7 @@ public class DeviceFragment extends Fragment {
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
mActivity = ((MaterialActivity) getActivity());
mActivity = ((MainActivity) getActivity());
}
@Override
@@ -436,7 +436,7 @@ public class DeviceFragment extends Fragment {
};
public static void acceptPairing(final String devId, final MaterialActivity activity) {
public static void acceptPairing(final String devId, final MainActivity activity) {
final DeviceFragment frag = new DeviceFragment(devId, activity);
BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
public void onServiceStart(BackgroundService service) {
@@ -459,7 +459,7 @@ public class DeviceFragment extends Fragment {
});
}
public static void rejectPairing(final String devId, final MaterialActivity activity) {
public static void rejectPairing(final String devId, final MainActivity activity) {
final DeviceFragment frag = new DeviceFragment(devId, activity);
BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() {
public void onServiceStart(BackgroundService service) {