mirror of
https://github.com/KDE/kdeconnect-android
synced 2025-09-02 15:15:09 +00:00
Removed printfs and coding style stuff
This commit is contained in:
@@ -628,7 +628,7 @@ public class Device implements BaseLink.PackageReceiver {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!callback.success) {
|
if (!callback.success) {
|
||||||
Log.e("KDE/sendPackage", "No device link (of "+mLinks.size()+" available) could send the package. Package lost!");
|
Log.e("KDE/sendPackage", "No device link (of "+mLinks.size()+" available) could send the package "+np.getType()+". Package lost!");
|
||||||
backtrace.printStackTrace();
|
backtrace.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -134,11 +134,11 @@ public class MprisActivity extends ActionBarActivity {
|
|||||||
//String prevPlayer = (String)spinner.getSelectedItem();
|
//String prevPlayer = (String)spinner.getSelectedItem();
|
||||||
spinner.setAdapter(adapter);
|
spinner.setAdapter(adapter);
|
||||||
|
|
||||||
if(playerList.isEmpty()){
|
if (playerList.isEmpty()) {
|
||||||
findViewById(R.id.no_players).setVisibility(View.VISIBLE);
|
findViewById(R.id.no_players).setVisibility(View.VISIBLE);
|
||||||
spinner.setVisibility(View.GONE);
|
spinner.setVisibility(View.GONE);
|
||||||
((TextView) findViewById(R.id.now_playing_textview)).setText("");
|
((TextView) findViewById(R.id.now_playing_textview)).setText("");
|
||||||
}else{
|
} else {
|
||||||
findViewById(R.id.no_players).setVisibility(View.GONE);
|
findViewById(R.id.no_players).setVisibility(View.GONE);
|
||||||
spinner.setVisibility(View.VISIBLE);
|
spinner.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
@@ -127,7 +127,7 @@ public class ShareActivity extends ActionBarActivity {
|
|||||||
@Override
|
@Override
|
||||||
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
|
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
|
||||||
|
|
||||||
Device device = devicesList.get(i-1); //NOTE: -1 because of the title!
|
Device device = devicesList.get(i - 1); //NOTE: -1 because of the title!
|
||||||
|
|
||||||
Bundle extras = intent.getExtras();
|
Bundle extras = intent.getExtras();
|
||||||
if (extras != null) {
|
if (extras != null) {
|
||||||
|
@@ -38,59 +38,72 @@ import android.view.ViewGroup;
|
|||||||
public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
|
public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
|
||||||
|
|
||||||
private AppCompatDelegate mDelegate;
|
private AppCompatDelegate mDelegate;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
getDelegate().installViewFactory();
|
getDelegate().installViewFactory();
|
||||||
getDelegate().onCreate(savedInstanceState);
|
getDelegate().onCreate(savedInstanceState);
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPostCreate(Bundle savedInstanceState) {
|
protected void onPostCreate(Bundle savedInstanceState) {
|
||||||
super.onPostCreate(savedInstanceState);
|
super.onPostCreate(savedInstanceState);
|
||||||
getDelegate().onPostCreate(savedInstanceState);
|
getDelegate().onPostCreate(savedInstanceState);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ActionBar getSupportActionBar() {
|
public ActionBar getSupportActionBar() {
|
||||||
return getDelegate().getSupportActionBar();
|
return getDelegate().getSupportActionBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSupportActionBar(@Nullable Toolbar toolbar) {
|
public void setSupportActionBar(@Nullable Toolbar toolbar) {
|
||||||
getDelegate().setSupportActionBar(toolbar);
|
getDelegate().setSupportActionBar(toolbar);
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public MenuInflater getMenuInflater() {
|
public MenuInflater getMenuInflater() {
|
||||||
return getDelegate().getMenuInflater();
|
return getDelegate().getMenuInflater();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setContentView(@LayoutRes int layoutResID) {
|
public void setContentView(@LayoutRes int layoutResID) {
|
||||||
getDelegate().setContentView(layoutResID);
|
getDelegate().setContentView(layoutResID);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setContentView(View view) {
|
public void setContentView(View view) {
|
||||||
getDelegate().setContentView(view);
|
getDelegate().setContentView(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setContentView(View view, ViewGroup.LayoutParams params) {
|
public void setContentView(View view, ViewGroup.LayoutParams params) {
|
||||||
getDelegate().setContentView(view, params);
|
getDelegate().setContentView(view, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addContentView(View view, ViewGroup.LayoutParams params) {
|
public void addContentView(View view, ViewGroup.LayoutParams params) {
|
||||||
getDelegate().addContentView(view, params);
|
getDelegate().addContentView(view, params);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onPostResume() {
|
protected void onPostResume() {
|
||||||
super.onPostResume();
|
super.onPostResume();
|
||||||
getDelegate().onPostResume();
|
getDelegate().onPostResume();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onTitleChanged(CharSequence title, int color) {
|
protected void onTitleChanged(CharSequence title, int color) {
|
||||||
super.onTitleChanged(title, color);
|
super.onTitleChanged(title, color);
|
||||||
getDelegate().setTitle(title);
|
getDelegate().setTitle(title);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onConfigurationChanged(Configuration newConfig) {
|
public void onConfigurationChanged(Configuration newConfig) {
|
||||||
super.onConfigurationChanged(newConfig);
|
super.onConfigurationChanged(newConfig);
|
||||||
getDelegate().onConfigurationChanged(newConfig);
|
getDelegate().onConfigurationChanged(newConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onStop() {
|
protected void onStop() {
|
||||||
super.onStop();
|
super.onStop();
|
||||||
@@ -101,9 +114,12 @@ public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
|
|||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
getDelegate().onDestroy();
|
getDelegate().onDestroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
public void invalidateOptionsMenu() {
|
public void invalidateOptionsMenu() {
|
||||||
getDelegate().invalidateOptionsMenu();
|
getDelegate().invalidateOptionsMenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
private AppCompatDelegate getDelegate() {
|
private AppCompatDelegate getDelegate() {
|
||||||
if (mDelegate == null) {
|
if (mDelegate == null) {
|
||||||
mDelegate = AppCompatDelegate.create(this, null);
|
mDelegate = AppCompatDelegate.create(this, null);
|
||||||
|
@@ -255,7 +255,6 @@ public class MaterialActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
Log.e("MaterialActivity", "Main Activity onActivityResult" + requestCode);
|
|
||||||
switch (requestCode)
|
switch (requestCode)
|
||||||
{
|
{
|
||||||
case RESULT_NEEDS_RELOAD:
|
case RESULT_NEEDS_RELOAD:
|
||||||
|
Reference in New Issue
Block a user