Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix

This commit is contained in:
nuclearfog 2019-11-10 22:00:44 +01:00
parent 1c77350b1b
commit a7a7d0785d
No known key found for this signature in database
GPG Key ID: ED35E22099354A64
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/nuclearfog/twidda/window/AppSettings.java
View File

@ -23,6 +23,7 @@ import android.widget.NumberPicker;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog.Builder; import androidx.appcompat.app.AlertDialog.Builder;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
@ -54,8 +55,9 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
private static final int POPUPCOLOR = 3; private static final int POPUPCOLOR = 3;
private static final int INVERTCOLOR = 0xffffff; private static final int INVERTCOLOR = 0xffffff;
private GlobalSettings settings; @Nullable
private ConnectivityManager mConnect; private ConnectivityManager mConnect;
private GlobalSettings settings;
private LocationLoader locationAsync; private LocationLoader locationAsync;
private Button colorButton1, colorButton2, colorButton3, colorButton4; private Button colorButton1, colorButton2, colorButton3, colorButton4;
private EditText proxyAddr, proxyPort, proxyUser, proxyPass; private EditText proxyAddr, proxyPort, proxyUser, proxyPass;
@ -171,7 +173,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.settings_info) { if (item.getItemId() == R.id.settings_info) {
if (mConnect.getActiveNetworkInfo() != null && mConnect.getActiveNetworkInfo().isConnected()) { if (mConnect != null && mConnect.getActiveNetworkInfo() != null && mConnect.getActiveNetworkInfo().isConnected()) {
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
String link = getString(R.string.information_link); String link = getString(R.string.information_link);
intent.setData(Uri.parse(link)); intent.setData(Uri.parse(link));

3
app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
View File

@ -84,6 +84,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
private Button rtwButton, favButton, replyName; private Button rtwButton, favButton, replyName;
private ImageView profile_img; private ImageView profile_img;
@Nullable
private ConnectivityManager mConnect; private ConnectivityManager mConnect;
private GlobalSettings settings; private GlobalSettings settings;
private NumberFormat format; private NumberFormat format;
@ -209,7 +210,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
break; break;
case R.id.tweet_link: case R.id.tweet_link:
if (mConnect.getActiveNetworkInfo() != null && mConnect.getActiveNetworkInfo().isConnected()) { if (mConnect != null && mConnect.getActiveNetworkInfo() != null && mConnect.getActiveNetworkInfo().isConnected()) {
String tweetLink = "https://twitter.com/" + username.substring(1) + "/status/" + tweetID; String tweetLink = "https://twitter.com/" + username.substring(1) + "/status/" + tweetID;
Intent intent = new Intent(Intent.ACTION_VIEW); Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(tweetLink)); intent.setData(Uri.parse(tweetLink));

4
app/src/main/java/org/nuclearfog/twidda/window/TweetPopup.java
View File

@ -17,6 +17,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog.Builder; import androidx.appcompat.app.AlertDialog.Builder;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
@ -60,6 +61,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
private static final int CHECK_PERM = 4; private static final int CHECK_PERM = 4;
private static final int MAX_IMAGES = 4; private static final int MAX_IMAGES = 4;
@Nullable
private LocationManager mLocation; private LocationManager mLocation;
private StatusUploader uploaderAsync; private StatusUploader uploaderAsync;
private List<String> mediaPath; private List<String> mediaPath;
@ -338,7 +340,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
} }
} }
if (accessGranted) { if (accessGranted) {
if (mLocation.isProviderEnabled(LocationManager.GPS_PROVIDER)) { if (mLocation != null && mLocation.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
Toast.makeText(this, R.string.info_get_location, LENGTH_SHORT).show(); Toast.makeText(this, R.string.info_get_location, LENGTH_SHORT).show();
mLocation.requestSingleUpdate(LocationManager.GPS_PROVIDER, this, null); mLocation.requestSingleUpdate(LocationManager.GPS_PROVIDER, this, null);
} else { } else {