bug fix
This commit is contained in:
parent
1c77350b1b
commit
a7a7d0785d
|
@ -23,6 +23,7 @@ import android.widget.NumberPicker;
|
|||
import android.widget.Spinner;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AlertDialog.Builder;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
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 INVERTCOLOR = 0xffffff;
|
||||
|
||||
private GlobalSettings settings;
|
||||
@Nullable
|
||||
private ConnectivityManager mConnect;
|
||||
private GlobalSettings settings;
|
||||
private LocationLoader locationAsync;
|
||||
private Button colorButton1, colorButton2, colorButton3, colorButton4;
|
||||
private EditText proxyAddr, proxyPort, proxyUser, proxyPass;
|
||||
|
@ -171,7 +173,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
|
|||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
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);
|
||||
String link = getString(R.string.information_link);
|
||||
intent.setData(Uri.parse(link));
|
||||
|
|
|
@ -84,6 +84,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
|
|||
private Button rtwButton, favButton, replyName;
|
||||
private ImageView profile_img;
|
||||
|
||||
@Nullable
|
||||
private ConnectivityManager mConnect;
|
||||
private GlobalSettings settings;
|
||||
private NumberFormat format;
|
||||
|
@ -209,7 +210,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, O
|
|||
break;
|
||||
|
||||
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;
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW);
|
||||
intent.setData(Uri.parse(tweetLink));
|
||||
|
|
|
@ -17,6 +17,7 @@ import android.widget.TextView;
|
|||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AlertDialog.Builder;
|
||||
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 MAX_IMAGES = 4;
|
||||
|
||||
@Nullable
|
||||
private LocationManager mLocation;
|
||||
private StatusUploader uploaderAsync;
|
||||
private List<String> mediaPath;
|
||||
|
@ -338,7 +340,7 @@ public class TweetPopup extends AppCompatActivity implements OnClickListener, Lo
|
|||
}
|
||||
}
|
||||
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();
|
||||
mLocation.requestSingleUpdate(LocationManager.GPS_PROVIDER, this, null);
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue