summaryrefslogtreecommitdiffstats
path: root/app/src/main/java
diff options
context:
space:
mode:
authorThomas <tschneider.ac@gmail.com>2020-04-24 14:44:47 +0200
committerThomas <tschneider.ac@gmail.com>2020-04-24 14:44:47 +0200
commitdc50da59df1d7b82dfd6d0185bd0c0576741a1d2 (patch)
treea049ebdd2840b986b6df0fee13448c1025c9cb08 /app/src/main/java
parent5f5ed0ac957987ed5a17488bbc61e28e85b9ef75 (diff)
Fix some issues
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java20
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/Account.java3
-rw-r--r--app/src/main/java/app/fedilab/android/client/Entities/Status.java3
-rw-r--r--app/src/main/java/app/fedilab/android/helper/Helper.java10
4 files changed, 20 insertions, 16 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index 6cdfedcaf..072c50441 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -179,6 +179,7 @@ public abstract class BaseMainActivity extends BaseActivity
public static String regex_home, regex_local, regex_public;
public static boolean show_boosts, show_replies, show_art_nsfw;
public static iconLauncher mLauncher = iconLauncher.BUBBLES;
+ public static boolean isAttached = false;
private static boolean notificationChecked = false;
private final int PICK_IMPORT = 5556;
private FloatingActionButton toot, delete_all, add_new;
@@ -202,7 +203,6 @@ public abstract class BaseMainActivity extends BaseActivity
private View dialogReleaseNoteView;
private List<Account> developers;
- public static boolean isAttached = false;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -2375,15 +2375,6 @@ public abstract class BaseMainActivity extends BaseActivity
}
}
- public enum iconLauncher {
- BUBBLES,
- FEDIVERSE,
- HERO,
- ATOM,
- BRAINCRASH,
- MASTALAB
- }
-
@Override
public void onAttachedToWindow() {
super.onAttachedToWindow();
@@ -2396,6 +2387,15 @@ public abstract class BaseMainActivity extends BaseActivity
isAttached = false;
}
+ public enum iconLauncher {
+ BUBBLES,
+ FEDIVERSE,
+ HERO,
+ ATOM,
+ BRAINCRASH,
+ MASTALAB
+ }
+
/**
* Page Adapter for Mastodon & Peertube & PixelFed
*/
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Account.java b/app/src/main/java/app/fedilab/android/client/Entities/Account.java
index 1753747b5..8e750ac12 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Account.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Account.java
@@ -233,7 +233,8 @@ public class Account implements Parcelable {
displayNameSpan.setSpan(
imageSpan, startPosition,
endPosition, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
- }catch (Exception ignored){}
+ } catch (Exception ignored) {
+ }
return;
}
}
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
index 157f97eab..b307c300d 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
@@ -899,7 +899,8 @@ public class Status implements Parcelable {
contentSpan.setSpan(
imageSpan, startPosition,
endPosition, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
- }catch (Exception ignored){}
+ } catch (Exception ignored) {
+ }
}
}
}
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 316ec2a4d..ed3db59b2 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -1792,7 +1792,7 @@ public class Helper {
if (!accountChoice.getAvatar().startsWith("http"))
accountChoice.setAvatar("https://" + accountChoice.getInstance() + accountChoice.getAvatar());
ImageView itemIconAcc = new ImageView(activity);
- if( !activity.isFinishing() && isAttached) {
+ if (!activity.isFinishing() && isAttached) {
try {
Glide.with(activity)
.asDrawable()
@@ -1825,7 +1825,8 @@ public class Helper {
}
});
- }catch (Exception ignored){}
+ } catch (Exception ignored) {
+ }
}
if (accounts.size() > 2) {
@@ -1933,7 +1934,7 @@ public class Helper {
}
if (!urlHeader.contains("missing.png")) {
ImageView backgroundImage = headerLayout.findViewById(R.id.back_ground_image);
- if( !activity.isFinishing() && isAttached) {
+ if (!activity.isFinishing() && isAttached) {
try {
Glide.with(activity)
.asDrawable()
@@ -1956,7 +1957,8 @@ public class Helper {
}
});
- }catch (Exception ignored){}
+ } catch (Exception ignored) {
+ }
}
}
}